ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

Merge "Revert "opengl: Add EXT_primitive_bounding_box to registry""

Browse Source
This commit is contained in:
Jesse Hall 2014-05-20 21:29:48 +00:00 committed by Android (Google) Code Review
commit 9cb36d8e83
2 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
opengl/include/GLES2/gl2ext.h
View File

@ -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$ on $Date$
** Khronos $Revision: 26696 $ on $Date: 2014-05-17 14:48:55 -0700 (Sat, 17 May 2014) $
*/
#ifndef GL_APIENTRYP
#define GL_APIENTRYP GL_APIENTRY*
#endif
/* Generated on date 20140519 */
/* Generated on date 20140517 */
/* Generated C header for:
* API: gles2
@ -988,15 +988,6 @@ 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

22
opengl/tools/glgen2/registry/gl.xml
View File

@ -948,7 +948,6 @@ 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"/>
@ -7805,9 +7804,7 @@ 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="0x92BD"/>
<enum value="0x92BE" name="GL_PRIMITIVE_BOUNDING_BOX_EXT"/>
<unused start="0x92BF"/>
<unused start="0x92B5" end="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"/>
@ -19353,17 +19350,6 @@ typedef unsigned int GLhandleARB;
<param><ptype>GLuint</ptype> <name>fill1</name></param>
<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>
@ -37509,12 +37495,6 @@ 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"/>