From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Wed, 7 Oct 2015 20:23:16 +0000 (+0100)
Subject: Revert "mesa: enable KHR_debug for ES contexts"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bbf728f11b45121bf2d03b61bc0ffc69e0ff0836;p=mesa.git

Revert "mesa: enable KHR_debug for ES contexts"

This reverts commit b69cfbdf18fa64606a76761b20bc268f4ac731e5.

This isn't quite baked yet. Seems that despite building the ES piglits,
none of them got executed.
---

diff --git a/docs/relnotes/11.1.0.html b/docs/relnotes/11.1.0.html
index 543ddc7958b..4c8b9d8256e 100644
--- a/docs/relnotes/11.1.0.html
+++ b/docs/relnotes/11.1.0.html
@@ -50,7 +50,6 @@ Note: some of the new features are only available with certain drivers.
 <li>GL_ARB_shader_texture_image_samples on i965, nv50, nvc0, r600, radeonsi</li>
 <li>GL_ARB_texture_barrier / GL_NV_texture_barrier on i965</li>
 <li>GL_ARB_texture_query_lod on softpipe</li>
-<li>GL_KHR_debug (GLES)</li>
 <li>EGL_KHR_gl_colorspace on softpipe, llvmpipe</li>
 </ul>
 
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 281c640901e..b2c88c37366 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -342,7 +342,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 | ES1 | ES2, 2012 },
+   { "GL_KHR_debug",                               o(dummy_true),                              GL,             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 },