From: Daniel Koch Date: Mon, 29 Jul 2019 15:29:24 +0000 (-0400) Subject: Update Opengl registry files X-Git-Tag: upstream/1.3.5~1943^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06c3558160825ef1f1e9cf56a44bc97f8d6aac16;p=platform%2Fupstream%2FVK-GL-CTS.git Update Opengl registry files from latest public registry Component: OpenGL VK-GL-CTS Issue: 1698 Change-Id: I0eda9b7af5d13689a141e67f968a697241f32e1f --- diff --git a/android/cts/master/egl-master.txt b/android/cts/master/egl-master.txt index 6644231..27a04bd 100644 --- a/android/cts/master/egl-master.txt +++ b/android/cts/master/egl-master.txt @@ -2561,11 +2561,14 @@ 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_mesh_shader 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 dEQP-EGL.functional.get_proc_address.extension.gl_nv_read_buffer dEQP-EGL.functional.get_proc_address.extension.gl_nv_sample_locations +dEQP-EGL.functional.get_proc_address.extension.gl_nv_scissor_exclusive +dEQP-EGL.functional.get_proc_address.extension.gl_nv_shading_rate_image dEQP-EGL.functional.get_proc_address.extension.gl_nv_viewport_array dEQP-EGL.functional.get_proc_address.extension.gl_nv_viewport_swizzle dEQP-EGL.functional.get_proc_address.extension.gl_oes_copy_image 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 bb033b7..837891c 100644 --- 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 @@ -2562,11 +2562,14 @@ 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_mesh_shader 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 dEQP-EGL.functional.get_proc_address.extension.gl_nv_read_buffer dEQP-EGL.functional.get_proc_address.extension.gl_nv_sample_locations +dEQP-EGL.functional.get_proc_address.extension.gl_nv_scissor_exclusive +dEQP-EGL.functional.get_proc_address.extension.gl_nv_shading_rate_image dEQP-EGL.functional.get_proc_address.extension.gl_nv_viewport_array dEQP-EGL.functional.get_proc_address.extension.gl_nv_viewport_swizzle dEQP-EGL.functional.get_proc_address.extension.gl_oes_copy_image 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 583026a..6d0c0a1 100644 --- a/external/openglcts/data/mustpass/egl/aosp_mustpass/master/egl-master.txt +++ b/external/openglcts/data/mustpass/egl/aosp_mustpass/master/egl-master.txt @@ -2562,11 +2562,14 @@ 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_mesh_shader 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 dEQP-EGL.functional.get_proc_address.extension.gl_nv_read_buffer dEQP-EGL.functional.get_proc_address.extension.gl_nv_sample_locations +dEQP-EGL.functional.get_proc_address.extension.gl_nv_scissor_exclusive +dEQP-EGL.functional.get_proc_address.extension.gl_nv_shading_rate_image dEQP-EGL.functional.get_proc_address.extension.gl_nv_viewport_array dEQP-EGL.functional.get_proc_address.extension.gl_nv_viewport_swizzle dEQP-EGL.functional.get_proc_address.extension.gl_oes_copy_image diff --git a/framework/egl/egluStaticES20Library.inl b/framework/egl/egluStaticES20Library.inl index 69872c4..edeed0e 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ { "glActiveTexture", (deFunctionPtr)glActiveTexture }, { "glAttachShader", (deFunctionPtr)glAttachShader }, diff --git a/framework/egl/egluStaticES30Library.inl b/framework/egl/egluStaticES30Library.inl index 11e0f73..659601c 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ { "glActiveTexture", (deFunctionPtr)glActiveTexture }, { "glAttachShader", (deFunctionPtr)glAttachShader }, diff --git a/framework/egl/egluStaticES31Library.inl b/framework/egl/egluStaticES31Library.inl index c7eca37..d69ebd0 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ { "glActiveShaderProgram", (deFunctionPtr)glActiveShaderProgram }, { "glActiveTexture", (deFunctionPtr)glActiveTexture }, diff --git a/framework/egl/egluStaticES32Library.inl b/framework/egl/egluStaticES32Library.inl index 427f835..6b7718b 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ { "glActiveShaderProgram", (deFunctionPtr)glActiveShaderProgram }, { "glActiveTexture", (deFunctionPtr)glActiveTexture }, diff --git a/framework/opengl/gluCallLogUtil.inl b/framework/opengl/gluCallLogUtil.inl index f57cf11..6637d2c 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ int getTextureParamNumArgs (int pname) diff --git a/framework/opengl/gluCallLogWrapper.inl b/framework/opengl/gluCallLogWrapper.inl index 0ffb58e..aba9796 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ void CallLogWrapper::glActiveShaderProgram (glw::GLuint pipeline, glw::GLuint program) diff --git a/framework/opengl/gluCallLogWrapperApi.inl b/framework/opengl/gluCallLogWrapperApi.inl index 8dd7279..c46f5e3 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 fef77ed..23bfa82 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ int getBasicQueryNumArgsOut (int pname) diff --git a/framework/opengl/gluStrUtil.inl b/framework/opengl/gluStrUtil.inl index ccb35ce..204ba2e 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ const char* getErrorName (int value) diff --git a/framework/opengl/gluStrUtilPrototypes.inl b/framework/opengl/gluStrUtilPrototypes.inl index a1b5824..9d8dedd 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 64f0f77..9dde9ff 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ #define glActiveShaderProgram glwActiveShaderProgram #define glActiveTexture glwActiveTexture diff --git a/framework/opengl/wrapper/glwEnums.inl b/framework/opengl/wrapper/glwEnums.inl index b56d14f..70a646f 100644 --- a/framework/opengl/wrapper/glwEnums.inl +++ b/framework/opengl/wrapper/glwEnums.inl @@ -1,11 +1,16 @@ /* 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ #define GL_DEPTH_BUFFER_BIT 0x00000100 #define GL_STENCIL_BUFFER_BIT 0x00000400 #define GL_COLOR_BUFFER_BIT 0x00004000 +#define GL_DYNAMIC_STORAGE_BIT 0x0100 +#define GL_CLIENT_STORAGE_BIT 0x0200 +#define GL_SPARSE_STORAGE_BIT_ARB 0x0400 +#define GL_PER_GPU_STORAGE_BIT_NV 0x0800 +#define GL_EXTERNAL_STORAGE_BIT_NVX 0x2000 #define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x00000001 #define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 #define GL_CONTEXT_FLAG_DEBUG_BIT_KHR 0x00000002 @@ -22,11 +27,6 @@ #define GL_MAP_UNSYNCHRONIZED_BIT 0x0020 #define GL_MAP_PERSISTENT_BIT 0x0040 #define GL_MAP_COHERENT_BIT 0x0080 -#define GL_DYNAMIC_STORAGE_BIT 0x0100 -#define GL_CLIENT_STORAGE_BIT 0x0200 -#define GL_SPARSE_STORAGE_BIT_ARB 0x0400 -#define GL_PER_GPU_STORAGE_BIT_NV 0x0800 -#define GL_EXTERNAL_STORAGE_BIT_NVX 0x2000 #define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT 0x00000001 #define GL_ELEMENT_ARRAY_BARRIER_BIT 0x00000002 #define GL_UNIFORM_BARRIER_BIT 0x00000004 diff --git a/framework/opengl/wrapper/glwFunctionTypes.inl b/framework/opengl/wrapper/glwFunctionTypes.inl index 921903e..48fd604 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 8201d3a..2e1ce5f 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ glActiveShaderProgramFunc activeShaderProgram; glActiveTextureFunc activeTexture; diff --git a/framework/opengl/wrapper/glwImpl.inl b/framework/opengl/wrapper/glwImpl.inl index 1f9ecb9..f7aa5e0 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ void glwActiveShaderProgram (GLuint pipeline, GLuint program) diff --git a/framework/opengl/wrapper/glwInitES20.inl b/framework/opengl/wrapper/glwInitES20.inl index 13c038d..eeb04a4 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 b1aa141..19565d1 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ gl->activeTexture = &glActiveTexture; gl->attachShader = &glAttachShader; diff --git a/framework/opengl/wrapper/glwInitES30.inl b/framework/opengl/wrapper/glwInitES30.inl index e9f4524..86ff085 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 e2a5771..c5402a5 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ gl->activeTexture = &glActiveTexture; gl->attachShader = &glAttachShader; diff --git a/framework/opengl/wrapper/glwInitES31.inl b/framework/opengl/wrapper/glwInitES31.inl index cd072d8..c7a4d9a 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 ff7e5d4..bcfbfa7 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ gl->activeShaderProgram = &glActiveShaderProgram; gl->activeTexture = &glActiveTexture; diff --git a/framework/opengl/wrapper/glwInitES32.inl b/framework/opengl/wrapper/glwInitES32.inl index b5f1394..9273879 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 faa1573..0c6c269 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ gl->activeShaderProgram = &glActiveShaderProgram; gl->activeTexture = &glActiveTexture; diff --git a/framework/opengl/wrapper/glwInitExtES.inl b/framework/opengl/wrapper/glwInitExtES.inl index 24e385f..a249128 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ if (de::contains(extSet, "GL_KHR_blend_equation_advanced")) diff --git a/framework/opengl/wrapper/glwInitExtGL.inl b/framework/opengl/wrapper/glwInitExtGL.inl index 862e84e..fb6c9c1 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ if (de::contains(extSet, "GL_KHR_blend_equation_advanced")) diff --git a/framework/opengl/wrapper/glwInitGL30.inl b/framework/opengl/wrapper/glwInitGL30.inl index 1beebd9..09cd500 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 bc59527..b761a2f 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 0f1e224..e4e2d90 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 fc0764f..eb5c029 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 29b4f12..8724d38 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 cb0bede..66009eb 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 bc91bc7..188f69a 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 38de230..b96d717 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 7aabdf1..2e861bd 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 2864799..525c40b 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 0227fd2..e9823f4 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 299f1b3..f46b1c6 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ #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 6cfbedf..9926b80 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ 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 7457c1f..61f6c89 100644 --- 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 a7b53cf072129a0218a4a56c00843289225eba0e. + * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. */ gl->activeShaderProgram = glActiveShaderProgram; gl->activeTexture = glActiveTexture; diff --git a/modules/egl/teglGetProcAddressTests.inl b/modules/egl/teglGetProcAddressTests.inl index 66376f1..bd65656 100644 --- a/modules/egl/teglGetProcAddressTests.inl +++ b/modules/egl/teglGetProcAddressTests.inl @@ -1632,6 +1632,14 @@ static const char* s_GL_NV_memory_attachment[] = "glTextureAttachMemoryNV", }; +static const char* s_GL_NV_mesh_shader[] = +{ + "glDrawMeshTasksNV", + "glDrawMeshTasksIndirectNV", + "glMultiDrawMeshTasksIndirectNV", + "glMultiDrawMeshTasksIndirectCountNV", +}; + static const char* s_GL_NV_non_square_matrices[] = { "glUniformMatrix2x3fvNV", @@ -1739,6 +1747,23 @@ static const char* s_GL_NV_sample_locations[] = "glResolveDepthValuesNV", }; +static const char* s_GL_NV_scissor_exclusive[] = +{ + "glScissorExclusiveArrayvNV", + "glScissorExclusiveNV", +}; + +static const char* s_GL_NV_shading_rate_image[] = +{ + "glBindShadingRateImageNV", + "glGetShadingRateImagePaletteNV", + "glGetShadingRateSampleLocationivNV", + "glShadingRateImageBarrierNV", + "glShadingRateImagePaletteNV", + "glShadingRateSampleOrderNV", + "glShadingRateSampleOrderCustomNV", +}; + static const char* s_GL_NV_viewport_array[] = { "glDepthRangeArrayfvNV", @@ -2056,11 +2081,14 @@ static const struct { "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_mesh_shader", DE_LENGTH_OF_ARRAY(s_GL_NV_mesh_shader), s_GL_NV_mesh_shader }, { "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 }, { "GL_NV_read_buffer", DE_LENGTH_OF_ARRAY(s_GL_NV_read_buffer), s_GL_NV_read_buffer }, { "GL_NV_sample_locations", DE_LENGTH_OF_ARRAY(s_GL_NV_sample_locations), s_GL_NV_sample_locations }, + { "GL_NV_scissor_exclusive", DE_LENGTH_OF_ARRAY(s_GL_NV_scissor_exclusive), s_GL_NV_scissor_exclusive }, + { "GL_NV_shading_rate_image", DE_LENGTH_OF_ARRAY(s_GL_NV_shading_rate_image), s_GL_NV_shading_rate_image }, { "GL_NV_viewport_array", DE_LENGTH_OF_ARRAY(s_GL_NV_viewport_array), s_GL_NV_viewport_array }, { "GL_NV_viewport_swizzle", DE_LENGTH_OF_ARRAY(s_GL_NV_viewport_swizzle), s_GL_NV_viewport_swizzle }, { "GL_OES_copy_image", DE_LENGTH_OF_ARRAY(s_GL_OES_copy_image), s_GL_OES_copy_image }, diff --git a/scripts/opengl/src_util.py b/scripts/opengl/src_util.py index 89bb59f..1240831 100644 --- 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( - "git@gitlab.khronos.org:opengl/registry.git", + "https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry", "xml/gl.xml", - "a7b53cf072129a0218a4a56c00843289225eba0e", - "217dfcc9ce003f2123856d58488c9ab413c1735ee85fec657a02f6f1e125649d") + "9d534f9312e56c72df763207e449c6719576fd54", + "245e90331c83c4c743a2b9d0dad51e27a699f2040ebd34dd5338637adf276752") EXTENSIONS = [ 'GL_KHR_texture_compression_astc_ldr',