diff options
Diffstat (limited to 'src/mapi/glapi/gen')
-rw-r--r-- | src/mapi/glapi/gen/ARB_color_buffer_float.xml | 25 | ||||
-rw-r--r-- | src/mapi/glapi/gen/ARB_sampler_objects.xml | 96 | ||||
-rw-r--r-- | src/mapi/glapi/gen/ARB_texture_buffer_object.xml | 22 | ||||
-rw-r--r-- | src/mapi/glapi/gen/GL3x.xml | 4 | ||||
-rw-r--r-- | src/mapi/glapi/gen/Makefile | 6 | ||||
-rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 5 | ||||
-rw-r--r-- | src/mapi/glapi/gen/gl_XML.py | 2 |
7 files changed, 154 insertions, 6 deletions
diff --git a/src/mapi/glapi/gen/ARB_color_buffer_float.xml b/src/mapi/glapi/gen/ARB_color_buffer_float.xml new file mode 100644 index 0000000..7acf271 --- /dev/null +++ b/src/mapi/glapi/gen/ARB_color_buffer_float.xml @@ -0,0 +1,25 @@ +<?xml version="1.0"?> +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> + +<!-- Note: no GLX protocol info yet. --> + + +<OpenGLAPI> + +<category name="GL_ARB_color_buffer_float" number="39"> + + <enum name="RGBA_FLOAT_MODE_ARB" value="0x8820"/> + <enum name="CLAMP_VERTEX_COLOR_ARB" value="0x891A"/> + <enum name="CLAMP_FRAGMENT_COLOR_ARB" value="0x891B"/> + <enum name="CLAMP_READ_COLOR_ARB" value="0x891C"/> + <enum name="FIXED_ONLY_ARB" value="0x891D"/> + + <function name="ClampColorARB" offset="assign"> + <param name="target" type="GLenum"/> + <param name="clamp" type="GLenum"/> + <glx rop="234"/> + </function> + +</category> + +</OpenGLAPI> diff --git a/src/mapi/glapi/gen/ARB_sampler_objects.xml b/src/mapi/glapi/gen/ARB_sampler_objects.xml new file mode 100644 index 0000000..0d39db4 --- /dev/null +++ b/src/mapi/glapi/gen/ARB_sampler_objects.xml @@ -0,0 +1,96 @@ +<?xml version="1.0"?> +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> + +<!-- Note: no GLX protocol info yet. --> + +<OpenGLAPI> + +<category name="GL_ARB_sampler_objects" number="81"> + + <function name="GenSamplers" offset="assign"> + <param name="count" type="GLsizei"/> + <param name="samplers" type="GLuint *"/> + </function> + + <function name="DeleteSamplers" offset="assign"> + <param name="count" type="GLsizei"/> + <param name="samplers" type="const GLuint *"/> + </function> + + <function name="IsSampler" offset="assign"> + <param name="sampler" type="GLuint"/> + <return type="GLboolean"/> + </function> + + <function name="BindSampler" offset="assign"> + <param name="unit" type="GLuint"/> + <param name="sampler" type="GLuint"/> + </function> + + <function name="SamplerParameteri" offset="assign"> + <param name="sampler" type="GLuint"/> + <param name="pname" type="GLenum"/> + <param name="param" type="GLint"/> + </function> + + <function name="SamplerParameterf" offset="assign"> + <param name="sampler" type="GLuint"/> + <param name="pname" type="GLenum"/> + <param name="param" type="GLfloat"/> + </function> + + <function name="SamplerParameteriv" offset="assign"> + <param name="sampler" type="GLuint"/> + <param name="pname" type="GLenum"/> + <param name="params" type="const GLint *"/> + </function> + + <function name="SamplerParameterfv" offset="assign"> + <param name="sampler" type="GLuint"/> + <param name="pname" type="GLenum"/> + <param name="params" type="const GLfloat *"/> + </function> + + <function name="SamplerParameterIiv" offset="assign"> + <param name="sampler" type="GLuint"/> + <param name="pname" type="GLenum"/> + <param name="params" type="const GLint *"/> + </function> + + <function name="SamplerParameterIuiv" offset="assign"> + <param name="sampler" type="GLuint"/> + <param name="pname" type="GLenum"/> + <param name="params" type="const GLuint *"/> + </function> + + <function name="GetSamplerParameteriv" offset="assign"> + <param name="sampler" type="GLuint"/> + <param name="pname" type="GLenum"/> + <param name="params" type="GLint *"/> + </function> + + <function name="GetSamplerParameterfv" offset="assign"> + <param name="sampler" type="GLuint"/> + <param name="pname" type="GLenum"/> + <param name="params" type="GLfloat *"/> + </function> + + <function name="GetSamplerParameterIiv" offset="assign"> + <param name="sampler" type="GLuint"/> + <param name="pname" type="GLenum"/> + <param name="params" type="GLint *"/> + </function> + + <function name="GetSamplerParameterIuiv" offset="assign"> + <param name="sampler" type="GLuint"/> + <param name="pname" type="GLenum"/> + <param name="params" type="GLuint *"/> + </function> + + <enum name="SAMPLER_BINDING" count="1" value="0x8919"> + <size name="Get" mode="get"/> + </enum> + +</category> + +</OpenGLAPI> diff --git a/src/mapi/glapi/gen/ARB_texture_buffer_object.xml b/src/mapi/glapi/gen/ARB_texture_buffer_object.xml new file mode 100644 index 0000000..57680f5 --- /dev/null +++ b/src/mapi/glapi/gen/ARB_texture_buffer_object.xml @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> + +<OpenGLAPI> + +<category name="GL_ARB_texture_buffer_object" number="51"> + + <enum name="TEXTURE_BUFFER_ARB" value="0x8C2A"/> + <enum name="MAX_TEXTURE_BUFFER_SIZE_ARB" value="0x8C2B"/> + <enum name="TEXTURE_BINDING_BUFFER_ARB" value="0x8C2C"/> + <enum name="TEXTURE_BUFFER_DATA_STORE_BINDING_ARB" value="0x8C2D"/> + <enum name="TEXTURE_BUFFER_FORMAT_ARB" value="0x8C2E"/> + + <function name="TexBufferARB" offset="assign"> + <param name="target" type="GLenum"/> + <param name="internalFormat" type="GLenum"/> + <param name="buffer" type="GLuint"/> + </function> + +</category> + +</OpenGLAPI> diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml index 8d15c94..cec9c91 100644 --- a/src/mapi/glapi/gen/GL3x.xml +++ b/src/mapi/glapi/gen/GL3x.xml @@ -133,8 +133,8 @@ <function name="ClearBufferfi" offset="assign"> <param name="buffer" type="GLenum"/> <param name="drawbuffer" type="GLint"/> - <param name="depth" type="const GLfloat"/> - <param name="stencil" type="const GLint"/> + <param name="depth" type="GLfloat"/> + <param name="stencil" type="GLint"/> </function> <function name="GetStringi" offset="assign"> diff --git a/src/mapi/glapi/gen/Makefile b/src/mapi/glapi/gen/Makefile index 1f4642a..b56ce86 100644 --- a/src/mapi/glapi/gen/Makefile +++ b/src/mapi/glapi/gen/Makefile @@ -41,8 +41,6 @@ XORG_GLX_DIR = $(XORG_BASE)/glx XORG_GLAPI_DIR = $(XORG_BASE)/glx XORG_GLAPI_FILES = \ - $(XORG_GLAPI_DIR)/glapi.h \ - $(XORG_GLAPI_DIR)/glapi.c \ $(XORG_GLAPI_DIR)/glapi_getproc.c \ $(XORG_GLAPI_DIR)/glapi_nop.c \ $(XORG_GLAPI_DIR)/glthread.c \ @@ -50,7 +48,6 @@ XORG_GLAPI_FILES = \ XORG_GLAPI_OUTPUTS = \ $(XORG_GLAPI_DIR)/glprocs.h \ - $(XORG_GLAPI_DIR)/glapitemp.h \ $(XORG_GLAPI_DIR)/glapioffsets.h \ $(XORG_GLAPI_DIR)/glapitable.h \ $(XORG_GLAPI_DIR)/glapidispatch.h @@ -72,6 +69,7 @@ XORG_OUTPUTS = \ API_XML = \ gl_API.xml \ + ARB_color_buffer_float.xml \ ARB_copy_buffer.xml \ ARB_depth_clamp.xml \ ARB_draw_buffers_blend.xml \ @@ -82,8 +80,10 @@ API_XML = \ ARB_geometry_shader4.xml \ ARB_instanced_arrays.xml \ ARB_map_buffer_range.xml \ + ARB_sampler_objects.xml \ ARB_seamless_cube_map.xml \ ARB_sync.xml \ + ARB_texture_buffer_object.xml \ ARB_vertex_array_object.xml \ APPLE_object_purgeable.xml \ APPLE_vertex_array_object.xml \ diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 56c0ec7..ef68ad6 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -7973,12 +7973,15 @@ <xi:include href="NV_texture_barrier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<xi:include href="ARB_sampler_objects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <xi:include href="EXT_transform_feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="ARB_draw_instanced.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="ARB_geometry_shader4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<xi:include href="ARB_color_buffer_float.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <!-- Non-ARB extensions sorted by extension number. --> @@ -12529,4 +12532,6 @@ <xi:include href="ARB_draw_buffers_blend.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<xi:include href="ARB_texture_buffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + </OpenGLAPI> diff --git a/src/mapi/glapi/gen/gl_XML.py b/src/mapi/glapi/gen/gl_XML.py index 660c8cf..4d414e8 100644 --- a/src/mapi/glapi/gen/gl_XML.py +++ b/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 |