Skip to content

A
angle
Commit 2eeb980e by Brandon Schade Committed by Commit Bot
Options

Added enums to InternalFormat and PixelType groups in gl.xml

Bug: angleproject:4093 Change-Id: Ib69f0553f79d0e5dfbcc9165ad71a42be3e6d55d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1965643 Commit-Queue: Brandon Schade <b.schade@samsung.com> Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org>
parent 06cbb283
Showing with 127 additions and 41 deletions
scripts/code_generation_hashes/GL_EGL_entry_points.json
......@@ -8,7 +8,7 @@
"scripts/generate_entry_points.py":
"36f89f5514fff27ecb4baeded89ae64d",
"scripts/gl.xml":
"b470cb06b06cbbe7adb2c8129ec85708",
"f4601dbd36a072c9dcb1c429a7ea816f",
"scripts/gl_angle_ext.xml":
"d6907cd84d95ac0b32a164194eadcf53",
"scripts/registry_xml.py":
......
scripts/code_generation_hashes/GLenum_value_to_string_map.json
......@@ -2,13 +2,13 @@
"scripts/gen_gl_enum_utils.py":
"f25cdc74b57d10a1cbc4194a72e971af",
"scripts/gl.xml":
"b470cb06b06cbbe7adb2c8129ec85708",
"f4601dbd36a072c9dcb1c429a7ea816f",
"scripts/gl_angle_ext.xml":
"d6907cd84d95ac0b32a164194eadcf53",
"scripts/registry_xml.py":
"4f1fdc6158306914b149ade7549ad30a",
"src/libANGLE/gl_enum_utils_autogen.cpp":
"3178466fb9ef26a3349fe59a76295dc3",
"0d71cea9e0ab532e0f266f2fecba3bef",
"src/libANGLE/gl_enum_utils_autogen.h":
"fb0bb7f506f6082ea3b2c3fa384d2739"
}
\ No newline at end of file
scripts/code_generation_hashes/OpenGL_dispatch_table.json
{
"scripts/gl.xml":
"b470cb06b06cbbe7adb2c8129ec85708",
"f4601dbd36a072c9dcb1c429a7ea816f",
"src/libANGLE/renderer/angle_format.py":
"32ba71942c0fd00e6807104f1bb80a3c",
"src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp":
......
scripts/code_generation_hashes/proc_table.json
......@@ -6,7 +6,7 @@
"scripts/gen_proc_table.py":
"24dbcc78fd3f000f58ca98237ccc0da4",
"scripts/gl.xml":
"b470cb06b06cbbe7adb2c8129ec85708",
"f4601dbd36a072c9dcb1c429a7ea816f",
"scripts/gl_angle_ext.xml":
"d6907cd84d95ac0b32a164194eadcf53",
"scripts/registry_xml.py":
......
scripts/gl.xml
......@@ -1609,6 +1609,7 @@ typedef unsigned int GLhandleARB;
<group name="InternalFormat" comment="Was PixelInternalFormat">
<!-- Compatibility -->
<enum name="GL_ALPHA"/>
<enum name="GL_ALPHA12"/>
<enum name="GL_ALPHA16"/>
<!-- <enum name="GL_ALPHA16_ICC_SGIX" comment="Incomplete extension SGIX_icc_texture"/> -->
......@@ -1636,6 +1637,8 @@ typedef unsigned int GLhandleARB;
<enum name="GL_INTENSITY4"/>
<enum name="GL_INTENSITY8"/>
<!-- <enum name="GL_INTENSITY_ICC_SGIX" comment="Incomplete extension SGIX_icc_texture"/> -->
<enum name="GL_LUMINANCE"/>
<enum name="GL_LUMINANCE_ALPHA"/>
<enum name="GL_LUMINANCE12"/>
<enum name="GL_LUMINANCE12_ALPHA12"/>
<enum name="GL_LUMINANCE12_ALPHA4"/>
......@@ -1703,6 +1706,10 @@ typedef unsigned int GLhandleARB;
<enum name="GL_RG32UI"/>
<!-- Base internal format: 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_EXT"/>
<enum name="GL_RGB4"/>
......@@ -1747,36 +1754,38 @@ typedef unsigned int GLhandleARB;
<enum name="GL_RGB9_E5_APPLE"/>
<enum name="GL_RGB9_E5_EXT"/>
<!-- Base internal format: GL_RGBA -->
<enum name="GL_RGBA"/>
<enum name="GL_RGBA4"/>
<enum name="GL_RGBA4_EXT"/>
<enum name="GL_RGBA4_OES"/>
<enum name="GL_RGB10_A2"/>
<enum name="GL_RGB10_A2_EXT"/>
<enum name="GL_RGB10_A2UI"/>
<enum name="GL_RGB5_A1"/>
<enum name="GL_RGB5_A1_EXT"/>
<enum name="GL_RGB5_A1_OES"/>
<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_RGBA"/>
<enum name="GL_RGBA12"/>
<enum name="GL_RGBA12_EXT"/>
<enum name="GL_RGBA16"/>
<enum name="GL_RGBA16_EXT"/>
<enum name="GL_RGBA16_SNORM"/>
<enum name="GL_RGBA16_SNORM_EXT"/>
<enum name="GL_RGBA16F"/>
<enum name="GL_RGBA16F_ARB"/>
<enum name="GL_RGBA16F_EXT"/>
<enum name="GL_RGBA16I"/>
<enum name="GL_RGBA16UI"/>
<enum name="GL_RGBA32F"/>
<enum name="GL_RGBA32F_ARB"/>
<enum name="GL_RGBA32F_EXT"/>
<enum name="GL_RGBA8I"/>
<enum name="GL_RGBA16I"/>
<enum name="GL_RGBA32I"/>
<enum name="GL_RGBA8UI"/>
<enum name="GL_RGBA16UI"/>
<enum name="GL_RGBA32UI"/>
<enum name="GL_RGB10_A2UI"/>
<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_RGBA8UI"/>
<!-- Base internal format: GL_DEPTH_COMPONENT -->
<enum name="GL_DEPTH_COMPONENT"/>
<enum name="GL_DEPTH_COMPONENT16"/>
......@@ -1786,6 +1795,7 @@ typedef unsigned int GLhandleARB;
<enum name="GL_DEPTH_COMPONENT24_ARB"/>
<enum name="GL_DEPTH_COMPONENT24_OES"/>
<enum name="GL_DEPTH_COMPONENT24_SGIX"/>
<enum name="GL_DEPTH_COMPONENT32"/>
<enum name="GL_DEPTH_COMPONENT32_ARB"/>
<enum name="GL_DEPTH_COMPONENT32_OES"/>
<enum name="GL_DEPTH_COMPONENT32_SGIX"/>
......@@ -1803,41 +1813,87 @@ typedef unsigned int GLhandleARB;
<enum name="GL_DEPTH24_STENCIL8_OES"/>
<enum name="GL_DEPTH32F_STENCIL8"/>
<enum name="GL_DEPTH32F_STENCIL8_NV"/>
<enum name="GL_STENCIL"/>
<enum name="GL_STENCIL_EXT"/>
<!-- Compressed base internal formats -->
<enum name="GL_COMPRESSED_R11_EAC"/>
<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_EXT"/>
<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"/>
<enum name="GL_COMPRESSED_RG_RGTC2"/>
<enum name="GL_COMPRESSED_SIGNED_RG_RGTC2"/>
<enum name="GL_COMPRESSED_RGBA_BPTC_UNORM"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM"/>
<enum name="GL_COMPRESSED_RG11_EAC"/>
<enum name="GL_COMPRESSED_RGB"/>
<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_EXT"/>
<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_EXT"/>
<enum name="GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG"/>
<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_SRGB8_ETC2"/>
<enum name="GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
<enum name="GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
<enum name="GL_COMPRESSED_RGBA"/>
<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_SRGB8_ALPHA8_ETC2_EAC"/>
<enum name="GL_COMPRESSED_RG11_EAC"/>
<enum name="GL_COMPRESSED_SIGNED_R11_EAC"/>
<enum name="GL_COMPRESSED_SIGNED_RED_RGTC1"/>
<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_RGB_S3TC_DXT1_EXT"/>
<enum name="GL_COMPRESSED_SRGB_S3TC_DXT1_EXT"/>
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT"/>
<enum name="GL_COMPRESSED_SRGB"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA"/>
<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_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_RGBA_S3TC_DXT3_EXT"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT"/>
<enum name="GL_COMPRESSED_RGBA_S3TC_DXT5_EXT"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT"/>
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV"/>
<enum name="GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT"/>
<enum name="GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT"/>
<enum name="GL_COMPRESSED_SRGB_S3TC_DXT1_EXT"/>
<enum name="GL_COMPRESSED_SRGB_S3TC_DXT1_NV"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES"/>
<enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_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 name="PixelMap">
......@@ -1977,6 +2033,11 @@ typedef unsigned int GLhandleARB;
<enum name="GL_BITMAP"/>
<enum name="GL_BYTE"/>
<enum name="GL_FLOAT"/>
<enum name="GL_HALF_APPLE"/>
<enum name="GL_HALF_FLOAT"/>
<enum name="GL_HALF_FLOAT_ARB"/>
<enum name="GL_HALF_FLOAT_NV"/>
<enum name="GL_HALF_FLOAT_OES"/>
<enum name="GL_INT"/>
<enum name="GL_SHORT"/>
<enum name="GL_UNSIGNED_BYTE"/>
......@@ -1985,11 +2046,21 @@ typedef unsigned int GLhandleARB;
<enum name="GL_UNSIGNED_INT"/>
<enum name="GL_UNSIGNED_INT_10_10_10_2"/>
<enum name="GL_UNSIGNED_INT_10_10_10_2_EXT"/>
<enum name="GL_UNSIGNED_INT_10F_11F_11F_REV"/>
<enum name="GL_UNSIGNED_INT_10F_11F_11F_REV_APPLE"/>
<enum name="GL_UNSIGNED_INT_10F_11F_11F_REV_EXT"/>
<enum name="GL_UNSIGNED_INT_2_10_10_10_REV"/>
<enum name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT"/>
<enum name="GL_UNSIGNED_INT_8_8_8_8"/>
<enum name="GL_UNSIGNED_INT_8_8_8_8_EXT"/>
<enum name="GL_UNSIGNED_SHORT"/>
<enum name="GL_UNSIGNED_SHORT_1_5_5_5_REV"/>
<enum name="GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT"/>
<enum name="GL_UNSIGNED_SHORT_4_4_4_4"/>
<enum name="GL_UNSIGNED_SHORT_4_4_4_4_EXT"/>
<enum name="GL_UNSIGNED_SHORT_4_4_4_4_REV"/>
<enum name="GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT"/>
<enum name="GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG"/>
<enum name="GL_UNSIGNED_SHORT_5_5_5_1"/>
<enum name="GL_UNSIGNED_SHORT_5_5_5_1_EXT"/>
</group>
src/libANGLE/gl_enum_utils_autogen.cpp
......@@ -2387,14 +2387,22 @@ const char *GLenumToString(GLenumGroup enumGroup, unsigned int value)
{
switch (value)
{
case 0x1802:
return "GL_STENCIL";
case 0x1902:
return "GL_DEPTH_COMPONENT";
case 0x1903:
return "GL_RED";
case 0x1906:
return "GL_ALPHA";
case 0x1907:
return "GL_RGB";
case 0x1908:
return "GL_RGBA";
case 0x1909:
return "GL_LUMINANCE";
case 0x190A:
return "GL_LUMINANCE_ALPHA";
case 0x8051:
return "GL_RGB8";
case 0x8052:
......@@ -2929,10 +2937,16 @@ const char *GLenumToString(GLenumGroup enumGroup, unsigned int value)
return "GL_UNSIGNED_INT";
case 0x1406:
return "GL_FLOAT";
case 0x140B:
return "GL_HALF_FLOAT";
case 0x8033:
return "GL_UNSIGNED_SHORT_4_4_4_4";
case 0x8034:
return "GL_UNSIGNED_SHORT_5_5_5_1";
case 0x8368:
return "GL_UNSIGNED_INT_2_10_10_10_REV";
case 0x8C3B:
return "GL_UNSIGNED_INT_10F_11F_11F_REV";
default:
return kUnknownGLenumString;
}
......
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