Mesa (master): mesa: remove remnants of GL_MESA_shader_debug
Brian Paul
brianp at kemper.freedesktop.org
Tue Oct 22 14:33:00 UTC 2013
Module: Mesa
Branch: master
Commit: 971c74309e25a7f40a21582f9b16e101616fb6fb
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=971c74309e25a7f40a21582f9b16e101616fb6fb
Author: Brian Paul <brianp at vmware.com>
Date: Sat Oct 19 08:21:38 2013 -0600
mesa: remove remnants of GL_MESA_shader_debug
This extension never saw any real use so remove it.
v2: also update tests/num_strings.cpp for 'make check'
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
include/GL/gl.h | 20 --------------------
src/mapi/glapi/gen/gl_API.xml | 32 --------------------------------
src/mesa/main/tests/enum_strings.cpp | 3 ---
3 files changed, 0 insertions(+), 55 deletions(-)
diff --git a/include/GL/gl.h b/include/GL/gl.h
index babb746..968032c 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -2086,26 +2086,6 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLsh
-#if GL_ARB_shader_objects
-
-#ifndef GL_MESA_shader_debug
-#define GL_MESA_shader_debug 1
-
-#define GL_DEBUG_OBJECT_MESA 0x8759
-#define GL_DEBUG_PRINT_MESA 0x875A
-#define GL_DEBUG_ASSERT_MESA 0x875B
-
-GLAPI GLhandleARB GLAPIENTRY glCreateDebugObjectMESA (void);
-GLAPI void GLAPIENTRY glClearDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
-GLAPI void GLAPIENTRY glGetDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType, GLsizei maxLength,
- GLsizei *length, GLcharARB *debugLog);
-GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
-
-#endif /* GL_MESA_shader_debug */
-
-#endif /* GL_ARB_shader_objects */
-
-
/*
* ???. GL_MESA_packed_depth_stencil
* XXX obsolete
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 48fce36..30ab9c9 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -13027,38 +13027,6 @@
<enum name="RGBA8_SNORM" value="0x8F97"/>
</category>
-<category name="GL_MESA_shader_debug">
- <enum name="DEBUG_OBJECT_MESA" value="0x8759"/>
- <enum name="DEBUG_PRINT_MESA" value="0x875A"/>
- <enum name="DEBUG_ASSERT_MESA" value="0x875B"/>
- <function name="CreateDebugObjectMESA" exec="skip">
- <return type="GLhandleARB"/>
- <glx ignore="true"/>
- </function>
- <function name="ClearDebugLogMESA" exec="skip">
- <param name="obj" type="GLhandleARB"/>
- <param name="logType" type="GLenum"/>
- <param name="shaderType" type="GLenum"/>
- <glx ignore="true"/>
- </function>
- <function name="GetDebugLogMESA" exec="skip">
- <param name="obj" type="GLhandleARB"/>
- <param name="logType" type="GLenum"/>
- <param name="shaderType" type="GLenum"/>
- <param name="maxLength" type="GLsizei"/>
- <param name="length" type="GLsizei *" output="true"/>
- <param name="debugLog" type="GLcharARB *" output="true"/>
- <glx ignore="true"/>
- </function>
- <function name="GetDebugLogLengthMESA" exec="skip">
- <return type="GLsizei"/>
- <param name="obj" type="GLhandleARB"/>
- <param name="logType" type="GLenum"/>
- <param name="shaderType" type="GLenum"/>
- <glx ignore="true"/>
- </function>
-</category>
-
<category name="GL_SGIS_point_parameters">
<enum name="POINT_SIZE_MIN_SGIS" count="1" value="0x8126">
<size name="PointParameterfv"/>
diff --git a/src/mesa/main/tests/enum_strings.cpp b/src/mesa/main/tests/enum_strings.cpp
index 8a3103b..3795700 100644
--- a/src/mesa/main/tests/enum_strings.cpp
+++ b/src/mesa/main/tests/enum_strings.cpp
@@ -1110,9 +1110,6 @@ const struct enum_info everything[] = {
{ 0x8746, "GL_MODULATE_SUBTRACT_ATI" },
{ 0x8757, "GL_YCBCR_MESA" },
{ 0x8758, "GL_PACK_INVERT_MESA" },
- { 0x8759, "GL_DEBUG_OBJECT_MESA" },
- { 0x875A, "GL_DEBUG_PRINT_MESA" },
- { 0x875B, "GL_DEBUG_ASSERT_MESA" },
{ 0x8764, "GL_BUFFER_SIZE" },
{ 0x8765, "GL_BUFFER_USAGE" },
{ 0x8775, "GL_BUMP_ROT_MATRIX_ATI" },
More information about the mesa-commit
mailing list