Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 751e788

Browse files
Brandon SchadeCommit Bot
Brandon Schade
authored and
Commit Bot
committed
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: Jamie Madill <jmadill@chromium.org>
1 parent c3f833f commit 751e788

File tree

5 files changed

+70
-70
lines changed

5 files changed

+70
-70
lines changed

‎scripts/code_generation_hashes/GL_EGL_entry_points.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"scripts/generate_entry_points.py":
99
"36f89f5514fff27ecb4baeded89ae64d",
1010
"scripts/gl.xml":
11-
"f4601dbd36a072c9dcb1c429a7ea816f",
11+
"c4a3213e606d844e812883fd729c4fd3",
1212
"scripts/gl_angle_ext.xml":
1313
"d6907cd84d95ac0b32a164194eadcf53",
1414
"scripts/registry_xml.py":

‎scripts/code_generation_hashes/GLenum_value_to_string_map.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"scripts/gen_gl_enum_utils.py":
33
"f25cdc74b57d10a1cbc4194a72e971af",
44
"scripts/gl.xml":
5-
"f4601dbd36a072c9dcb1c429a7ea816f",
5+
"c4a3213e606d844e812883fd729c4fd3",
66
"scripts/gl_angle_ext.xml":
77
"d6907cd84d95ac0b32a164194eadcf53",
88
"scripts/registry_xml.py":

‎scripts/code_generation_hashes/OpenGL_dispatch_table.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"scripts/gl.xml":
3-
"f4601dbd36a072c9dcb1c429a7ea816f",
3+
"c4a3213e606d844e812883fd729c4fd3",
44
"src/libANGLE/renderer/angle_format.py":
55
"32ba71942c0fd00e6807104f1bb80a3c",
66
"src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp":

‎scripts/code_generation_hashes/proc_table.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"scripts/gen_proc_table.py":
77
"24dbcc78fd3f000f58ca98237ccc0da4",
88
"scripts/gl.xml":
9-
"f4601dbd36a072c9dcb1c429a7ea816f",
9+
"c4a3213e606d844e812883fd729c4fd3",
1010
"scripts/gl_angle_ext.xml":
1111
"d6907cd84d95ac0b32a164194eadcf53",
1212
"scripts/registry_xml.py":

‎scripts/gl.xml‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1706,10 +1706,6 @@ typedef unsigned int GLhandleARB;
17061706
<enum name="GL_RG32UI"/>
17071707
<!-- Base internal format: GL_RGB -->
17081708
<enum name="GL_RGB"/>
1709-
<!-- Base internal format: GL_BGRA -->
1710-
<enum name="GL_BGRA"/>
1711-
<enum name="GL_BGRA_EXT"/>
1712-
<enum name="GL_BGRA_IMG"/>
17131709
<!-- <enum name="GL_RGB2" comment="Never actually added to core"/> -->
17141710
<enum name="GL_RGB2_EXT"/>
17151711
<enum name="GL_RGB4"/>
@@ -1754,13 +1750,19 @@ typedef unsigned int GLhandleARB;
17541750
<enum name="GL_RGB9_E5_APPLE"/>
17551751
<enum name="GL_RGB9_E5_EXT"/>
17561752
<!-- Base internal format: GL_RGBA -->
1757-
<enum name="GL_RGB10_A2"/>
1758-
<enum name="GL_RGB10_A2_EXT"/>
1759-
<enum name="GL_RGB10_A2UI"/>
1753+
<enum name="GL_RGBA"/>
1754+
<enum name="GL_RGBA4"/>
1755+
<enum name="GL_RGBA4_EXT"/>
1756+
<enum name="GL_RGBA4_OES"/>
17601757
<enum name="GL_RGB5_A1"/>
17611758
<enum name="GL_RGB5_A1_EXT"/>
17621759
<enum name="GL_RGB5_A1_OES"/>
1763-
<enum name="GL_RGBA"/>
1760+
<enum name="GL_RGBA8"/>
1761+
<enum name="GL_RGBA8_EXT"/>
1762+
<enum name="GL_RGBA8_OES"/>
1763+
<enum name="GL_RGBA8_SNORM"/>
1764+
<enum name="GL_RGB10_A2"/>
1765+
<enum name="GL_RGB10_A2_EXT"/>
17641766
<enum name="GL_RGBA12"/>
17651767
<enum name="GL_RGBA12_EXT"/>
17661768
<enum name="GL_RGBA16"/>
@@ -1770,22 +1772,20 @@ typedef unsigned int GLhandleARB;
17701772
<enum name="GL_RGBA16F"/>
17711773
<enum name="GL_RGBA16F_ARB"/>
17721774
<enum name="GL_RGBA16F_EXT"/>
1773-
<enum name="GL_RGBA16I"/>
1774-
<enum name="GL_RGBA16UI"/>
17751775
<enum name="GL_RGBA32F"/>
17761776
<enum name="GL_RGBA32F_ARB"/>
17771777
<enum name="GL_RGBA32F_EXT"/>
1778-
<enum name="GL_RGBA32I"/>
1779-
<enum name="GL_RGBA32UI"/>
1780-
<enum name="GL_RGBA4"/>
1781-
<enum name="GL_RGBA4_EXT"/>
1782-
<enum name="GL_RGBA4_OES"/>
1783-
<enum name="GL_RGBA8"/>
1784-
<enum name="GL_RGBA8_EXT"/>
1785-
<enum name="GL_RGBA8_OES"/>
1786-
<enum name="GL_RGBA8_SNORM"/>
17871778
<enum name="GL_RGBA8I"/>
1779+
<enum name="GL_RGBA16I"/>
1780+
<enum name="GL_RGBA32I"/>
17881781
<enum name="GL_RGBA8UI"/>
1782+
<enum name="GL_RGBA16UI"/>
1783+
<enum name="GL_RGBA32UI"/>
1784+
<enum name="GL_RGB10_A2UI"/>
1785+
<!-- Base internal format: GL_BGRA -->
1786+
<enum name="GL_BGRA"/>
1787+
<enum name="GL_BGRA_EXT"/>
1788+
<enum name="GL_BGRA_IMG"/>
17891789
<!-- Base internal format: GL_DEPTH_COMPONENT -->
17901790
<enum name="GL_DEPTH_COMPONENT"/>
17911791
<enum name="GL_DEPTH_COMPONENT16"/>
@@ -1813,87 +1813,87 @@ typedef unsigned int GLhandleARB;
18131813
<enum name="GL_DEPTH24_STENCIL8_OES"/>
18141814
<enum name="GL_DEPTH32F_STENCIL8"/>
18151815
<enum name="GL_DEPTH32F_STENCIL8_NV"/>
1816+
<!-- Base internal format: GL_STENCIL -->
18161817
<enum name="GL_STENCIL"/>
18171818
<enum name="GL_STENCIL_EXT"/>
18181819
<!-- Compressed base internal formats -->
1819-
<enum name="GL_COMPRESSED_R11_EAC"/>
18201820
<enum name="GL_COMPRESSED_RED"/>
1821+
<enum name="GL_COMPRESSED_RG"/>
1822+
<enum name="GL_COMPRESSED_RGB"/>
1823+
<enum name="GL_COMPRESSED_RGBA"/>
1824+
<enum name="GL_COMPRESSED_SRGB"/>
1825+
<enum name="GL_COMPRESSED_SRGB_ALPHA"/>
18211826
<enum name="GL_COMPRESSED_RED_RGTC1"/>
18221827
<enum name="GL_COMPRESSED_RED_RGTC1_EXT"/>
1823-
<enum name="GL_COMPRESSED_RG"/>
1828+
<enum name="GL_COMPRESSED_SIGNED_RED_RGTC1"/>
1829+
<enum name="GL_COMPRESSED_SIGNED_RED_RGTC1_EXT"/>
1830+
<enum name="GL_COMPRESSED_R11_EAC"/>
1831+
<enum name="GL_COMPRESSED_SIGNED_R11_EAC"/>
18241832
<enum name="GL_COMPRESSED_RG_RGTC2"/>
1825-
<enum name="GL_COMPRESSED_RG11_EAC"/>
1826-
<enum name="GL_COMPRESSED_RGB"/>
1833+
<enum name="GL_COMPRESSED_SIGNED_RG_RGTC2"/>
1834+
<enum name="GL_COMPRESSED_RGBA_BPTC_UNORM"/>
1835+
<enum name="GL_COMPRESSED_RGBA_BPTC_UNORM_ARB"/>
1836+
<enum name="GL_COMPRESSED_RGBA_BPTC_UNORM_EXT"/>
1837+
<enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM"/>
1838+
<enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB"/>
1839+
<enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT"/>
18271840
<enum name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT"/>
18281841
<enum name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB"/>
18291842
<enum name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT"/>
18301843
<enum name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT"/>
18311844
<enum name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB"/>
18321845
<enum name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT"/>
1833-
<enum name="GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG"/>
1834-
<enum name="GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG"/>
1835-
<enum name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT"/>
1846+
<enum name="GL_ETC1_RGB8_OES"/>
18361847
<enum name="GL_COMPRESSED_RGB8_ETC2"/>
1848+
<enum name="GL_COMPRESSED_SRGB8_ETC2"/>
18371849
<enum name="GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
1838-
<enum name="GL_COMPRESSED_RGBA"/>
1839-
<enum name="GL_COMPRESSED_RGBA_ASTC_3x3x3_OES"/>
1840-
<enum name="GL_COMPRESSED_RGBA_ASTC_4x3x3_OES"/>
1841-
<enum name="GL_COMPRESSED_RGBA_ASTC_4x4x3_OES"/>
1842-
<enum name="GL_COMPRESSED_RGBA_ASTC_4x4x4_OES"/>
1843-
<enum name="GL_COMPRESSED_RGBA_ASTC_5x4x4_OES"/>
1844-
<enum name="GL_COMPRESSED_RGBA_ASTC_5x5x4_OES"/>
1845-
<enum name="GL_COMPRESSED_RGBA_ASTC_5x5x5_OES"/>
1846-
<enum name="GL_COMPRESSED_RGBA_ASTC_6x5x5_OES"/>
1847-
<enum name="GL_COMPRESSED_RGBA_ASTC_6x6x5_OES"/>
1848-
<enum name="GL_COMPRESSED_RGBA_ASTC_6x6x6_OES"/>
1849-
<enum name="GL_COMPRESSED_RGBA_BPTC_UNORM"/>
1850-
<enum name="GL_COMPRESSED_RGBA_BPTC_UNORM_ARB"/>
1851-
<enum name="GL_COMPRESSED_RGBA_BPTC_UNORM_EXT"/>
1852-
<enum name="GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG"/>
1853-
<enum name="GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG"/>
1854-
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT"/>
1855-
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE"/>
1856-
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT3_EXT"/>
1857-
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT3_EXT"/>
1858-
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE"/>
1859-
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT5_EXT"/>
1850+
<enum name="GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
18601851
<enum name="GL_COMPRESSED_RGBA8_ETC2_EAC"/>
1861-
<enum name="GL_COMPRESSED_SIGNED_R11_EAC"/>
1862-
<enum name="GL_COMPRESSED_SIGNED_RED_RGTC1"/>
1863-
<enum name="GL_COMPRESSED_SIGNED_RED_RGTC1_EXT"/>
1864-
<enum name="GL_COMPRESSED_SIGNED_RG_RGTC2"/>
1852+
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC"/>
1853+
<enum name="GL_COMPRESSED_RG11_EAC"/>
18651854
<enum name="GL_COMPRESSED_SIGNED_RG11_EAC"/>
1866-
<enum name="GL_COMPRESSED_SRGB"/>
1867-
<enum name="GL_COMPRESSED_SRGB_ALPHA"/>
1868-
<enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM"/>
1869-
<enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB"/>
1870-
<enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT"/>
1871-
<enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT"/>
1872-
<enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT"/>
1855+
<enum name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT"/>
1856+
<enum name="GL_COMPRESSED_SRGB_S3TC_DXT1_EXT"/>
1857+
<enum name="GL_COMPRESSED_SRGB_S3TC_DXT1_NV"/>
1858+
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT"/>
18731859
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT"/>
18741860
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV"/>
1861+
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE"/>
1862+
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT3_EXT"/>
18751863
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT"/>
18761864
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV"/>
1865+
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE"/>
1866+
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT5_EXT"/>
18771867
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT"/>
18781868
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV"/>
1869+
<enum name="GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG"/>
18791870
<enum name="GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT"/>
1871+
<enum name="GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG"/>
1872+
<enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT"/>
1873+
<enum name="GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG"/>
18801874
<enum name="GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT"/>
1881-
<enum name="GL_COMPRESSED_SRGB_S3TC_DXT1_EXT"/>
1882-
<enum name="GL_COMPRESSED_SRGB_S3TC_DXT1_NV"/>
1875+
<enum name="GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG"/>
1876+
<enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT"/>
1877+
<enum name="GL_COMPRESSED_RGBA_ASTC_3x3x3_OES"/>
18831878
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES"/>
1879+
<enum name="GL_COMPRESSED_RGBA_ASTC_4x3x3_OES"/>
18841880
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES"/>
1881+
<enum name="GL_COMPRESSED_RGBA_ASTC_4x4x3_OES"/>
18851882
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES"/>
1883+
<enum name="GL_COMPRESSED_RGBA_ASTC_4x4x4_OES"/>
18861884
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES"/>
1885+
<enum name="GL_COMPRESSED_RGBA_ASTC_5x4x4_OES"/>
18871886
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES"/>
1887+
<enum name="GL_COMPRESSED_RGBA_ASTC_5x5x4_OES"/>
18881888
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES"/>
1889+
<enum name="GL_COMPRESSED_RGBA_ASTC_5x5x5_OES"/>
18891890
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES"/>
1891+
<enum name="GL_COMPRESSED_RGBA_ASTC_6x5x5_OES"/>
18901892
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES"/>
1893+
<enum name="GL_COMPRESSED_RGBA_ASTC_6x6x5_OES"/>
18911894
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES"/>
1895+
<enum name="GL_COMPRESSED_RGBA_ASTC_6x6x6_OES"/>
18921896
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES"/>
1893-
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC"/>
1894-
<enum name="GL_COMPRESSED_SRGB8_ETC2"/>
1895-
<enum name="GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
1896-
<enum name="GL_ETC1_RGB8_OES"/>
18971897
</group>
18981898

18991899
<group name="PixelMap">
@@ -46947,7 +46947,7 @@ typedef unsigned int GLhandleARB;
4694746947
<command name="glIsPointInFillPathNV"/>
4694846948
<command name="glIsPointInStrokePathNV"/>
4694946949
<command name="glGetPathLengthNV"/>
46950-
<command name="glPointAlongPathNV"/>
46950+
<command name="glPointAlongPathNV"/>
4695146951
</require>
4695246952
<require comment="API revision 1.2">
4695346953
<enum name="GL_ROUNDED_RECT_NV"/>

0 commit comments

Comments
 (0)