diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-24 08:15:59 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-24 08:15:59 +0200 |
| commit | 285b1bd8933288fc56259cfb3de61207c8e35d9e (patch) | |
| tree | 2107aaa7f683f16a9a1a73e5f6f2d7ba53710f32 /mesalib/include/GL | |
| parent | c665b6e88274f8bc603b0f14f92bf09d2023bd4d (diff) | |
| parent | 4eb0b643ad978d94837e2d587a5d4358f974a25c (diff) | |
| download | vcxsrv-285b1bd8933288fc56259cfb3de61207c8e35d9e.tar.gz vcxsrv-285b1bd8933288fc56259cfb3de61207c8e35d9e.tar.bz2 vcxsrv-285b1bd8933288fc56259cfb3de61207c8e35d9e.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver git update 24 oct 2013
Conflicts:
xorg-server/glx/glxdricommon.c
Diffstat (limited to 'mesalib/include/GL')
| -rw-r--r-- | mesalib/include/GL/gl.h | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/mesalib/include/GL/gl.h b/mesalib/include/GL/gl.h index babb7463e..6b94e3fb0 100644 --- a/mesalib/include/GL/gl.h +++ b/mesalib/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 @@ -2122,27 +2102,6 @@ GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logTyp #endif /* GL_MESA_packed_depth_stencil */ -#ifndef GL_MESA_program_debug -#define GL_MESA_program_debug 1 - -#define GL_FRAGMENT_PROGRAM_POSITION_MESA 0x8bb0 -#define GL_FRAGMENT_PROGRAM_CALLBACK_MESA 0x8bb1 -#define GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA 0x8bb2 -#define GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA 0x8bb3 -#define GL_VERTEX_PROGRAM_POSITION_MESA 0x8bb4 -#define GL_VERTEX_PROGRAM_CALLBACK_MESA 0x8bb5 -#define GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA 0x8bb6 -#define GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA 0x8bb7 - -typedef void (*GLprogramcallbackMESA)(GLenum target, GLvoid *data); - -GLAPI void GLAPIENTRY glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback, GLvoid *data); - -GLAPI void GLAPIENTRY glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name, GLfloat *v); - -#endif /* GL_MESA_program_debug */ - - #ifndef GL_MESA_texture_array #define GL_MESA_texture_array 1 |