Skip to content

A
angle
Commit 751e7888 by Brandon Schade Committed by Commit Bot
Options

Update with official gl.xml and re-sort added formats

Use latest Khronos gl.xml file and re-sort format enums that angle had already added to this file Bug: angleproject:4093 Change-Id: Ic5c1abc2a79fec14f3c53856a429c9b2489e3275 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1972199 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent c3f833f3
Showing with 70 additions and 70 deletions
scripts/code_generation_hashes/GL_EGL_entry_points.json
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"scripts/generate_entry_points.py": "scripts/generate_entry_points.py":
"36f89f5514fff27ecb4baeded89ae64d", "36f89f5514fff27ecb4baeded89ae64d",
"scripts/gl.xml": "scripts/gl.xml":
"f4601dbd36a072c9dcb1c429a7ea816f", "c4a3213e606d844e812883fd729c4fd3",
"scripts/gl_angle_ext.xml": "scripts/gl_angle_ext.xml":
"d6907cd84d95ac0b32a164194eadcf53", "d6907cd84d95ac0b32a164194eadcf53",
"scripts/registry_xml.py": "scripts/registry_xml.py":
......
scripts/code_generation_hashes/GLenum_value_to_string_map.json
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"scripts/gen_gl_enum_utils.py": "scripts/gen_gl_enum_utils.py":
"f25cdc74b57d10a1cbc4194a72e971af", "f25cdc74b57d10a1cbc4194a72e971af",
"scripts/gl.xml": "scripts/gl.xml":
"f4601dbd36a072c9dcb1c429a7ea816f", "c4a3213e606d844e812883fd729c4fd3",
"scripts/gl_angle_ext.xml": "scripts/gl_angle_ext.xml":
"d6907cd84d95ac0b32a164194eadcf53", "d6907cd84d95ac0b32a164194eadcf53",
"scripts/registry_xml.py": "scripts/registry_xml.py":
......
scripts/code_generation_hashes/OpenGL_dispatch_table.json
{ {
"scripts/gl.xml": "scripts/gl.xml":
"f4601dbd36a072c9dcb1c429a7ea816f", "c4a3213e606d844e812883fd729c4fd3",
"src/libANGLE/renderer/angle_format.py": "src/libANGLE/renderer/angle_format.py":
"32ba71942c0fd00e6807104f1bb80a3c", "32ba71942c0fd00e6807104f1bb80a3c",
"src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp": "src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp":
......
scripts/code_generation_hashes/proc_table.json
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"scripts/gen_proc_table.py": "scripts/gen_proc_table.py":
"24dbcc78fd3f000f58ca98237ccc0da4", "24dbcc78fd3f000f58ca98237ccc0da4",
"scripts/gl.xml": "scripts/gl.xml":
"f4601dbd36a072c9dcb1c429a7ea816f", "c4a3213e606d844e812883fd729c4fd3",
"scripts/gl_angle_ext.xml": "scripts/gl_angle_ext.xml":
"d6907cd84d95ac0b32a164194eadcf53", "d6907cd84d95ac0b32a164194eadcf53",
"scripts/registry_xml.py": "scripts/registry_xml.py":
......
scripts/gl.xml
...@@ -1706,10 +1706,6 @@ typedef unsigned int GLhandleARB; ...@@ -1706,10 +1706,6 @@ typedef unsigned int GLhandleARB;
<enum name="GL_RG32UI"/> <enum name="GL_RG32UI"/>
<!-- Base internal format: GL_RGB --> <!-- Base internal format: GL_RGB -->
<enum name="GL_RGB"/> <enum name="GL_RGB"/>
<!-- Base internal format: GL_BGRA -->
<enum name="GL_BGRA"/>
<enum name="GL_BGRA_EXT"/>
<enum name="GL_BGRA_IMG"/>
<!-- <enum name="GL_RGB2" comment="Never actually added to core"/> --> <!-- <enum name="GL_RGB2" comment="Never actually added to core"/> -->
<enum name="GL_RGB2_EXT"/> <enum name="GL_RGB2_EXT"/>
<enum name="GL_RGB4"/> <enum name="GL_RGB4"/>
...@@ -1754,13 +1750,19 @@ typedef unsigned int GLhandleARB; ...@@ -1754,13 +1750,19 @@ typedef unsigned int GLhandleARB;
<enum name="GL_RGB9_E5_APPLE"/> <enum name="GL_RGB9_E5_APPLE"/>
<enum name="GL_RGB9_E5_EXT"/> <enum name="GL_RGB9_E5_EXT"/>
<!-- Base internal format: GL_RGBA --> <!-- Base internal format: GL_RGBA -->
<enum name="GL_RGB10_A2"/> <enum name="GL_RGBA"/>
<enum name="GL_RGB10_A2_EXT"/> <enum name="GL_RGBA4"/>
<enum name="GL_RGB10_A2UI"/> <enum name="GL_RGBA4_EXT"/>
<enum name="GL_RGBA4_OES"/>
<enum name="GL_RGB5_A1"/> <enum name="GL_RGB5_A1"/>
<enum name="GL_RGB5_A1_EXT"/> <enum name="GL_RGB5_A1_EXT"/>
<enum name="GL_RGB5_A1_OES"/> <enum name="GL_RGB5_A1_OES"/>
<enum name="GL_RGBA"/> <enum name="GL_RGBA8"/>
<enum name="GL_RGBA8_EXT"/>
<enum name="GL_RGBA8_OES"/>
<enum name="GL_RGBA8_SNORM"/>
<enum name="GL_RGB10_A2"/>
<enum name="GL_RGB10_A2_EXT"/>
<enum name="GL_RGBA12"/> <enum name="GL_RGBA12"/>
<enum name="GL_RGBA12_EXT"/> <enum name="GL_RGBA12_EXT"/>
<enum name="GL_RGBA16"/> <enum name="GL_RGBA16"/>
...@@ -1770,22 +1772,20 @@ typedef unsigned int GLhandleARB; ...@@ -1770,22 +1772,20 @@ typedef unsigned int GLhandleARB;
<enum name="GL_RGBA16F"/> <enum name="GL_RGBA16F"/>
<enum name="GL_RGBA16F_ARB"/> <enum name="GL_RGBA16F_ARB"/>
<enum name="GL_RGBA16F_EXT"/> <enum name="GL_RGBA16F_EXT"/>
<enum name="GL_RGBA16I"/>
<enum name="GL_RGBA16UI"/>
<enum name="GL_RGBA32F"/> <enum name="GL_RGBA32F"/>
<enum name="GL_RGBA32F_ARB"/> <enum name="GL_RGBA32F_ARB"/>
<enum name="GL_RGBA32F_EXT"/> <enum name="GL_RGBA32F_EXT"/>
<enum name="GL_RGBA32I"/>
<enum name="GL_RGBA32UI"/>
<enum name="GL_RGBA4"/>
<enum name="GL_RGBA4_EXT"/>
<enum name="GL_RGBA4_OES"/>
<enum name="GL_RGBA8"/>
<enum name="GL_RGBA8_EXT"/>
<enum name="GL_RGBA8_OES"/>
<enum name="GL_RGBA8_SNORM"/>
<enum name="GL_RGBA8I"/> <enum name="GL_RGBA8I"/>
<enum name="GL_RGBA16I"/>
<enum name="GL_RGBA32I"/>
<enum name="GL_RGBA8UI"/> <enum name="GL_RGBA8UI"/>
<enum name="GL_RGBA16UI"/>
<enum name="GL_RGBA32UI"/>
<enum name="GL_RGB10_A2UI"/>
<!-- Base internal format: GL_BGRA -->
<enum name="GL_BGRA"/>
<enum name="GL_BGRA_EXT"/>
<enum name="GL_BGRA_IMG"/>
<!-- Base internal format: GL_DEPTH_COMPONENT --> <!-- Base internal format: GL_DEPTH_COMPONENT -->
<enum name="GL_DEPTH_COMPONENT"/> <enum name="GL_DEPTH_COMPONENT"/>
<enum name="GL_DEPTH_COMPONENT16"/> <enum name="GL_DEPTH_COMPONENT16"/>
...@@ -1813,87 +1813,87 @@ typedef unsigned int GLhandleARB; ...@@ -1813,87 +1813,87 @@ typedef unsigned int GLhandleARB;
<enum name="GL_DEPTH24_STENCIL8_OES"/> <enum name="GL_DEPTH24_STENCIL8_OES"/>
<enum name="GL_DEPTH32F_STENCIL8"/> <enum name="GL_DEPTH32F_STENCIL8"/>
<enum name="GL_DEPTH32F_STENCIL8_NV"/> <enum name="GL_DEPTH32F_STENCIL8_NV"/>
<!-- Base internal format: GL_STENCIL -->
<enum name="GL_STENCIL"/> <enum name="GL_STENCIL"/>
<enum name="GL_STENCIL_EXT"/> <enum name="GL_STENCIL_EXT"/>
<!-- Compressed base internal formats --> <!-- Compressed base internal formats -->
<enum name="GL_COMPRESSED_R11_EAC"/>
<enum name="GL_COMPRESSED_RED"/> <enum name="GL_COMPRESSED_RED"/>
<enum name="GL_COMPRESSED_RG"/>
<enum name="GL_COMPRESSED_RGB"/>
<enum name="GL_COMPRESSED_RGBA"/>
<enum name="GL_COMPRESSED_SRGB"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA"/>
<enum name="GL_COMPRESSED_RED_RGTC1"/> <enum name="GL_COMPRESSED_RED_RGTC1"/>
<enum name="GL_COMPRESSED_RED_RGTC1_EXT"/> <enum name="GL_COMPRESSED_RED_RGTC1_EXT"/>
<enum name="GL_COMPRESSED_RG"/> <enum name="GL_COMPRESSED_SIGNED_RED_RGTC1"/>
<enum name="GL_COMPRESSED_SIGNED_RED_RGTC1_EXT"/>
<enum name="GL_COMPRESSED_R11_EAC"/>
<enum name="GL_COMPRESSED_SIGNED_R11_EAC"/>
<enum name="GL_COMPRESSED_RG_RGTC2"/> <enum name="GL_COMPRESSED_RG_RGTC2"/>
<enum name="GL_COMPRESSED_RG11_EAC"/> <enum name="GL_COMPRESSED_SIGNED_RG_RGTC2"/>
<enum name="GL_COMPRESSED_RGB"/> <enum name="GL_COMPRESSED_RGBA_BPTC_UNORM"/>
<enum name="GL_COMPRESSED_RGBA_BPTC_UNORM_ARB"/>
<enum name="GL_COMPRESSED_RGBA_BPTC_UNORM_EXT"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT"/>
<enum name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT"/> <enum name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT"/>
<enum name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB"/> <enum name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB"/>
<enum name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT"/> <enum name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT"/>
<enum name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT"/> <enum name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT"/>
<enum name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB"/> <enum name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB"/>
<enum name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT"/> <enum name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT"/>
<enum name="GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG"/> <enum name="GL_ETC1_RGB8_OES"/>
<enum name="GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG"/>
<enum name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT"/>
<enum name="GL_COMPRESSED_RGB8_ETC2"/> <enum name="GL_COMPRESSED_RGB8_ETC2"/>
<enum name="GL_COMPRESSED_SRGB8_ETC2"/>
<enum name="GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2"/> <enum name="GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
<enum name="GL_COMPRESSED_RGBA"/> <enum name="GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_3x3x3_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_4x3x3_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_4x4x3_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_4x4x4_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_5x4x4_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_5x5x4_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_5x5x5_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_6x5x5_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_6x6x5_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_6x6x6_OES"/>
<enum name="GL_COMPRESSED_RGBA_BPTC_UNORM"/>
<enum name="GL_COMPRESSED_RGBA_BPTC_UNORM_ARB"/>
<enum name="GL_COMPRESSED_RGBA_BPTC_UNORM_EXT"/>
<enum name="GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG"/>
<enum name="GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG"/>
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT"/>
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE"/>
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT3_EXT"/>
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT3_EXT"/>
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE"/>
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT5_EXT"/>
<enum name="GL_COMPRESSED_RGBA8_ETC2_EAC"/> <enum name="GL_COMPRESSED_RGBA8_ETC2_EAC"/>
<enum name="GL_COMPRESSED_SIGNED_R11_EAC"/> <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC"/>
<enum name="GL_COMPRESSED_SIGNED_RED_RGTC1"/> <enum name="GL_COMPRESSED_RG11_EAC"/>
<enum name="GL_COMPRESSED_SIGNED_RED_RGTC1_EXT"/>
<enum name="GL_COMPRESSED_SIGNED_RG_RGTC2"/>
<enum name="GL_COMPRESSED_SIGNED_RG11_EAC"/> <enum name="GL_COMPRESSED_SIGNED_RG11_EAC"/>
<enum name="GL_COMPRESSED_SRGB"/> <enum name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA"/> <enum name="GL_COMPRESSED_SRGB_S3TC_DXT1_EXT"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM"/> <enum name="GL_COMPRESSED_SRGB_S3TC_DXT1_NV"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB"/> <enum name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT"/> <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV"/> <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV"/>
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE"/>
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT3_EXT"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT"/> <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV"/> <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV"/>
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE"/>
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT5_EXT"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT"/> <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV"/> <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV"/>
<enum name="GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG"/>
<enum name="GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT"/> <enum name="GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT"/>
<enum name="GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT"/>
<enum name="GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG"/>
<enum name="GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT"/> <enum name="GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT"/>
<enum name="GL_COMPRESSED_SRGB_S3TC_DXT1_EXT"/> <enum name="GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG"/>
<enum name="GL_COMPRESSED_SRGB_S3TC_DXT1_NV"/> <enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_3x3x3_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES"/> <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_4x3x3_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES"/> <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_4x4x3_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES"/> <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_4x4x4_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES"/> <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_5x4x4_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES"/> <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_5x5x4_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES"/> <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_5x5x5_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES"/> <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_6x5x5_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES"/> <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_6x6x5_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES"/> <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES"/>
<enum name="GL_COMPRESSED_RGBA_ASTC_6x6x6_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES"/> <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC"/>
<enum name="GL_COMPRESSED_SRGB8_ETC2"/>
<enum name="GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
<enum name="GL_ETC1_RGB8_OES"/>
</group> </group>
<group name="PixelMap"> <group name="PixelMap">
...@@ -46947,7 +46947,7 @@ typedef unsigned int GLhandleARB; ...@@ -46947,7 +46947,7 @@ typedef unsigned int GLhandleARB;
<command name="glIsPointInFillPathNV"/> <command name="glIsPointInFillPathNV"/>
<command name="glIsPointInStrokePathNV"/> <command name="glIsPointInStrokePathNV"/>
<command name="glGetPathLengthNV"/> <command name="glGetPathLengthNV"/>
<command name="glPointAlongPathNV"/> <command name="glPointAlongPathNV"/>
</require> </require>
<require comment="API revision 1.2"> <require comment="API revision 1.2">
<enum name="GL_ROUNDED_RECT_NV"/> <enum name="GL_ROUNDED_RECT_NV"/>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment