diff options
author | Jesse Hall <jessehall@google.com> | 2014-05-17 22:46:36 -0700 |
---|---|---|
committer | Jesse Hall <jessehall@google.com> | 2014-05-19 12:54:05 -0700 |
commit | a66730f78796664fb5232aa4c1139f4b837beaf4 (patch) | |
tree | aeb75835ec1db94efe77927f58725a25297d4aa2 /opengl | |
parent | f466a51c1325d2034326e25dd61c359ed2c566af (diff) | |
download | frameworks_native-a66730f78796664fb5232aa4c1139f4b837beaf4.zip frameworks_native-a66730f78796664fb5232aa4c1139f4b837beaf4.tar.gz frameworks_native-a66730f78796664fb5232aa4c1139f4b837beaf4.tar.bz2 |
opengl: Add EXT_primitive_bounding_box to registry
This extension hasn't been published yet, so it isn't in the public
registry. That will change before the next platform release to AOSP.
Bug: 15028495
Change-Id: Iadafe0f776b5b9be4f81c4279a89c57ae02293e4
Diffstat (limited to 'opengl')
-rw-r--r-- | opengl/include/GLES2/gl2ext.h | 13 | ||||
-rwxr-xr-x | opengl/tools/glgen2/registry/gl.xml | 22 |
2 files changed, 32 insertions, 3 deletions
diff --git a/opengl/include/GLES2/gl2ext.h b/opengl/include/GLES2/gl2ext.h index c9eab11..9749f9f 100644 --- a/opengl/include/GLES2/gl2ext.h +++ b/opengl/include/GLES2/gl2ext.h @@ -33,14 +33,14 @@ extern "C" { ** used to make the header, and the header can be found at ** http://www.opengl.org/registry/ ** -** Khronos $Revision: 26696 $ on $Date: 2014-05-17 14:48:55 -0700 (Sat, 17 May 2014) $ +** Khronos $Revision$ on $Date$ */ #ifndef GL_APIENTRYP #define GL_APIENTRYP GL_APIENTRY* #endif -/* Generated on date 20140517 */ +/* Generated on date 20140519 */ /* Generated C header for: * API: gles2 @@ -988,6 +988,15 @@ GL_APICALL void GL_APIENTRY glGetIntegeri_vEXT (GLenum target, GLuint index, GLi #define GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT 0x8D6A #endif /* GL_EXT_occlusion_query_boolean */ +#ifndef GL_EXT_primitive_bounding_box +#define GL_EXT_primitive_bounding_box 1 +#define GL_PRIMITIVE_BOUNDING_BOX_EXT 0x92BE +typedef void (GL_APIENTRYP PFNGLPRIMITIVEBOUNDINGBOXEXTPROC) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW); +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glPrimitiveBoundingBoxEXT (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW); +#endif +#endif /* GL_EXT_primitive_bounding_box */ + #ifndef GL_EXT_pvrtc_sRGB #define GL_EXT_pvrtc_sRGB 1 #define GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT 0x8A54 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"/> |