summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2016-02-17 07:36:58 -0500
committerIlia Mirkin <imirkin@alum.mit.edu>2016-02-22 10:38:56 -0500
commit571bd9ac4280b0d3c10281e9899afb33bc67d589 (patch)
tree9f471616209a45bc4f6239f9ac93d984180ff01b
parentb6654831c36f9780e6bcd23bb211470ec0db7de2 (diff)
mesa: add GL_EXT_texture_border_clamp support
This extension is identical to GL_OES_texture_border_clamp. But dEQP has tests that want the EXT variant. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
-rw-r--r--src/mapi/glapi/gen/EXT_texture_integer.xml8
-rw-r--r--src/mapi/glapi/gen/es_EXT.xml30
-rw-r--r--src/mesa/main/extensions_table.h1
3 files changed, 35 insertions, 4 deletions
diff --git a/src/mapi/glapi/gen/EXT_texture_integer.xml b/src/mapi/glapi/gen/EXT_texture_integer.xml
index 5f9ea2963d..eb6b220ea6 100644
--- a/src/mapi/glapi/gen/EXT_texture_integer.xml
+++ b/src/mapi/glapi/gen/EXT_texture_integer.xml
@@ -69,25 +69,25 @@
<param name="a" type="GLuint"/>
</function>
- <function name="TexParameterIivEXT" alias="TexParameterIiv">
+ <function name="TexParameterIivEXT" alias="TexParameterIiv" es2="3.0">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="const GLint *"/>
</function>
- <function name="TexParameterIuivEXT" alias="TexParameterIuiv">
+ <function name="TexParameterIuivEXT" alias="TexParameterIuiv" es2="3.0">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="const GLuint *"/>
</function>
- <function name="GetTexParameterIivEXT" alias="GetTexParameterIiv">
+ <function name="GetTexParameterIivEXT" alias="GetTexParameterIiv" es2="3.0">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLint *"/>
</function>
- <function name="GetTexParameterIuivEXT" alias="GetTexParameterIuiv">
+ <function name="GetTexParameterIuivEXT" alias="GetTexParameterIuiv" es2="3.0">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLuint *"/>
diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
index fb0ef05f85..178f7c027b 100644
--- a/src/mapi/glapi/gen/es_EXT.xml
+++ b/src/mapi/glapi/gen/es_EXT.xml
@@ -817,6 +817,36 @@
</function>
</category>
+<category name="GL_EXT_texture_border_clamp" number="182">
+
+ <!-- The *TexParameter* functions are added in EXT_texture_integer -->
+
+ <function name="SamplerParameterIivEXT" es2="3.0" alias="SamplerParameterIiv">
+ <param name="sampler" type="GLuint"/>
+ <param name="pname" type="GLenum"/>
+ <param name="params" type="const GLint *"/>
+ </function>
+
+ <function name="SamplerParameterIuivEXT" es2="3.0" alias="SamplerParameterIuiv">
+ <param name="sampler" type="GLuint"/>
+ <param name="pname" type="GLenum"/>
+ <param name="params" type="const GLuint *"/>
+ </function>
+
+ <function name="GetSamplerParameterIivEXT" es2="3.0" alias="GetSamplerParameterIiv">
+ <param name="sampler" type="GLuint"/>
+ <param name="pname" type="GLenum"/>
+ <param name="params" type="GLint *"/>
+ </function>
+
+ <function name="GetSamplerParameterIuivEXT" es2="3.0" alias="GetSamplerParameterIuiv">
+ <param name="sampler" type="GLuint"/>
+ <param name="pname" type="GLenum"/>
+ <param name="params" type="GLfloat *"/>
+ </function>
+
+</category>
+
<category name="GL_EXT_draw_elements_base_vertex" number="204">
<function name="DrawElementsBaseVertexEXT" alias="DrawElementsBaseVertex"
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index 2cd9d7586d..dcbde2de45 100644
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -224,6 +224,7 @@ EXT(EXT_subtexture , dummy_true
EXT(EXT_texture , dummy_true , GLL, x , x , x , 1996)
EXT(EXT_texture3D , dummy_true , GLL, x , x , x , 1996)
EXT(EXT_texture_array , EXT_texture_array , GLL, GLC, x , x , 2006)
+EXT(EXT_texture_border_clamp , ARB_texture_border_clamp , x , x , x , ES2, 2014)
EXT(EXT_texture_compression_dxt1 , ANGLE_texture_compression_dxt , GLL, GLC, ES1, ES2, 2004)
EXT(EXT_texture_compression_latc , EXT_texture_compression_latc , GLL, x , x , x , 2006)
EXT(EXT_texture_compression_rgtc , ARB_texture_compression_rgtc , GLL, GLC, x , x , 2004)