Update EGL and GLES headers.
Notable new extensions:
EGL_EXT_image_gl_colorspace
GL_EXT_EGL_image_storage
GL_EXT_clip_control
GL_KHR_parallel_shader_compile
The first two extensions will be required in P for devices with the feature
android.vr.high_performance.
Changes compared to Khronos versions of the headers:
1. The Khronos headers contain a recent fix to remove the incorrectly
named function glMultiDrawElementsBaseVertexOES, which should have
the EXT prefix according to the extension specification. However,
frameworks/base references that function in libs/hwui/debug, so it
was teomprarily added back to the gl2ext.h and the .in files.
See ag/3831170 and this link for further information:
https://github.com/KhronosGroup/OpenGL-Registry/issues/81
2. eglext.h was modified to add the undocumented and deprecated
EGL_ANDROID_image_crop extension. See bug 15287899 for context.
This also tweaks the glgen script to ignore Windows-specific items.
Bug: 74131503
Bug: 76152545
Test: Built and ran a few OpenGL-related CTS tests on Pixel XL.
Change-Id: I5b365c114b09228a6ead291c08e5330153f75748
diff --git a/opengl/tools/glgen2/glgen.py b/opengl/tools/glgen2/glgen.py
index a140091..fa981a8 100755
--- a/opengl/tools/glgen2/glgen.py
+++ b/opengl/tools/glgen2/glgen.py
@@ -117,6 +117,8 @@
reg.OutputGenerator.__init__(self, sys.stderr, sys.stderr, None)
def genCmd(self, cmd, name):
+ if re.search('Win32', name):
+ return
reg.OutputGenerator.genCmd(self, cmd, name)
rtype, fname = parseProto(cmd.elem.find('proto'))
@@ -142,6 +144,8 @@
self.enums = collections.OrderedDict()
def genCmd(self, cmd, name):
+ if re.search('Win32', name):
+ return
reg.OutputGenerator.genCmd(self, cmd, name)
rtype, fname = parseProto(cmd.elem.find('proto'))
params = [parseParam(p) for p in cmd.elem.findall('param')]
@@ -166,6 +170,8 @@
# so leaving for later.
if re.search('_BIT($|\d*_)', name):
return
+ if re.search('D3D|WIN32', name):
+ return
# Skip non-hex values (GL_TRUE, GL_FALSE, header guard junk)
if not re.search('0x[0-9A-Fa-f]+', value):