From dcfde515b28eda2a8bd5debcfac216395eda5517 Mon Sep 17 00:00:00 2001 From: Lubosz Sarnecki Date: Thu, 24 Jun 2021 15:59:04 +0200 Subject: [PATCH] gl.xml: Add GL_FRAMEBUFFER_SRGB_EXT to EnableCap group. Add GL_EXT_sRGB_write_control in registry_xml.py. This makes FrameCapture write a GL_FRAMEBUFFER_SRGB_EXT enum instead of it's hex value in glEnable/Disable calls. Bug: angleproject:5857 Change-Id: Ifa01118c2958275c7623c6bfe29f015fa8875fce Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2988356 Reviewed-by: Cody Northrop Reviewed-by: Jamie Madill Commit-Queue: Lubosz Sarnecki --- .../GL_EGL_WGL_loader.json | 4 ++-- .../GL_EGL_entry_points.json | 22 +++++++++---------- .../GLenum_value_to_string_map.json | 6 ++--- .../OpenGL_dispatch_table.json | 2 +- .../code_generation_hashes/proc_table.json | 4 ++-- scripts/gl.xml | 1 + scripts/registry_xml.py | 1 + src/libANGLE/Context_gles_ext_autogen.h | 1 + .../capture/capture_gles_ext_autogen.h | 2 ++ .../capture/gl_enum_utils_autogen.cpp | 2 ++ src/libANGLE/validationESEXT_autogen.h | 2 ++ .../entry_points_gles_ext_autogen.cpp | 2 ++ src/libGLESv2/entry_points_gles_ext_autogen.h | 2 ++ src/libGLESv2/libGLESv2_autogen.cpp | 2 ++ src/libGLESv2/libGLESv2_autogen.def | 2 ++ .../libGLESv2_no_capture_autogen.def | 2 ++ .../libGLESv2_with_capture_autogen.def | 2 ++ 17 files changed, 40 insertions(+), 19 deletions(-) diff --git a/scripts/code_generation_hashes/GL_EGL_WGL_loader.json b/scripts/code_generation_hashes/GL_EGL_WGL_loader.json index 42852b7de..77bd4be4e 100644 --- a/scripts/code_generation_hashes/GL_EGL_WGL_loader.json +++ b/scripts/code_generation_hashes/GL_EGL_WGL_loader.json @@ -8,11 +8,11 @@ "scripts/generate_loader.py": "5592f86f5841d24afa660c67330426d6", "scripts/gl.xml": - "2a73a58a7e26d8676a2c0af6d528cae6", + "4fcbd11300c8edcb3ed50826780cd57e", "scripts/gl_angle_ext.xml": "08f74b35d908b7c02b45fdf45572c434", "scripts/registry_xml.py": - "9945ba71a4a99464c81ab1341baf6697", + "71449b728bf04f90e07b56cf461876b8", "scripts/wgl.xml": "c36001431919e1c435f1215a85f7e1db", "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 5f236aaec..245a1a395 100644 --- a/scripts/code_generation_hashes/GL_EGL_entry_points.json +++ b/scripts/code_generation_hashes/GL_EGL_entry_points.json @@ -12,11 +12,11 @@ "scripts/generate_entry_points.py": "225ece78a0a952b688bf2de8e578454e", "scripts/gl.xml": - "2a73a58a7e26d8676a2c0af6d528cae6", + "4fcbd11300c8edcb3ed50826780cd57e", "scripts/gl_angle_ext.xml": "08f74b35d908b7c02b45fdf45572c434", "scripts/registry_xml.py": - "9945ba71a4a99464c81ab1341baf6697", + "71449b728bf04f90e07b56cf461876b8", "scripts/wgl.xml": "c36001431919e1c435f1215a85f7e1db", "src/common/entry_points_enum_autogen.cpp": @@ -42,7 +42,7 @@ "src/libANGLE/Context_gles_3_2_autogen.h": "48567dca16fd881dfe6d61fee0e3106f", "src/libANGLE/Context_gles_ext_autogen.h": - "6819bb0652f97d08ea903fb52c0690e8", + "dbf7c9716e46e29b44db01f215f0808a", "src/libANGLE/capture/capture_gles_1_0_autogen.cpp": "7ec7ef8f779b809a45d74b97502c419b", "src/libANGLE/capture/capture_gles_1_0_autogen.h": @@ -66,7 +66,7 @@ "src/libANGLE/capture/capture_gles_ext_autogen.cpp": "b027d574c21f369aee0fb0117f453935", "src/libANGLE/capture/capture_gles_ext_autogen.h": - "9ed4270c755c66adc1e70b3483bade27", + "46440404fc9219fbe709e564f26d57a6", "src/libANGLE/capture/frame_capture_replay_autogen.cpp": "be218060b02f0b07edb9745eb83d0f75", "src/libANGLE/capture/frame_capture_utils_autogen.cpp": @@ -88,7 +88,7 @@ "src/libANGLE/validationES3_autogen.h": "7435b9caddf8787b937c71a54dda96e1", "src/libANGLE/validationESEXT_autogen.h": - "69b17becef361c9c908b9d9f63746700", + "498a3fcf388dd8edbe38b25aaa1621cc", "src/libANGLE/validationGL1_autogen.h": "439f8ea26dc37ee6608100f4c6f9205c", "src/libANGLE/validationGL2_autogen.h": @@ -162,17 +162,17 @@ "src/libGLESv2/entry_points_gles_3_2_autogen.h": "647f932a299cdb4726b60bbba059f0d2", "src/libGLESv2/entry_points_gles_ext_autogen.cpp": - "79d9a53f018118870b509f06cebb7ba9", + "8ed62cce73b1f9ea5b93d6c659af0b99", "src/libGLESv2/entry_points_gles_ext_autogen.h": - "9d8b2cccdb0a78fb1021e94c38c50bdb", + "ab5f87e44135d185ff12b5132dd83b7f", "src/libGLESv2/libGLESv2_autogen.cpp": - "22f26b95d87bcdbfeeaf8a29ae25e89b", + "00aa56b3fea77c14e6b8c7bfdbb8f081", "src/libGLESv2/libGLESv2_autogen.def": - "0360ca85c8cb4a4feedd23ca17b75126", + "84d6b484facc65226664d7b7091a5244", "src/libGLESv2/libGLESv2_no_capture_autogen.def": - "5eb87e9407d8eee85735fe0a011e4930", + "49fd4d626ffb5db90eff776dd4e4ab61", "src/libGLESv2/libGLESv2_with_capture_autogen.def": - "97fd339d39af1ba830c3c424fd560357", + "9685b4b244dcdcfc0c4fc12deb9ac559", "src/libOpenCL/libOpenCL_autogen.cpp": "10849978c910dc1af5dd4f0c815d1581" } \ No newline at end of file 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 f74a0a745..8caf87160 100644 --- a/scripts/code_generation_hashes/GLenum_value_to_string_map.json +++ b/scripts/code_generation_hashes/GLenum_value_to_string_map.json @@ -2,13 +2,13 @@ "scripts/gen_gl_enum_utils.py": "332cfb6f04242d18966445f70f0039b3", "scripts/gl.xml": - "2a73a58a7e26d8676a2c0af6d528cae6", + "4fcbd11300c8edcb3ed50826780cd57e", "scripts/gl_angle_ext.xml": "08f74b35d908b7c02b45fdf45572c434", "scripts/registry_xml.py": - "9945ba71a4a99464c81ab1341baf6697", + "71449b728bf04f90e07b56cf461876b8", "src/libANGLE/capture/gl_enum_utils_autogen.cpp": - "132c9a258dbdcbd40ec5ae988e67350f", + "335140f98374899f9e1303b23b4eddc1", "src/libANGLE/capture/gl_enum_utils_autogen.h": "fb0bb7f506f6082ea3b2c3fa384d2739" } \ No newline at end of file diff --git a/scripts/code_generation_hashes/OpenGL_dispatch_table.json b/scripts/code_generation_hashes/OpenGL_dispatch_table.json index 877517d00..378d20697 100644 --- a/scripts/code_generation_hashes/OpenGL_dispatch_table.json +++ b/scripts/code_generation_hashes/OpenGL_dispatch_table.json @@ -1,6 +1,6 @@ { "scripts/gl.xml": - "2a73a58a7e26d8676a2c0af6d528cae6", + "4fcbd11300c8edcb3ed50826780cd57e", "src/libANGLE/renderer/angle_format.py": "74d6c9842128293118ccf128aeae896a", "src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp": diff --git a/scripts/code_generation_hashes/proc_table.json b/scripts/code_generation_hashes/proc_table.json index 56965deaf..c4c2cf947 100644 --- a/scripts/code_generation_hashes/proc_table.json +++ b/scripts/code_generation_hashes/proc_table.json @@ -8,11 +8,11 @@ "scripts/gen_proc_table.py": "7717a320f69631bd70ef8a8e994d47ee", "scripts/gl.xml": - "2a73a58a7e26d8676a2c0af6d528cae6", + "4fcbd11300c8edcb3ed50826780cd57e", "scripts/gl_angle_ext.xml": "08f74b35d908b7c02b45fdf45572c434", "scripts/registry_xml.py": - "9945ba71a4a99464c81ab1341baf6697", + "71449b728bf04f90e07b56cf461876b8", "scripts/wgl.xml": "c36001431919e1c435f1215a85f7e1db", "src/libGL/proc_table_wgl_autogen.cpp": diff --git a/scripts/gl.xml b/scripts/gl.xml index ab3948641..aa9e4ed85 100644 --- a/scripts/gl.xml +++ b/scripts/gl.xml @@ -501,6 +501,7 @@ typedef unsigned int GLhandleARB; + diff --git a/scripts/registry_xml.py b/scripts/registry_xml.py index c137f448f..e5d2e153f 100644 --- a/scripts/registry_xml.py +++ b/scripts/registry_xml.py @@ -98,6 +98,7 @@ gles_extensions = [ "GL_EXT_shader_framebuffer_fetch_non_coherent", "GL_EXT_shader_io_blocks", "GL_EXT_sRGB", + "GL_EXT_sRGB_write_control", "GL_EXT_tessellation_shader", "GL_EXT_texture_border_clamp", "GL_EXT_texture_buffer", diff --git a/src/libANGLE/Context_gles_ext_autogen.h b/src/libANGLE/Context_gles_ext_autogen.h index ead9e9fe1..c7c3a8337 100644 --- a/src/libANGLE/Context_gles_ext_autogen.h +++ b/src/libANGLE/Context_gles_ext_autogen.h @@ -187,6 +187,7 @@ /* GL_EXT_read_format_bgra */ \ /* GL_EXT_robustness */ \ /* GL_EXT_sRGB */ \ + /* GL_EXT_sRGB_write_control */ \ /* GL_EXT_semaphore */ \ void deleteSemaphores(GLsizei n, const SemaphoreID *semaphoresPacked); \ void genSemaphores(GLsizei n, SemaphoreID *semaphoresPacked); \ diff --git a/src/libANGLE/capture/capture_gles_ext_autogen.h b/src/libANGLE/capture/capture_gles_ext_autogen.h index 25ef01fcf..346d18df2 100644 --- a/src/libANGLE/capture/capture_gles_ext_autogen.h +++ b/src/libANGLE/capture/capture_gles_ext_autogen.h @@ -1304,6 +1304,8 @@ angle::CallCapture CaptureReadnPixelsEXT(const State &glState, // GL_EXT_sRGB +// GL_EXT_sRGB_write_control + // GL_EXT_semaphore angle::CallCapture CaptureDeleteSemaphoresEXT(const State &glState, bool isCallValid, diff --git a/src/libANGLE/capture/gl_enum_utils_autogen.cpp b/src/libANGLE/capture/gl_enum_utils_autogen.cpp index ac3c54ae7..77168cb5e 100644 --- a/src/libANGLE/capture/gl_enum_utils_autogen.cpp +++ b/src/libANGLE/capture/gl_enum_utils_autogen.cpp @@ -1973,6 +1973,8 @@ const char *GLenumToString(GLenumGroup enumGroup, unsigned int value) return "GL_POLYGON_OFFSET_FILL"; case 0x8074: return "GL_VERTEX_ARRAY"; + case 0x8DB9: + return "GL_FRAMEBUFFER_SRGB_EXT"; default: return UnknownGLenumToString(value); } diff --git a/src/libANGLE/validationESEXT_autogen.h b/src/libANGLE/validationESEXT_autogen.h index 3cecadd0d..869ef4d8e 100644 --- a/src/libANGLE/validationESEXT_autogen.h +++ b/src/libANGLE/validationESEXT_autogen.h @@ -1078,6 +1078,8 @@ bool ValidateReadnPixelsEXT(const Context *context, // GL_EXT_sRGB +// GL_EXT_sRGB_write_control + // GL_EXT_semaphore bool ValidateDeleteSemaphoresEXT(const Context *context, GLsizei n, diff --git a/src/libGLESv2/entry_points_gles_ext_autogen.cpp b/src/libGLESv2/entry_points_gles_ext_autogen.cpp index a3a16710e..fa83fc80b 100644 --- a/src/libGLESv2/entry_points_gles_ext_autogen.cpp +++ b/src/libGLESv2/entry_points_gles_ext_autogen.cpp @@ -5613,6 +5613,8 @@ void GL_APIENTRY GL_ReadnPixelsEXT(GLint x, // GL_EXT_sRGB +// GL_EXT_sRGB_write_control + // GL_EXT_semaphore void GL_APIENTRY GL_DeleteSemaphoresEXT(GLsizei n, const GLuint *semaphores) { diff --git a/src/libGLESv2/entry_points_gles_ext_autogen.h b/src/libGLESv2/entry_points_gles_ext_autogen.h index a0b09bea1..0ee5de78d 100644 --- a/src/libGLESv2/entry_points_gles_ext_autogen.h +++ b/src/libGLESv2/entry_points_gles_ext_autogen.h @@ -916,6 +916,8 @@ ANGLE_EXPORT void GL_APIENTRY GL_ReadnPixelsEXT(GLint x, // GL_EXT_sRGB +// GL_EXT_sRGB_write_control + // GL_EXT_semaphore ANGLE_EXPORT void GL_APIENTRY GL_DeleteSemaphoresEXT(GLsizei n, const GLuint *semaphores); ANGLE_EXPORT void GL_APIENTRY GL_GenSemaphoresEXT(GLsizei n, GLuint *semaphores); diff --git a/src/libGLESv2/libGLESv2_autogen.cpp b/src/libGLESv2/libGLESv2_autogen.cpp index 193cbd03e..de4162ccc 100644 --- a/src/libGLESv2/libGLESv2_autogen.cpp +++ b/src/libGLESv2/libGLESv2_autogen.cpp @@ -4262,6 +4262,8 @@ void GL_APIENTRY glReadnPixelsEXT(GLint x, // GL_EXT_sRGB +// GL_EXT_sRGB_write_control + // GL_EXT_semaphore void GL_APIENTRY glDeleteSemaphoresEXT(GLsizei n, const GLuint *semaphores) { diff --git a/src/libGLESv2/libGLESv2_autogen.def b/src/libGLESv2/libGLESv2_autogen.def index f1253a1fc..f7b2fc3b3 100644 --- a/src/libGLESv2/libGLESv2_autogen.def +++ b/src/libGLESv2/libGLESv2_autogen.def @@ -726,6 +726,8 @@ EXPORTS ; GL_EXT_sRGB + ; GL_EXT_sRGB_write_control + ; GL_EXT_semaphore glDeleteSemaphoresEXT glGenSemaphoresEXT diff --git a/src/libGLESv2/libGLESv2_no_capture_autogen.def b/src/libGLESv2/libGLESv2_no_capture_autogen.def index 3bd58536b..29c56158e 100644 --- a/src/libGLESv2/libGLESv2_no_capture_autogen.def +++ b/src/libGLESv2/libGLESv2_no_capture_autogen.def @@ -726,6 +726,8 @@ EXPORTS ; GL_EXT_sRGB + ; GL_EXT_sRGB_write_control + ; GL_EXT_semaphore glDeleteSemaphoresEXT glGenSemaphoresEXT diff --git a/src/libGLESv2/libGLESv2_with_capture_autogen.def b/src/libGLESv2/libGLESv2_with_capture_autogen.def index d00d07d3f..34b721792 100644 --- a/src/libGLESv2/libGLESv2_with_capture_autogen.def +++ b/src/libGLESv2/libGLESv2_with_capture_autogen.def @@ -726,6 +726,8 @@ EXPORTS ; GL_EXT_sRGB + ; GL_EXT_sRGB_write_control + ; GL_EXT_semaphore glDeleteSemaphoresEXT glGenSemaphoresEXT