svn merge ^/branches/released .

3 files changed, 99 insertions, 0 deletions

diff --git a/mesalib/src/mapi/glapi/gen/ARB_sampler_objects.xml b/mesalib/src/mapi/glapi/gen/ARB_sampler_objects.xml
new file mode 100644
index 000000000..0d39db4d3
--- /dev/null
+++ b/mesalib/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/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile
index 0e95a34e9..be554e408 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_sampler_objects.xml \

 	ARB_seamless_cube_map.xml \

 	ARB_sync.xml \

 	ARB_texture_buffer_object.xml \

diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 0f30d112e..7497536a5 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -7973,6 +7973,8 @@
 

 <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"/>