aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi/gen
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-04-27 06:58:32 +0000
committermarha <marha@users.sourceforge.net>2011-04-27 06:58:32 +0000
commit96d6df5da9cddedf4931bf8e17f96e242467c661 (patch)
tree07977c913b04e80b7dbd302e7a5890422aeacb1b /mesalib/src/mapi/glapi/gen
parent71372d36e1a3f0230b88808f70d35446fda12260 (diff)
downloadvcxsrv-96d6df5da9cddedf4931bf8e17f96e242467c661.tar.gz
vcxsrv-96d6df5da9cddedf4931bf8e17f96e242467c661.tar.bz2
vcxsrv-96d6df5da9cddedf4931bf8e17f96e242467c661.zip
xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011
Diffstat (limited to 'mesalib/src/mapi/glapi/gen')
-rw-r--r--mesalib/src/mapi/glapi/gen/ARB_robustness.xml185
-rw-r--r--mesalib/src/mapi/glapi/gen/Makefile1
-rw-r--r--mesalib/src/mapi/glapi/gen/gl_API.xml2
-rw-r--r--mesalib/src/mapi/glapi/gen/gl_XML.py2
4 files changed, 189 insertions, 1 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_robustness.xml b/mesalib/src/mapi/glapi/gen/ARB_robustness.xml
new file mode 100644
index 000000000..b347ef35c
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_robustness.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+
+<OpenGLAPI>
+
+<category name="GL_ARB_robustness" number="105">
+
+ <enum name="GUILTY_CONTEXT_RESET_ARB" value="0x8253"/>
+ <enum name="INNOCENT_CONTEXT_RESET_ARB" value="0x8254"/>
+ <enum name="UNKNOWN_CONTEXT_RESET_ARB" value="0x8255"/>
+
+ <enum name="RESET_NOTIFICATION_STRATEGY_ARB" count="1" value="0x8256">
+ <size name="Get" mode="get"/>
+ </enum>
+ <enum name="LOSE_CONTEXT_ON_RESET_ARB" value="0x8252"/>
+ <enum name="NO_RESET_NOTIFICATION_ARB" value="0x8261"/>
+
+ <enum name="CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB" value="0x00000004"/>
+
+ <function name="GetGraphicsResetStatusARB" offset="assign">
+ <return type="GLenum"/>
+ </function>
+
+<!-- OpenGL 1.0 sized buffer queries -->
+ <function name="GetnMapdvARB" offset="assign">
+ <param name="target" type="GLenum"/>
+ <param name="query" type="GLenum"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="v" type="GLdouble *" output="true"/>
+ </function>
+
+ <function name="GetnMapfvARB" offset="assign">
+ <param name="target" type="GLenum"/>
+ <param name="query" type="GLenum"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="v" type="GLfloat *" output="true"/>
+ </function>
+
+ <function name="GetnMapivARB" offset="assign">
+ <param name="target" type="GLenum"/>
+ <param name="query" type="GLenum"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="v" type="GLint *" output="true"/>
+ </function>
+
+
+
+ <function name="GetnPixelMapfvARB" offset="assign">
+ <param name="map" type="GLenum"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="values" type="GLfloat *" output="true"/>
+ </function>
+
+ <function name="GetnPixelMapuivARB" offset="assign">
+ <param name="map" type="GLenum"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="values" type="GLuint *" output="true"/>
+ </function>
+
+ <function name="GetnPixelMapusvARB" offset="assign">
+ <param name="map" type="GLenum"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="values" type="GLushort *" output="true"/>
+ </function>
+
+
+
+ <function name="GetnPolygonStippleARB" offset="assign">
+ <param name="bufSize" type="GLsizei"/>
+ <param name="pattern" type="GLubyte *" output="true"/>
+ </function>
+
+ <function name="GetnTexImageARB" offset="assign">
+ <param name="target" type="GLenum"/>
+ <param name="level" type="GLint"/>
+ <param name="format" type="GLenum"/>
+ <param name="type" type="GLenum"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="img" type="GLvoid *" output="true"/>
+ </function>
+
+ <function name="ReadnPixelsARB" offset="assign">
+ <param name="x" type="GLint"/>
+ <param name="y" type="GLint"/>
+ <param name="width" type="GLsizei"/>
+ <param name="height" type="GLsizei"/>
+ <param name="format" type="GLenum"/>
+ <param name="type" type="GLenum"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="data" type="GLvoid *" output="true"/>
+ </function>
+
+
+<!-- ARB_imaging sized buffer queries -->
+ <function name="GetnColorTableARB" offset="assign">
+ <param name="target" type="GLenum"/>
+ <param name="format" type="GLenum"/>
+ <param name="type" type="GLenum"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="table" type="GLvoid *" output="true"/>
+ </function>
+
+ <function name="GetnConvolutionFilterARB" offset="assign">
+ <param name="target" type="GLenum"/>
+ <param name="format" type="GLenum"/>
+ <param name="type" type="GLenum"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="image" type="GLvoid *" output="true"/>
+ </function>
+
+ <function name="GetnSeparableFilterARB" offset="assign">
+ <param name="target" type="GLenum"/>
+ <param name="format" type="GLenum"/>
+ <param name="type" type="GLenum"/>
+ <param name="rowBufSize" type="GLsizei"/>
+ <param name="row" type="GLvoid *" output="true"/>
+ <param name="columnBufSize" type="GLsizei"/>
+ <param name="column" type="GLvoid *" output="true"/>
+ <param name="span" type="GLvoid *" output="true"/>
+ </function>
+
+ <function name="GetnHistogramARB" offset="assign">
+ <param name="target" type="GLenum"/>
+ <param name="reset" type="GLboolean"/>
+ <param name="format" type="GLenum"/>
+ <param name="type" type="GLenum"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="values" type="GLvoid *" output="true"/>
+ </function>
+
+ <function name="GetnMinmaxARB" offset="assign">
+ <param name="target" type="GLenum"/>
+ <param name="reset" type="GLboolean"/>
+ <param name="format" type="GLenum"/>
+ <param name="type" type="GLenum"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="values" type="GLvoid *" output="true"/>
+ </function>
+
+
+<!-- OpenGL 1.3 sized buffer queries -->
+ <function name="GetnCompressedTexImageARB" offset="assign">
+ <param name="target" type="GLenum"/>
+ <param name="lod" type="GLint"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="img" type="GLvoid *" output="true"/>
+ </function>
+
+
+<!-- OpenGL 2.0 sized buffer queries -->
+ <function name="GetnUniformfvARB" offset="assign">
+ <param name="program" type="GLhandleARB"/>
+ <param name="location" type="GLint"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="params" type="GLfloat *" output="true"/>
+ </function>
+
+ <function name="GetnUniformivARB" offset="assign">
+ <param name="program" type="GLhandleARB"/>
+ <param name="location" type="GLint"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="params" type="GLint *" output="true"/>
+ </function>
+
+ <function name="GetnUniformuivARB" offset="assign">
+ <param name="program" type="GLhandleARB"/>
+ <param name="location" type="GLint"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="params" type="GLuint *" output="true"/>
+ </function>
+
+ <function name="GetnUniformdvARB" offset="assign">
+ <param name="program" type="GLhandleARB"/>
+ <param name="location" type="GLint"/>
+ <param name="bufSize" type="GLsizei"/>
+ <param name="params" type="GLdouble *" output="true"/>
+ </function>
+
+</category>
+
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile
index b56ce8639..f02e5d274 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile
+++ b/mesalib/src/mapi/glapi/gen/Makefile
@@ -80,6 +80,7 @@ API_XML = \
ARB_geometry_shader4.xml \
ARB_instanced_arrays.xml \
ARB_map_buffer_range.xml \
+ ARB_robustness.xml \
ARB_sampler_objects.xml \
ARB_seamless_cube_map.xml \
ARB_sync.xml \
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index ef68ad62c..669be6064 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -7983,6 +7983,8 @@
<xi:include href="ARB_color_buffer_float.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_robustness.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
<!-- Non-ARB extensions sorted by extension number. -->
<category name="GL_EXT_blend_color" number="2">
diff --git a/mesalib/src/mapi/glapi/gen/gl_XML.py b/mesalib/src/mapi/glapi/gen/gl_XML.py
index 660c8cfb7..4d414e8b0 100644
--- a/mesalib/src/mapi/glapi/gen/gl_XML.py
+++ b/mesalib/src/mapi/glapi/gen/gl_XML.py
@@ -224,7 +224,7 @@ class gl_print_base:
"""
self.undef_list.append(S)
- print """# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) && defined(__ELF__)
+ print """# if (defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) && defined(__ELF__))
# define %s __attribute__((visibility("%s")))
# else
# define %s