Prefix all PLS enums with "GL_"
Bug: angleproject:7279
Change-Id: Ifb4062e502305f4e59546f067d195d1a05fbabe4
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4095380
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Chris Dalton <chris@rive.app>
Reviewed-by: Steven Noonan <steven@valvesoftware.com>
diff --git a/scripts/code_generation_hashes/Extension_files.json b/scripts/code_generation_hashes/Extension_files.json
index bed7455..1535f09 100644
--- a/scripts/code_generation_hashes/Extension_files.json
+++ b/scripts/code_generation_hashes/Extension_files.json
@@ -20,7 +20,7 @@
"scripts/extension_data/swiftshader_win10_gles1.json":
"fbf1c3dc83570c1e3fffdbee313bca30",
"scripts/gl_angle_ext.xml":
- "aa078d5fbae78462befd8c4d3cc3c628",
+ "d82fab64415e4d276ce0e67d82cb9445",
"scripts/registry_xml.py":
"4837b4beda7a0e2698e2be7e8e74fd88",
"src/libANGLE/gen_extensions.py":
diff --git a/scripts/code_generation_hashes/GL_EGL_WGL_loader.json b/scripts/code_generation_hashes/GL_EGL_WGL_loader.json
index 29447be..075840a 100644
--- a/scripts/code_generation_hashes/GL_EGL_WGL_loader.json
+++ b/scripts/code_generation_hashes/GL_EGL_WGL_loader.json
@@ -4,7 +4,7 @@
"scripts/generate_loader.py":
"93c78a8d11323fa311fed5118fbcf083",
"scripts/gl_angle_ext.xml":
- "aa078d5fbae78462befd8c4d3cc3c628",
+ "d82fab64415e4d276ce0e67d82cb9445",
"scripts/registry_xml.py":
"4837b4beda7a0e2698e2be7e8e74fd88",
"src/libEGL/egl_loader_autogen.cpp":
diff --git a/scripts/code_generation_hashes/GL_EGL_entry_points.json b/scripts/code_generation_hashes/GL_EGL_entry_points.json
index 264aff5..8d59522 100644
--- a/scripts/code_generation_hashes/GL_EGL_entry_points.json
+++ b/scripts/code_generation_hashes/GL_EGL_entry_points.json
@@ -8,7 +8,7 @@
"scripts/generate_entry_points.py":
"ae3199c03943c31275d4e36b5f1c7309",
"scripts/gl_angle_ext.xml":
- "aa078d5fbae78462befd8c4d3cc3c628",
+ "d82fab64415e4d276ce0e67d82cb9445",
"scripts/registry_xml.py":
"4837b4beda7a0e2698e2be7e8e74fd88",
"src/common/entry_points_enum_autogen.cpp":
diff --git a/scripts/code_generation_hashes/GLenum_value_to_string_map.json b/scripts/code_generation_hashes/GLenum_value_to_string_map.json
index 3a160d3..9ac2889 100644
--- a/scripts/code_generation_hashes/GLenum_value_to_string_map.json
+++ b/scripts/code_generation_hashes/GLenum_value_to_string_map.json
@@ -2,11 +2,11 @@
"scripts/gen_gl_enum_utils.py":
"9663ad2fbaec42c7d3e83f440b0fee67",
"scripts/gl_angle_ext.xml":
- "aa078d5fbae78462befd8c4d3cc3c628",
+ "d82fab64415e4d276ce0e67d82cb9445",
"scripts/registry_xml.py":
"4837b4beda7a0e2698e2be7e8e74fd88",
"src/common/gl_enum_utils_autogen.cpp":
- "a38a65c4a46749acb328a6ae530fe23c",
+ "b6a290a462be967cc520e5575c6f209d",
"src/common/gl_enum_utils_autogen.h":
"85dea9edf87ad08c322868823e61a40c",
"third_party/OpenGL-Registry/src/xml/gl.xml":
diff --git a/scripts/code_generation_hashes/proc_table.json b/scripts/code_generation_hashes/proc_table.json
index 45256a9..5873cf5 100644
--- a/scripts/code_generation_hashes/proc_table.json
+++ b/scripts/code_generation_hashes/proc_table.json
@@ -4,7 +4,7 @@
"scripts/gen_proc_table.py":
"073351265b085943f816498cecaa281c",
"scripts/gl_angle_ext.xml":
- "aa078d5fbae78462befd8c4d3cc3c628",
+ "d82fab64415e4d276ce0e67d82cb9445",
"scripts/registry_xml.py":
"4837b4beda7a0e2698e2be7e8e74fd88",
"src/libGLESv2/proc_table_cl_autogen.cpp":
diff --git a/scripts/gl_angle_ext.xml b/scripts/gl_angle_ext.xml
index c249755..0940d90 100644
--- a/scripts/gl_angle_ext.xml
+++ b/scripts/gl_angle_ext.xml
@@ -1313,11 +1313,11 @@
<enum value="0x96E1" name="GL_MAX_COLOR_ATTACHMENTS_WITH_ACTIVE_PIXEL_LOCAL_STORAGE_ANGLE"/>
<enum value="0x96E2" name="GL_MAX_COMBINED_DRAW_BUFFERS_AND_PIXEL_LOCAL_STORAGE_PLANES_ANGLE"/>
<enum value="0x96E3" name="GL_PIXEL_LOCAL_STORAGE_ACTIVE_PLANES_ANGLE"/>
- <enum value="0x96E4" name="LOAD_OP_ZERO_ANGLE"/>
- <enum value="0x96E5" name="LOAD_OP_CLEAR_ANGLE"/>
- <enum value="0x96E6" name="LOAD_OP_LOAD_ANGLE"/>
- <enum value="0x96E7" name="LOAD_OP_DISABLE_ANGLE"/>
- <enum value="0x96E8" name="STORE_OP_STORE_ANGLE"/>
+ <enum value="0x96E4" name="GL_LOAD_OP_ZERO_ANGLE"/>
+ <enum value="0x96E5" name="GL_LOAD_OP_CLEAR_ANGLE"/>
+ <enum value="0x96E6" name="GL_LOAD_OP_LOAD_ANGLE"/>
+ <enum value="0x96E7" name="GL_LOAD_OP_DISABLE_ANGLE"/>
+ <enum value="0x96E8" name="GL_STORE_OP_STORE_ANGLE"/>
<enum value="0x96E9" name="GL_PIXEL_LOCAL_FORMAT_ANGLE" group="PLSQueryInt"/>
<enum value="0x96EA" name="GL_PIXEL_LOCAL_TEXTURE_NAME_ANGLE" group="PLSQueryInt"/>
<enum value="0x96EB" name="GL_PIXEL_LOCAL_TEXTURE_LEVEL_ANGLE" group="PLSQueryInt"/>
diff --git a/src/common/gl_enum_utils_autogen.cpp b/src/common/gl_enum_utils_autogen.cpp
index 6eeb09d..b535afc 100644
--- a/src/common/gl_enum_utils_autogen.cpp
+++ b/src/common/gl_enum_utils_autogen.cpp
@@ -2723,6 +2723,16 @@
return "GL_MAX_COMBINED_DRAW_BUFFERS_AND_PIXEL_LOCAL_STORAGE_PLANES_ANGLE";
case 0x96E3:
return "GL_PIXEL_LOCAL_STORAGE_ACTIVE_PLANES_ANGLE";
+ case 0x96E4:
+ return "GL_LOAD_OP_ZERO_ANGLE";
+ case 0x96E5:
+ return "GL_LOAD_OP_CLEAR_ANGLE";
+ case 0x96E6:
+ return "GL_LOAD_OP_LOAD_ANGLE";
+ case 0x96E7:
+ return "GL_LOAD_OP_DISABLE_ANGLE";
+ case 0x96E8:
+ return "GL_STORE_OP_STORE_ANGLE";
case 0x96E9:
return "GL_PIXEL_LOCAL_FORMAT_ANGLE";
case 0x96EA:
@@ -28115,6 +28125,22 @@
{
return 0x0101;
}
+ if (strcmp(str, "GL_LOAD_OP_CLEAR_ANGLE") == 0)
+ {
+ return 0x96E5;
+ }
+ if (strcmp(str, "GL_LOAD_OP_DISABLE_ANGLE") == 0)
+ {
+ return 0x96E7;
+ }
+ if (strcmp(str, "GL_LOAD_OP_LOAD_ANGLE") == 0)
+ {
+ return 0x96E6;
+ }
+ if (strcmp(str, "GL_LOAD_OP_ZERO_ANGLE") == 0)
+ {
+ return 0x96E4;
+ }
if (strcmp(str, "GL_LOCAL_CONSTANT_DATATYPE_EXT") == 0)
{
return 0x87ED;
@@ -37971,6 +37997,10 @@
{
return 0x85BF;
}
+ if (strcmp(str, "GL_STORE_OP_STORE_ANGLE") == 0)
+ {
+ return 0x96E8;
+ }
if (strcmp(str, "GL_STREAM_COPY") == 0)
{
return 0x88E2;
@@ -42867,26 +42897,6 @@
{
return 0x87D7;
}
- if (strcmp(str, "LOAD_OP_CLEAR_ANGLE") == 0)
- {
- return 0x96E5;
- }
- if (strcmp(str, "LOAD_OP_DISABLE_ANGLE") == 0)
- {
- return 0x96E7;
- }
- if (strcmp(str, "LOAD_OP_LOAD_ANGLE") == 0)
- {
- return 0x96E6;
- }
- if (strcmp(str, "LOAD_OP_ZERO_ANGLE") == 0)
- {
- return 0x96E4;
- }
- if (strcmp(str, "STORE_OP_STORE_ANGLE") == 0)
- {
- return 0x96E8;
- }
UNREACHABLE();
return 0;
