From a66730f78796664fb5232aa4c1139f4b837beaf4 Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Sat, 17 May 2014 22:46:36 -0700 Subject: [PATCH] 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 --- opengl/include/GLES2/gl2ext.h | 13 +++++++++++-- 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 c9eab11ae..9749f9fdb 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 ab5a422f8..3f0697a30 100755 --- a/opengl/tools/glgen2/registry/gl.xml +++ b/opengl/tools/glgen2/registry/gl.xml @@ -948,6 +948,7 @@ typedef unsigned int GLhandleARB; + @@ -7804,7 +7805,9 @@ typedef unsigned int GLhandleARB; - + + + @@ -19350,6 +19353,17 @@ typedef unsigned int GLhandleARB; GLuint fill1 GLuint key1 + + void glPrimitiveBoundingBoxEXT + GLfloat minX + GLfloat minY + GLfloat minZ + GLfloat minW + GLfloat maxX + GLfloat maxY + GLfloat maxZ + GLfloat maxW + void glPrimitiveRestartIndex GLuint index @@ -37495,6 +37509,12 @@ typedef unsigned int GLhandleARB; + + + + + +