[Mesa-dev] [RFC 2/2] Revert "Revert "mesa: enable KHR_debug for ES contexts""

[Boyan Ding]

This reverts commit bbf728f11b45121bf2d03b61bc0ffc69e0ff0836.

Signed-off-by: Boyan Ding <boyan.j.ding at gmail.com>
---
I wonder if there are still things left, but I think it is worth trying
since GL_KHR_debug doesn't seem to be essentially different on GL and
GLES.

 docs/relnotes/11.1.0.html  | 1 +
 src/mesa/main/extensions.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/relnotes/11.1.0.html b/docs/relnotes/11.1.0.html
index 7160244..8fa6bf1 100644
--- a/docs/relnotes/11.1.0.html
+++ b/docs/relnotes/11.1.0.html
@@ -56,6 +56,7 @@ Note: some of the new features are only available with certain drivers.
 <li>GL_ARB_texture_query_lod on softpipe</li>
 <li>GL_ARB_texture_view on radeonsi</li>
 <li>GL_EXT_draw_elements_base_vertex on all drivers</li>
+<li>GL_KHR_debug (GLES)</li>
 <li>GL_OES_draw_elements_base_vertex on all drivers</li>
 <li>EGL_KHR_create_context on softpipe, llvmpipe</li>
 <li>EGL_KHR_gl_colorspace on softpipe, llvmpipe</li>
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index d964f03..9cc5086 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -345,7 +345,7 @@ static const struct extension extension_table[] = {
    { "GL_OES_vertex_array_object",                 o(dummy_true),                                   ES1 | ES2, 2010 },
 
    /* KHR extensions */
-   { "GL_KHR_debug",                               o(dummy_true),                              GL,             2012 },
+   { "GL_KHR_debug",                               o(dummy_true),                              GL | ES1 | ES2, 2012 },
    { "GL_KHR_context_flush_control",               o(dummy_true),                              GL       | ES2, 2014 },
    { "GL_KHR_texture_compression_astc_hdr",        o(KHR_texture_compression_astc_hdr),        GL       | ES2, 2012 },
    { "GL_KHR_texture_compression_astc_ldr",        o(KHR_texture_compression_astc_ldr),        GL       | ES2, 2012 },
-- 
2.6.2