Add support for GL_KHR_shader_subgroup

and GL_NV_shader_subgroup_partitioned tokens.

$ python scripts/gen_egl.p
$ python scripts/opengl/gen_all.py
$ python scripts/build_android_mustpass.py
$ python external/openglcts/scripts/build_mustpass.py

Using gitlab registry until xml is public

Component: OpenGL
VK-GL-CTS Issue: 1698

Change-Id: I15bb83f62a3bf31e3d021379e83983fe8dabb651

diff --git a/android/cts/master/egl-master.txt b/android/cts/master/egl-master.txt
index bf6ee6b..6644231 100644 (file)
--- a/android/cts/master/egl-master.txt
+++ b/android/cts/master/egl-master.txt
@@ -2489,6 +2489,7 @@ dEQP-EGL.functional.get_proc_address.extension.gl_qcom_driver_control
 dEQP-EGL.functional.get_proc_address.extension.gl_qcom_extended_get
 dEQP-EGL.functional.get_proc_address.extension.gl_qcom_extended_get2
 dEQP-EGL.functional.get_proc_address.extension.gl_qcom_tiled_rendering
+dEQP-EGL.functional.get_proc_address.extension.gl_amd_framebuffer_multisample_advanced
 dEQP-EGL.functional.get_proc_address.extension.gl_amd_performance_monitor
 dEQP-EGL.functional.get_proc_address.extension.gl_angle_framebuffer_blit
 dEQP-EGL.functional.get_proc_address.extension.gl_angle_framebuffer_multisample
@@ -2559,6 +2560,7 @@ dEQP-EGL.functional.get_proc_address.extension.gl_nv_framebuffer_multisample
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_gpu_shader5
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_instanced_arrays
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_internalformat_sample_query
+dEQP-EGL.functional.get_proc_address.extension.gl_nv_memory_attachment
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_non_square_matrices
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_path_rendering
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_polygon_mode

diff --git a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.5.x/egl-master.txt b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.5.x/egl-master.txt
index 743d5b2..bb033b7 100644 (file)
--- a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.5.x/egl-master.txt
+++ b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.5.x/egl-master.txt
@@ -2490,6 +2490,7 @@ dEQP-EGL.functional.get_proc_address.extension.gl_qcom_driver_control
 dEQP-EGL.functional.get_proc_address.extension.gl_qcom_extended_get
 dEQP-EGL.functional.get_proc_address.extension.gl_qcom_extended_get2
 dEQP-EGL.functional.get_proc_address.extension.gl_qcom_tiled_rendering
+dEQP-EGL.functional.get_proc_address.extension.gl_amd_framebuffer_multisample_advanced
 dEQP-EGL.functional.get_proc_address.extension.gl_amd_performance_monitor
 dEQP-EGL.functional.get_proc_address.extension.gl_angle_framebuffer_blit
 dEQP-EGL.functional.get_proc_address.extension.gl_angle_framebuffer_multisample
@@ -2560,6 +2561,7 @@ dEQP-EGL.functional.get_proc_address.extension.gl_nv_framebuffer_multisample
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_gpu_shader5
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_instanced_arrays
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_internalformat_sample_query
+dEQP-EGL.functional.get_proc_address.extension.gl_nv_memory_attachment
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_non_square_matrices
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_path_rendering
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_polygon_mode

diff --git a/external/openglcts/data/mustpass/egl/aosp_mustpass/master/egl-master.txt b/external/openglcts/data/mustpass/egl/aosp_mustpass/master/egl-master.txt
index 608425c..583026a 100644 (file)
--- a/external/openglcts/data/mustpass/egl/aosp_mustpass/master/egl-master.txt
+++ b/external/openglcts/data/mustpass/egl/aosp_mustpass/master/egl-master.txt
@@ -2490,6 +2490,7 @@ dEQP-EGL.functional.get_proc_address.extension.gl_qcom_driver_control
 dEQP-EGL.functional.get_proc_address.extension.gl_qcom_extended_get
 dEQP-EGL.functional.get_proc_address.extension.gl_qcom_extended_get2
 dEQP-EGL.functional.get_proc_address.extension.gl_qcom_tiled_rendering
+dEQP-EGL.functional.get_proc_address.extension.gl_amd_framebuffer_multisample_advanced
 dEQP-EGL.functional.get_proc_address.extension.gl_amd_performance_monitor
 dEQP-EGL.functional.get_proc_address.extension.gl_angle_framebuffer_blit
 dEQP-EGL.functional.get_proc_address.extension.gl_angle_framebuffer_multisample
@@ -2560,6 +2561,7 @@ dEQP-EGL.functional.get_proc_address.extension.gl_nv_framebuffer_multisample
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_gpu_shader5
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_instanced_arrays
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_internalformat_sample_query
+dEQP-EGL.functional.get_proc_address.extension.gl_nv_memory_attachment
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_non_square_matrices
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_path_rendering
 dEQP-EGL.functional.get_proc_address.extension.gl_nv_polygon_mode

diff --git a/framework/egl/egluStaticES20Library.inl b/framework/egl/egluStaticES20Library.inl
index 1a636e7..69872c4 100644 (file)
--- a/framework/egl/egluStaticES20Library.inl
+++ b/framework/egl/egluStaticES20Library.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
        { "glActiveTexture",                                            (deFunctionPtr)glActiveTexture },
        { "glAttachShader",                                                     (deFunctionPtr)glAttachShader },

diff --git a/framework/egl/egluStaticES30Library.inl b/framework/egl/egluStaticES30Library.inl
index a9a3fab..11e0f73 100644 (file)
--- a/framework/egl/egluStaticES30Library.inl
+++ b/framework/egl/egluStaticES30Library.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
        { "glActiveTexture",                                            (deFunctionPtr)glActiveTexture },
        { "glAttachShader",                                                     (deFunctionPtr)glAttachShader },

diff --git a/framework/egl/egluStaticES31Library.inl b/framework/egl/egluStaticES31Library.inl
index 532df6d..c7eca37 100644 (file)
--- a/framework/egl/egluStaticES31Library.inl
+++ b/framework/egl/egluStaticES31Library.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
        { "glActiveShaderProgram",                                      (deFunctionPtr)glActiveShaderProgram },
        { "glActiveTexture",                                            (deFunctionPtr)glActiveTexture },

diff --git a/framework/egl/egluStaticES32Library.inl b/framework/egl/egluStaticES32Library.inl
index 74089e6..427f835 100644 (file)
--- a/framework/egl/egluStaticES32Library.inl
+++ b/framework/egl/egluStaticES32Library.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
        { "glActiveShaderProgram",                                      (deFunctionPtr)glActiveShaderProgram },
        { "glActiveTexture",                                            (deFunctionPtr)glActiveTexture },

diff --git a/framework/opengl/gluCallLogUtil.inl b/framework/opengl/gluCallLogUtil.inl
index 1a03482..f57cf11 100644 (file)
--- a/framework/opengl/gluCallLogUtil.inl
+++ b/framework/opengl/gluCallLogUtil.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 
 int getTextureParamNumArgs (int pname)

diff --git a/framework/opengl/gluCallLogWrapper.inl b/framework/opengl/gluCallLogWrapper.inl
index 3fc581f..0ffb58e 100644 (file)
--- a/framework/opengl/gluCallLogWrapper.inl
+++ b/framework/opengl/gluCallLogWrapper.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 
 void CallLogWrapper::glActiveShaderProgram (glw::GLuint pipeline, glw::GLuint program)

diff --git a/framework/opengl/gluCallLogWrapperApi.inl b/framework/opengl/gluCallLogWrapperApi.inl
index 7caf5f0..8dd7279 100644 (file)
--- a/framework/opengl/gluCallLogWrapperApi.inl
+++ b/framework/opengl/gluCallLogWrapperApi.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 void                                   glActiveShaderProgram                                                           (glw::GLuint pipeline, glw::GLuint program);
 void                                   glActiveTexture                                                                         (glw::GLenum texture);

diff --git a/framework/opengl/gluQueryUtil.inl b/framework/opengl/gluQueryUtil.inl
index c98d4f5..fef77ed 100644 (file)
--- a/framework/opengl/gluQueryUtil.inl
+++ b/framework/opengl/gluQueryUtil.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 
 int getBasicQueryNumArgsOut (int pname)

diff --git a/framework/opengl/gluStrUtil.inl b/framework/opengl/gluStrUtil.inl
index 6d33025..ccb35ce 100644 (file)
--- a/framework/opengl/gluStrUtil.inl
+++ b/framework/opengl/gluStrUtil.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 
 const char* getErrorName (int value)

diff --git a/framework/opengl/gluStrUtilPrototypes.inl b/framework/opengl/gluStrUtilPrototypes.inl
index 54ebc59..a1b5824 100644 (file)
--- a/framework/opengl/gluStrUtilPrototypes.inl
+++ b/framework/opengl/gluStrUtilPrototypes.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 const char*                                                    getErrorName                                                    (int value);
 const char*                                                    getTypeName                                                             (int value);

diff --git a/framework/opengl/wrapper/glwApi.inl b/framework/opengl/wrapper/glwApi.inl
index 4890e22..64f0f77 100644 (file)
--- a/framework/opengl/wrapper/glwApi.inl
+++ b/framework/opengl/wrapper/glwApi.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 #define                        glActiveShaderProgram                                                           glwActiveShaderProgram
 #define                        glActiveTexture                                                                         glwActiveTexture

diff --git a/framework/opengl/wrapper/glwEnums.inl b/framework/opengl/wrapper/glwEnums.inl
index 1498559..b56d14f 100644 (file)
--- a/framework/opengl/wrapper/glwEnums.inl
+++ b/framework/opengl/wrapper/glwEnums.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 #define GL_DEPTH_BUFFER_BIT                                                                                            0x00000100
 #define GL_STENCIL_BUFFER_BIT                                                                                  0x00000400
@@ -54,6 +54,15 @@
 #define GL_TESS_EVALUATION_SHADER_BIT_EXT                                                              0x00000010
 #define GL_COMPUTE_SHADER_BIT                                                                                  0x00000020
 #define GL_ALL_SHADER_BITS                                                                                             0xFFFFFFFFu
+#define GL_SUBGROUP_FEATURE_BASIC_BIT_KHR                                                              0x00000001
+#define GL_SUBGROUP_FEATURE_VOTE_BIT_KHR                                                               0x00000002
+#define GL_SUBGROUP_FEATURE_ARITHMETIC_BIT_KHR                                                 0x00000004
+#define GL_SUBGROUP_FEATURE_BALLOT_BIT_KHR                                                             0x00000008
+#define GL_SUBGROUP_FEATURE_SHUFFLE_BIT_KHR                                                            0x00000010
+#define GL_SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT_KHR                                   0x00000020
+#define GL_SUBGROUP_FEATURE_CLUSTERED_BIT_KHR                                                  0x00000040
+#define GL_SUBGROUP_FEATURE_QUAD_BIT_KHR                                                               0x00000080
+#define GL_SUBGROUP_FEATURE_PARTITIONED_BIT_NV                                                 0x00000100
 #define GL_FALSE                                                                                                               0
 #define GL_NO_ERROR                                                                                                            0
 #define GL_ZERO                                                                                                                        0
@@ -1782,6 +1791,10 @@
 #define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR                                              0x93DC
 #define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12                                                  0x93DD
 #define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR                                              0x93DD
+#define GL_SUBGROUP_SIZE_KHR                                                                                   0x9532
+#define GL_SUBGROUP_SUPPORTED_STAGES_KHR                                                               0x9533
+#define GL_SUBGROUP_SUPPORTED_FEATURES_KHR                                                             0x9534
+#define GL_SUBGROUP_QUAD_ALL_STAGES_KHR                                                                        0x9535
 #define GL_PER_GPU_STORAGE_NV                                                                                  0x9548
 #define GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV                                   0x9549
 #define GL_SHADER_BINARY_FORMAT_SPIR_V                                                                 0x9551

diff --git a/framework/opengl/wrapper/glwFunctionTypes.inl b/framework/opengl/wrapper/glwFunctionTypes.inl
index a842a0c..921903e 100644 (file)
--- a/framework/opengl/wrapper/glwFunctionTypes.inl
+++ b/framework/opengl/wrapper/glwFunctionTypes.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 typedef GLW_APICALL void                       (GLW_APIENTRY* glActiveShaderProgramFunc)                                                               (GLuint pipeline, GLuint program);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glActiveTextureFunc)                                                                             (GLenum texture);

diff --git a/framework/opengl/wrapper/glwFunctions.inl b/framework/opengl/wrapper/glwFunctions.inl
index 38f8e17..8201d3a 100644 (file)
--- a/framework/opengl/wrapper/glwFunctions.inl
+++ b/framework/opengl/wrapper/glwFunctions.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 glActiveShaderProgramFunc                                                              activeShaderProgram;
 glActiveTextureFunc                                                                            activeTexture;

diff --git a/framework/opengl/wrapper/glwImpl.inl b/framework/opengl/wrapper/glwImpl.inl
index 0d66671..1f9ecb9 100644 (file)
--- a/framework/opengl/wrapper/glwImpl.inl
+++ b/framework/opengl/wrapper/glwImpl.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 
 void glwActiveShaderProgram (GLuint pipeline, GLuint program)

diff --git a/framework/opengl/wrapper/glwInitES20.inl b/framework/opengl/wrapper/glwInitES20.inl
index 999ff3c..13c038d 100644 (file)
--- a/framework/opengl/wrapper/glwInitES20.inl
+++ b/framework/opengl/wrapper/glwInitES20.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
 gl->attachShader                                               = (glAttachShaderFunc)                                                  loader->get("glAttachShader");

diff --git a/framework/opengl/wrapper/glwInitES20Direct.inl b/framework/opengl/wrapper/glwInitES20Direct.inl
index cbfc04a..b1aa141 100644 (file)
--- a/framework/opengl/wrapper/glwInitES20Direct.inl
+++ b/framework/opengl/wrapper/glwInitES20Direct.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeTexture                                              = &glActiveTexture;
 gl->attachShader                                               = &glAttachShader;

diff --git a/framework/opengl/wrapper/glwInitES30.inl b/framework/opengl/wrapper/glwInitES30.inl
index 9c2fd19..e9f4524 100644 (file)
--- a/framework/opengl/wrapper/glwInitES30.inl
+++ b/framework/opengl/wrapper/glwInitES30.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
 gl->attachShader                                               = (glAttachShaderFunc)                                                  loader->get("glAttachShader");

diff --git a/framework/opengl/wrapper/glwInitES30Direct.inl b/framework/opengl/wrapper/glwInitES30Direct.inl
index a8a5bf0..e2a5771 100644 (file)
--- a/framework/opengl/wrapper/glwInitES30Direct.inl
+++ b/framework/opengl/wrapper/glwInitES30Direct.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeTexture                                              = &glActiveTexture;
 gl->attachShader                                               = &glAttachShader;

diff --git a/framework/opengl/wrapper/glwInitES31.inl b/framework/opengl/wrapper/glwInitES31.inl
index c66f753..cd072d8 100644 (file)
--- a/framework/opengl/wrapper/glwInitES31.inl
+++ b/framework/opengl/wrapper/glwInitES31.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeShaderProgram                                        = (glActiveShaderProgramFunc)                                   loader->get("glActiveShaderProgram");
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");

diff --git a/framework/opengl/wrapper/glwInitES31Direct.inl b/framework/opengl/wrapper/glwInitES31Direct.inl
index 7e7ebc4..ff7e5d4 100644 (file)
--- a/framework/opengl/wrapper/glwInitES31Direct.inl
+++ b/framework/opengl/wrapper/glwInitES31Direct.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeShaderProgram                                        = &glActiveShaderProgram;
 gl->activeTexture                                              = &glActiveTexture;

diff --git a/framework/opengl/wrapper/glwInitES32.inl b/framework/opengl/wrapper/glwInitES32.inl
index c78b3f2..b5f1394 100644 (file)
--- a/framework/opengl/wrapper/glwInitES32.inl
+++ b/framework/opengl/wrapper/glwInitES32.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeShaderProgram                                        = (glActiveShaderProgramFunc)                                   loader->get("glActiveShaderProgram");
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");

diff --git a/framework/opengl/wrapper/glwInitES32Direct.inl b/framework/opengl/wrapper/glwInitES32Direct.inl
index aaef0d3..faa1573 100644 (file)
--- a/framework/opengl/wrapper/glwInitES32Direct.inl
+++ b/framework/opengl/wrapper/glwInitES32Direct.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeShaderProgram                                        = &glActiveShaderProgram;
 gl->activeTexture                                              = &glActiveTexture;

diff --git a/framework/opengl/wrapper/glwInitExtES.inl b/framework/opengl/wrapper/glwInitExtES.inl
index 3cf1b8b..24e385f 100644 (file)
--- a/framework/opengl/wrapper/glwInitExtES.inl
+++ b/framework/opengl/wrapper/glwInitExtES.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 
 if (de::contains(extSet, "GL_KHR_blend_equation_advanced"))

diff --git a/framework/opengl/wrapper/glwInitExtGL.inl b/framework/opengl/wrapper/glwInitExtGL.inl
index 26f25ba..862e84e 100644 (file)
--- a/framework/opengl/wrapper/glwInitExtGL.inl
+++ b/framework/opengl/wrapper/glwInitExtGL.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 
 if (de::contains(extSet, "GL_KHR_blend_equation_advanced"))

diff --git a/framework/opengl/wrapper/glwInitGL30.inl b/framework/opengl/wrapper/glwInitGL30.inl
index 0fbc1a9..1beebd9 100644 (file)
--- a/framework/opengl/wrapper/glwInitGL30.inl
+++ b/framework/opengl/wrapper/glwInitGL30.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
 gl->attachShader                                               = (glAttachShaderFunc)                                                  loader->get("glAttachShader");

diff --git a/framework/opengl/wrapper/glwInitGL31.inl b/framework/opengl/wrapper/glwInitGL31.inl
index 7b40442..bc59527 100644 (file)
--- a/framework/opengl/wrapper/glwInitGL31.inl
+++ b/framework/opengl/wrapper/glwInitGL31.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
 gl->attachShader                                               = (glAttachShaderFunc)                                                  loader->get("glAttachShader");

diff --git a/framework/opengl/wrapper/glwInitGL32.inl b/framework/opengl/wrapper/glwInitGL32.inl
index 62a7e1d..0f1e224 100644 (file)
--- a/framework/opengl/wrapper/glwInitGL32.inl
+++ b/framework/opengl/wrapper/glwInitGL32.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
 gl->attachShader                                               = (glAttachShaderFunc)                                                  loader->get("glAttachShader");

diff --git a/framework/opengl/wrapper/glwInitGL33.inl b/framework/opengl/wrapper/glwInitGL33.inl
index 1d2a5fc..fc0764f 100644 (file)
--- a/framework/opengl/wrapper/glwInitGL33.inl
+++ b/framework/opengl/wrapper/glwInitGL33.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
 gl->attachShader                                               = (glAttachShaderFunc)                                                  loader->get("glAttachShader");

diff --git a/framework/opengl/wrapper/glwInitGL40.inl b/framework/opengl/wrapper/glwInitGL40.inl
index 2abee8d..29b4f12 100644 (file)
--- a/framework/opengl/wrapper/glwInitGL40.inl
+++ b/framework/opengl/wrapper/glwInitGL40.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
 gl->attachShader                                               = (glAttachShaderFunc)                                                  loader->get("glAttachShader");

diff --git a/framework/opengl/wrapper/glwInitGL41.inl b/framework/opengl/wrapper/glwInitGL41.inl
index 6a9b5bb..cb0bede 100644 (file)
--- a/framework/opengl/wrapper/glwInitGL41.inl
+++ b/framework/opengl/wrapper/glwInitGL41.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeShaderProgram                                        = (glActiveShaderProgramFunc)                                   loader->get("glActiveShaderProgram");
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");

diff --git a/framework/opengl/wrapper/glwInitGL42.inl b/framework/opengl/wrapper/glwInitGL42.inl
index d12ed9c..bc91bc7 100644 (file)
--- a/framework/opengl/wrapper/glwInitGL42.inl
+++ b/framework/opengl/wrapper/glwInitGL42.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeShaderProgram                                                        = (glActiveShaderProgramFunc)                                                   loader->get("glActiveShaderProgram");
 gl->activeTexture                                                              = (glActiveTextureFunc)                                                                 loader->get("glActiveTexture");

diff --git a/framework/opengl/wrapper/glwInitGL43.inl b/framework/opengl/wrapper/glwInitGL43.inl
index 08af33e..38de230 100644 (file)
--- a/framework/opengl/wrapper/glwInitGL43.inl
+++ b/framework/opengl/wrapper/glwInitGL43.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeShaderProgram                                                        = (glActiveShaderProgramFunc)                                                   loader->get("glActiveShaderProgram");
 gl->activeTexture                                                              = (glActiveTextureFunc)                                                                 loader->get("glActiveTexture");

diff --git a/framework/opengl/wrapper/glwInitGL44.inl b/framework/opengl/wrapper/glwInitGL44.inl
index c58f427..7aabdf1 100644 (file)
--- a/framework/opengl/wrapper/glwInitGL44.inl
+++ b/framework/opengl/wrapper/glwInitGL44.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeShaderProgram                                                        = (glActiveShaderProgramFunc)                                                   loader->get("glActiveShaderProgram");
 gl->activeTexture                                                              = (glActiveTextureFunc)                                                                 loader->get("glActiveTexture");

diff --git a/framework/opengl/wrapper/glwInitGL45.inl b/framework/opengl/wrapper/glwInitGL45.inl
index 38d53e8..2864799 100644 (file)
--- a/framework/opengl/wrapper/glwInitGL45.inl
+++ b/framework/opengl/wrapper/glwInitGL45.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeShaderProgram                                                        = (glActiveShaderProgramFunc)                                                   loader->get("glActiveShaderProgram");
 gl->activeTexture                                                              = (glActiveTextureFunc)                                                                 loader->get("glActiveTexture");

diff --git a/framework/opengl/wrapper/glwInitGL46.inl b/framework/opengl/wrapper/glwInitGL46.inl
index e7f194c..0227fd2 100644 (file)
--- a/framework/opengl/wrapper/glwInitGL46.inl
+++ b/framework/opengl/wrapper/glwInitGL46.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeShaderProgram                                                        = (glActiveShaderProgramFunc)                                                   loader->get("glActiveShaderProgram");
 gl->activeTexture                                                              = (glActiveTextureFunc)                                                                 loader->get("glActiveTexture");

diff --git a/framework/opengl/wrapper/glwVersions.inl b/framework/opengl/wrapper/glwVersions.inl
index 0ae8058..299f1b3 100644 (file)
--- a/framework/opengl/wrapper/glwVersions.inl
+++ b/framework/opengl/wrapper/glwVersions.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 #define GL_ES_VERSION_2_0      1
 #define GL_ES_VERSION_3_0      1

diff --git a/framework/platform/null/tcuNullRenderContextFuncs.inl b/framework/platform/null/tcuNullRenderContextFuncs.inl
index 1fb4397..6cfbedf 100644 (file)
--- a/framework/platform/null/tcuNullRenderContextFuncs.inl
+++ b/framework/platform/null/tcuNullRenderContextFuncs.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 
 GLW_APICALL void GLW_APIENTRY glActiveShaderProgram (GLuint pipeline, GLuint program)

diff --git a/framework/platform/null/tcuNullRenderContextInitFuncs.inl b/framework/platform/null/tcuNullRenderContextInitFuncs.inl
index 03f99f6..7457c1f 100644 (file)
--- a/framework/platform/null/tcuNullRenderContextInitFuncs.inl
+++ b/framework/platform/null/tcuNullRenderContextInitFuncs.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision b7aee529f02340247e45621e9dbd054817d39c71.
+ * Generated from Khronos GL API description (gl.xml) revision a7b53cf072129a0218a4a56c00843289225eba0e.
  */
 gl->activeShaderProgram                                                                = glActiveShaderProgram;
 gl->activeTexture                                                                      = glActiveTexture;

diff --git a/modules/egl/teglGetProcAddressTests.inl b/modules/egl/teglGetProcAddressTests.inl
index 38b362f..66376f1 100644 (file)
--- a/modules/egl/teglGetProcAddressTests.inl
+++ b/modules/egl/teglGetProcAddressTests.inl
@@ -1048,6 +1048,12 @@ static const char* s_GL_QCOM_tiled_rendering[] =
        "glStartTilingQCOM",
 };
 
+static const char* s_GL_AMD_framebuffer_multisample_advanced[] =
+{
+       "glNamedRenderbufferStorageMultisampleAdvancedAMD",
+       "glRenderbufferStorageMultisampleAdvancedAMD",
+};
+
 static const char* s_GL_AMD_performance_monitor[] =
 {
        "glBeginPerfMonitorAMD",
@@ -1616,6 +1622,16 @@ static const char* s_GL_NV_internalformat_sample_query[] =
        "glGetInternalformatSampleivNV",
 };
 
+static const char* s_GL_NV_memory_attachment[] =
+{
+       "glBufferAttachMemoryNV",
+       "glGetMemoryObjectDetachedResourcesuivNV",
+       "glNamedBufferAttachMemoryNV",
+       "glResetMemoryObjectParameterNV",
+       "glTexAttachMemoryNV",
+       "glTextureAttachMemoryNV",
+};
+
 static const char* s_GL_NV_non_square_matrices[] =
 {
        "glUniformMatrix2x3fvNV",
@@ -1968,6 +1984,7 @@ static const struct
        { "GL_QCOM_extended_get",                                                               DE_LENGTH_OF_ARRAY(s_GL_QCOM_extended_get),                                                             s_GL_QCOM_extended_get                                                          },
        { "GL_QCOM_extended_get2",                                                              DE_LENGTH_OF_ARRAY(s_GL_QCOM_extended_get2),                                                    s_GL_QCOM_extended_get2                                                         },
        { "GL_QCOM_tiled_rendering",                                                    DE_LENGTH_OF_ARRAY(s_GL_QCOM_tiled_rendering),                                                  s_GL_QCOM_tiled_rendering                                                       },
+       { "GL_AMD_framebuffer_multisample_advanced",                    DE_LENGTH_OF_ARRAY(s_GL_AMD_framebuffer_multisample_advanced),                  s_GL_AMD_framebuffer_multisample_advanced                       },
        { "GL_AMD_performance_monitor",                                                 DE_LENGTH_OF_ARRAY(s_GL_AMD_performance_monitor),                                               s_GL_AMD_performance_monitor                                            },
        { "GL_ANGLE_framebuffer_blit",                                                  DE_LENGTH_OF_ARRAY(s_GL_ANGLE_framebuffer_blit),                                                s_GL_ANGLE_framebuffer_blit                                                     },
        { "GL_ANGLE_framebuffer_multisample",                                   DE_LENGTH_OF_ARRAY(s_GL_ANGLE_framebuffer_multisample),                                 s_GL_ANGLE_framebuffer_multisample                                      },
@@ -2038,6 +2055,7 @@ static const struct
        { "GL_NV_gpu_shader5",                                                                  DE_LENGTH_OF_ARRAY(s_GL_NV_gpu_shader5),                                                                s_GL_NV_gpu_shader5                                                                     },
        { "GL_NV_instanced_arrays",                                                             DE_LENGTH_OF_ARRAY(s_GL_NV_instanced_arrays),                                                   s_GL_NV_instanced_arrays                                                        },
        { "GL_NV_internalformat_sample_query",                                  DE_LENGTH_OF_ARRAY(s_GL_NV_internalformat_sample_query),                                s_GL_NV_internalformat_sample_query                                     },
+       { "GL_NV_memory_attachment",                                                    DE_LENGTH_OF_ARRAY(s_GL_NV_memory_attachment),                                                  s_GL_NV_memory_attachment                                                       },
        { "GL_NV_non_square_matrices",                                                  DE_LENGTH_OF_ARRAY(s_GL_NV_non_square_matrices),                                                s_GL_NV_non_square_matrices                                                     },
        { "GL_NV_path_rendering",                                                               DE_LENGTH_OF_ARRAY(s_GL_NV_path_rendering),                                                             s_GL_NV_path_rendering                                                          },
        { "GL_NV_polygon_mode",                                                                 DE_LENGTH_OF_ARRAY(s_GL_NV_polygon_mode),                                                               s_GL_NV_polygon_mode                                                            },

diff --git a/scripts/opengl/src_util.py b/scripts/opengl/src_util.py
index 22a36da..89bb59f 100644 (file)
--- a/scripts/opengl/src_util.py
+++ b/scripts/opengl/src_util.py
@@ -36,10 +36,10 @@ EGL_DIR                             = os.path.normpath(os.path.join(SCRIPTS_DIR, "..", "..", "framework",
 OPENGL_INC_DIR         = os.path.join(OPENGL_DIR, "wrapper")
 
 GL_SOURCE                      = khr_util.registry_cache.RegistrySource(
-                                               "https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry",
+                                               "git@gitlab.khronos.org:opengl/registry.git",
                                                "xml/gl.xml",
-                                               "b7aee529f02340247e45621e9dbd054817d39c71",
-                                               "9a5e5d6b8b45df8d8f95c56f8fc0bc9ab99e675f43a9509aa2b222bcc9ed715a")
+                                               "a7b53cf072129a0218a4a56c00843289225eba0e",
+                                               "217dfcc9ce003f2123856d58488c9ab413c1735ee85fec657a02f6f1e125649d")
 
 EXTENSIONS                     = [
        'GL_KHR_texture_compression_astc_ldr',
@@ -50,6 +50,7 @@ EXTENSIONS                    = [
        'GL_KHR_robustness',
        'GL_KHR_no_error',
        'GL_KHR_parallel_shader_compile',
+       'GL_KHR_shader_subgroup',
        'GL_EXT_bgra',
        'GL_EXT_geometry_point_size',
        'GL_EXT_tessellation_shader',
@@ -133,6 +134,7 @@ EXTENSIONS                  = [
        'GL_NV_deep_texture3D',
        'GL_NV_gpu_multicast',
        'GL_NV_internalformat_sample_query',
+       'GL_NV_shader_subgroup_partitioned',
        'GL_NVX_cross_process_interop',
        'GL_OES_draw_elements_base_vertex',
        'GL_OVR_multiview',