summaryrefslogtreecommitdiffstats
path: root/src/mapi
diff options
context:
space:
mode:
authorLaura Ekstrand <[email protected]>2014-10-30 17:19:24 -0700
committerLaura Ekstrand <[email protected]>2015-01-08 11:37:28 -0800
commit77aabd8be237b68921d2e7c69fd1a0be3d36de01 (patch)
tree818af9caa403960275a6ba1e63e8c06ef9054a97 /src/mapi
parent4b381e84db5ee1a03c9b9afca2817d8bd374c0b0 (diff)
main: Added entry point for BindTextureUnit.
The following preparations were made in texstate.c and texstate.h to better facilitate the BindTextureUnit function: Dylan Noblesmith: mesa: add _mesa_get_tex_unit() mesa: factor out _mesa_max_tex_unit() This is about to appear in a lot more places, so reduce boilerplate copy paste. add _mesa_get_tex_unit_err() checking getter function Reduce boilerplate across files. Laura Ekstrand: Made note of why BindTextureUnit should throw GL_INVALID_OPERATION if the unit is out of range. Added assert(unit > 0) to _mesa_get_tex_unit. Reviewed-by: Anuj Phogat <[email protected]>
Diffstat (limited to 'src/mapi')
-rw-r--r--src/mapi/glapi/gen/ARB_direct_state_access.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml
index 4c5005f30fa..f54c3f8b762 100644
--- a/src/mapi/glapi/gen/ARB_direct_state_access.xml
+++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml
@@ -75,5 +75,10 @@
<param name="pixels" type="const GLvoid *" />
</function>
+ <function name="BindTextureUnit" offset="assign">
+ <param name="unit" type="GLuint" />
+ <param name="texture" type="GLuint" />
+ </function>
+
</category>
</OpenGLAPI>