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/src/mapi/glapi/gen | |
| 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/src/mapi/glapi/gen')
| -rwxr-xr-x | mesalib/src/mapi/glapi/gen/gl_API.xml | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index 0c78c5208..17c322519 100755 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/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" mode="get"/> |