summaryrefslogtreecommitdiffstats
path: root/opengl/tools
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2014-05-20 18:39:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-20 18:39:52 +0000
commitc1eef76d2c32f022e286fed033cafade874d7764 (patch)
tree6399219e88f13be6ba63a7020e202bbffc58d109 /opengl/tools
parent481b5ebb907fe6bf9e3cfe25789450862baaf082 (diff)
parenta66730f78796664fb5232aa4c1139f4b837beaf4 (diff)
downloadframeworks_native-c1eef76d2c32f022e286fed033cafade874d7764.zip
frameworks_native-c1eef76d2c32f022e286fed033cafade874d7764.tar.gz
frameworks_native-c1eef76d2c32f022e286fed033cafade874d7764.tar.bz2
Merge "opengl: Add EXT_primitive_bounding_box to registry"
Diffstat (limited to 'opengl/tools')
-rwxr-xr-xopengl/tools/glgen2/registry/gl.xml22
1 files changed, 21 insertions, 1 deletions
diff --git a/opengl/tools/glgen2/registry/gl.xml b/opengl/tools/glgen2/registry/gl.xml
index ab5a422..3f0697a 100755
--- a/opengl/tools/glgen2/registry/gl.xml
+++ b/opengl/tools/glgen2/registry/gl.xml
@@ -948,6 +948,7 @@ typedef unsigned int GLhandleARB;
<enum name="GL_POST_CONVOLUTION_RED_SCALE_EXT"/>
<enum name="GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX"/>
<enum name="GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX"/>
+ <enum name="GL_PRIMITIVE_BOUNDING_BOX_EXT"/>
<enum name="GL_PROJECTION_MATRIX"/>
<enum name="GL_PROJECTION_STACK_DEPTH"/>
<enum name="GL_READ_BUFFER"/>
@@ -7804,7 +7805,9 @@ typedef unsigned int GLhandleARB;
<enum value="0x92B2" name="GL_PLUS_CLAMPED_ALPHA_NV"/>
<enum value="0x92B3" name="GL_MINUS_CLAMPED_NV"/>
<enum value="0x92B4" name="GL_INVERT_OVG_NV"/>
- <unused start="0x92B5" end="0x92BF"/>
+ <unused start="0x92B5" end="0x92BD"/>
+ <enum value="0x92BE" name="GL_PRIMITIVE_BOUNDING_BOX_EXT"/>
+ <unused start="0x92BF"/>
<enum value="0x92C0" name="GL_ATOMIC_COUNTER_BUFFER"/>
<enum value="0x92C1" name="GL_ATOMIC_COUNTER_BUFFER_BINDING"/>
<enum value="0x92C2" name="GL_ATOMIC_COUNTER_BUFFER_START"/>
@@ -19351,6 +19354,17 @@ typedef unsigned int GLhandleARB;
<param><ptype>GLuint</ptype> <name>key1</name></param>
</command>
<command>
+ <proto>void <name>glPrimitiveBoundingBoxEXT</name></proto>
+ <param><ptype>GLfloat</ptype> <name>minX</name></param>
+ <param><ptype>GLfloat</ptype> <name>minY</name></param>
+ <param><ptype>GLfloat</ptype> <name>minZ</name></param>
+ <param><ptype>GLfloat</ptype> <name>minW</name></param>
+ <param><ptype>GLfloat</ptype> <name>maxX</name></param>
+ <param><ptype>GLfloat</ptype> <name>maxY</name></param>
+ <param><ptype>GLfloat</ptype> <name>maxZ</name></param>
+ <param><ptype>GLfloat</ptype> <name>maxW</name></param>
+ </command>
+ <command>
<proto>void <name>glPrimitiveRestartIndex</name></proto>
<param><ptype>GLuint</ptype> <name>index</name></param>
</command>
@@ -37495,6 +37509,12 @@ typedef unsigned int GLhandleARB;
<command name="glPolygonOffsetEXT"/>
</require>
</extension>
+ <extension name="GL_EXT_primitive_bounding_box" supported="gles2">
+ <require>
+ <enum name="GL_PRIMITIVE_BOUNDING_BOX_EXT"/>
+ <command name="glPrimitiveBoundingBoxEXT"/>
+ </require>
+ </extension>
<extension name="GL_EXT_provoking_vertex" supported="gl">
<require>
<enum name="GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT"/>