resolve merge conflicts of ae3759c7 to deqp-dev
Test: Build deqp apk and ran scripts/check_build_sanity.py
Change-Id: I2aad44982a04d1066c7a7f37fac139b735c5211b
diff --git a/android/cts/master/egl-master.txt b/android/cts/master/egl-master.txt
index 1c4fa8c..93332e8 100644
--- a/android/cts/master/egl-master.txt
+++ b/android/cts/master/egl-master.txt
@@ -2490,7 +2490,6 @@
dEQP-EGL.functional.get_proc_address.extension.gl_nv_coverage_sample
dEQP-EGL.functional.get_proc_address.extension.gl_nv_draw_buffers
dEQP-EGL.functional.get_proc_address.extension.gl_nv_draw_instanced
-dEQP-EGL.functional.get_proc_address.extension.gl_nv_draw_vulkan_image
dEQP-EGL.functional.get_proc_address.extension.gl_nv_fragment_coverage_to_color
dEQP-EGL.functional.get_proc_address.extension.gl_nv_framebuffer_blit
dEQP-EGL.functional.get_proc_address.extension.gl_nv_framebuffer_mixed_samples
@@ -2523,6 +2522,7 @@
dEQP-EGL.functional.get_proc_address.extension.gl_ovr_multiview_multisampled_render_to_texture
dEQP-EGL.functional.get_proc_address.extension.gl_qcom_alpha_test
dEQP-EGL.functional.get_proc_address.extension.gl_qcom_framebuffer_foveated
+dEQP-EGL.functional.get_proc_address.extension.gl_nv_draw_vulkan_image
dEQP-EGL.functional.get_proc_address.core.egl
dEQP-EGL.functional.get_proc_address.core.gles
dEQP-EGL.functional.get_proc_address.core.gles2
diff --git a/framework/egl/egluStaticES20Library.inl b/framework/egl/egluStaticES20Library.inl
index 6b6bf5f..bfc637c 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
{ "glActiveTexture", (deFunctionPtr)glActiveTexture },
{ "glAttachShader", (deFunctionPtr)glAttachShader },
diff --git a/framework/egl/egluStaticES30Library.inl b/framework/egl/egluStaticES30Library.inl
index f8da8be..3f6a7e5 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
{ "glActiveTexture", (deFunctionPtr)glActiveTexture },
{ "glAttachShader", (deFunctionPtr)glAttachShader },
diff --git a/framework/opengl/gluCallLogUtil.inl b/framework/opengl/gluCallLogUtil.inl
index b786409..4f6e42b 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
int getTextureParamNumArgs (int pname)
diff --git a/framework/opengl/gluCallLogWrapper.inl b/framework/opengl/gluCallLogWrapper.inl
index 4c02574..c6cb935 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
void CallLogWrapper::glActiveShaderProgram (glw::GLuint pipeline, glw::GLuint program)
@@ -1936,6 +1936,16 @@
return returnValue;
}
+glw::GLenum CallLogWrapper::glGetGraphicsResetStatusEXT (void)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "glGetGraphicsResetStatusEXT(" << ");" << TestLog::EndMessage;
+ glw::GLenum returnValue = m_gl.getGraphicsResetStatusEXT();
+ if (m_enableLog)
+ m_log << TestLog::Message << "// " << toHex(returnValue) << " returned" << TestLog::EndMessage;
+ return returnValue;
+}
+
void CallLogWrapper::glGetInteger64i_v (glw::GLenum target, glw::GLuint index, glw::GLint64 *data)
{
if (m_enableLog)
@@ -2958,6 +2968,13 @@
m_gl.getnUniformfv(program, location, bufSize, params);
}
+void CallLogWrapper::glGetnUniformfvEXT (glw::GLuint program, glw::GLint location, glw::GLsizei bufSize, glw::GLfloat *params)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "glGetnUniformfvEXT(" << program << ", " << location << ", " << bufSize << ", " << toHex(reinterpret_cast<deUintptr>(static_cast<const void*>(params))) << ");" << TestLog::EndMessage;
+ m_gl.getnUniformfvEXT(program, location, bufSize, params);
+}
+
void CallLogWrapper::glGetnUniformiv (glw::GLuint program, glw::GLint location, glw::GLsizei bufSize, glw::GLint *params)
{
if (m_enableLog)
@@ -2965,6 +2982,13 @@
m_gl.getnUniformiv(program, location, bufSize, params);
}
+void CallLogWrapper::glGetnUniformivEXT (glw::GLuint program, glw::GLint location, glw::GLsizei bufSize, glw::GLint *params)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "glGetnUniformivEXT(" << program << ", " << location << ", " << bufSize << ", " << toHex(reinterpret_cast<deUintptr>(static_cast<const void*>(params))) << ");" << TestLog::EndMessage;
+ m_gl.getnUniformivEXT(program, location, bufSize, params);
+}
+
void CallLogWrapper::glGetnUniformuiv (glw::GLuint program, glw::GLint location, glw::GLsizei bufSize, glw::GLuint *params)
{
if (m_enableLog)
diff --git a/framework/opengl/gluCallLogWrapperApi.inl b/framework/opengl/gluCallLogWrapperApi.inl
index 3ac2072..0c70026 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
void glActiveShaderProgram (glw::GLuint pipeline, glw::GLuint program);
void glActiveTexture (glw::GLenum texture);
@@ -268,6 +268,7 @@
void glGetFramebufferParameteriv (glw::GLenum target, glw::GLenum pname, glw::GLint *params);
void glGetFramebufferParameterivEXT (glw::GLuint framebuffer, glw::GLenum pname, glw::GLint *params);
glw::GLenum glGetGraphicsResetStatus (void);
+glw::GLenum glGetGraphicsResetStatusEXT (void);
void glGetInteger64i_v (glw::GLenum target, glw::GLuint index, glw::GLint64 *data);
void glGetInteger64v (glw::GLenum pname, glw::GLint64 *data);
void glGetIntegeri_v (glw::GLenum target, glw::GLuint index, glw::GLint *data);
@@ -400,7 +401,9 @@
void glGetnTexImage (glw::GLenum target, glw::GLint level, glw::GLenum format, glw::GLenum type, glw::GLsizei bufSize, void *pixels);
void glGetnUniformdv (glw::GLuint program, glw::GLint location, glw::GLsizei bufSize, glw::GLdouble *params);
void glGetnUniformfv (glw::GLuint program, glw::GLint location, glw::GLsizei bufSize, glw::GLfloat *params);
+void glGetnUniformfvEXT (glw::GLuint program, glw::GLint location, glw::GLsizei bufSize, glw::GLfloat *params);
void glGetnUniformiv (glw::GLuint program, glw::GLint location, glw::GLsizei bufSize, glw::GLint *params);
+void glGetnUniformivEXT (glw::GLuint program, glw::GLint location, glw::GLsizei bufSize, glw::GLint *params);
void glGetnUniformuiv (glw::GLuint program, glw::GLint location, glw::GLsizei bufSize, glw::GLuint *params);
void glHint (glw::GLenum target, glw::GLenum mode);
void glInsertEventMarkerEXT (glw::GLsizei length, const glw::GLchar *marker);
diff --git a/framework/opengl/gluES3PlusWrapperFuncs.inl b/framework/opengl/gluES3PlusWrapperFuncs.inl
index c70eb71..8d5167a 100644
--- a/framework/opengl/gluES3PlusWrapperFuncs.inl
+++ b/framework/opengl/gluES3PlusWrapperFuncs.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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
dst->activeShaderProgram = src.activeShaderProgram;
dst->activeTexture = src.activeTexture;
diff --git a/framework/opengl/gluQueryUtil.inl b/framework/opengl/gluQueryUtil.inl
index 7f30ea8..da5a927 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
int getBasicQueryNumArgsOut (int pname)
diff --git a/framework/opengl/gluStrUtil.inl b/framework/opengl/gluStrUtil.inl
index ef4d780..a75e8ab 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
const char* getErrorName (int value)
diff --git a/framework/opengl/gluStrUtilPrototypes.inl b/framework/opengl/gluStrUtilPrototypes.inl
index 8cfbd72..5e54abf 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
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 c317eea..e24474f 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
#define glActiveShaderProgram glwActiveShaderProgram
#define glActiveTexture glwActiveTexture
@@ -268,6 +268,7 @@
#define glGetFramebufferParameteriv glwGetFramebufferParameteriv
#define glGetFramebufferParameterivEXT glwGetFramebufferParameterivEXT
#define glGetGraphicsResetStatus glwGetGraphicsResetStatus
+#define glGetGraphicsResetStatusEXT glwGetGraphicsResetStatusEXT
#define glGetInteger64i_v glwGetInteger64i_v
#define glGetInteger64v glwGetInteger64v
#define glGetIntegeri_v glwGetIntegeri_v
@@ -400,7 +401,9 @@
#define glGetnTexImage glwGetnTexImage
#define glGetnUniformdv glwGetnUniformdv
#define glGetnUniformfv glwGetnUniformfv
+#define glGetnUniformfvEXT glwGetnUniformfvEXT
#define glGetnUniformiv glwGetnUniformiv
+#define glGetnUniformivEXT glwGetnUniformivEXT
#define glGetnUniformuiv glwGetnUniformuiv
#define glHint glwHint
#define glInsertEventMarkerEXT glwInsertEventMarkerEXT
@@ -1150,6 +1153,7 @@
void glwGetFramebufferParameteriv (GLenum target, GLenum pname, GLint *params);
void glwGetFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params);
GLenum glwGetGraphicsResetStatus ();
+GLenum glwGetGraphicsResetStatusEXT ();
void glwGetInteger64i_v (GLenum target, GLuint index, GLint64 *data);
void glwGetInteger64v (GLenum pname, GLint64 *data);
void glwGetIntegeri_v (GLenum target, GLuint index, GLint *data);
@@ -1282,7 +1286,9 @@
void glwGetnTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
void glwGetnUniformdv (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
void glwGetnUniformfv (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+void glwGetnUniformfvEXT (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
void glwGetnUniformiv (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+void glwGetnUniformivEXT (GLuint program, GLint location, GLsizei bufSize, GLint *params);
void glwGetnUniformuiv (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
void glwHint (GLenum target, GLenum mode);
void glwInsertEventMarkerEXT (GLsizei length, const GLchar *marker);
diff --git a/framework/opengl/wrapper/glwEnums.inl b/framework/opengl/wrapper/glwEnums.inl
index bb5d4b9..65a3591 100644
--- 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
#define GL_DEPTH_BUFFER_BIT 0x00000100
#define GL_STENCIL_BUFFER_BIT 0x00000400
diff --git a/framework/opengl/wrapper/glwFunctionTypes.inl b/framework/opengl/wrapper/glwFunctionTypes.inl
index 077f8f5..9184a73 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
typedef GLW_APICALL void (GLW_APIENTRY* glActiveShaderProgramFunc) (GLuint pipeline, GLuint program);
typedef GLW_APICALL void (GLW_APIENTRY* glActiveTextureFunc) (GLenum texture);
@@ -268,6 +268,7 @@
typedef GLW_APICALL void (GLW_APIENTRY* glGetFramebufferParameterivFunc) (GLenum target, GLenum pname, GLint *params);
typedef GLW_APICALL void (GLW_APIENTRY* glGetFramebufferParameterivEXTFunc) (GLuint framebuffer, GLenum pname, GLint *params);
typedef GLW_APICALL GLenum (GLW_APIENTRY* glGetGraphicsResetStatusFunc) (void);
+typedef GLW_APICALL GLenum (GLW_APIENTRY* glGetGraphicsResetStatusEXTFunc) (void);
typedef GLW_APICALL void (GLW_APIENTRY* glGetInteger64i_vFunc) (GLenum target, GLuint index, GLint64 *data);
typedef GLW_APICALL void (GLW_APIENTRY* glGetInteger64vFunc) (GLenum pname, GLint64 *data);
typedef GLW_APICALL void (GLW_APIENTRY* glGetIntegeri_vFunc) (GLenum target, GLuint index, GLint *data);
@@ -400,7 +401,9 @@
typedef GLW_APICALL void (GLW_APIENTRY* glGetnTexImageFunc) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
typedef GLW_APICALL void (GLW_APIENTRY* glGetnUniformdvFunc) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
typedef GLW_APICALL void (GLW_APIENTRY* glGetnUniformfvFunc) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+typedef GLW_APICALL void (GLW_APIENTRY* glGetnUniformfvEXTFunc) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
typedef GLW_APICALL void (GLW_APIENTRY* glGetnUniformivFunc) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+typedef GLW_APICALL void (GLW_APIENTRY* glGetnUniformivEXTFunc) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
typedef GLW_APICALL void (GLW_APIENTRY* glGetnUniformuivFunc) (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
typedef GLW_APICALL void (GLW_APIENTRY* glHintFunc) (GLenum target, GLenum mode);
typedef GLW_APICALL void (GLW_APIENTRY* glInsertEventMarkerEXTFunc) (GLsizei length, const GLchar *marker);
diff --git a/framework/opengl/wrapper/glwFunctions.inl b/framework/opengl/wrapper/glwFunctions.inl
index 4b61f1d..f2428b1 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
glActiveShaderProgramFunc activeShaderProgram;
glActiveTextureFunc activeTexture;
@@ -268,6 +268,7 @@
glGetFramebufferParameterivFunc getFramebufferParameteriv;
glGetFramebufferParameterivEXTFunc getFramebufferParameterivEXT;
glGetGraphicsResetStatusFunc getGraphicsResetStatus;
+glGetGraphicsResetStatusEXTFunc getGraphicsResetStatusEXT;
glGetInteger64i_vFunc getInteger64i_v;
glGetInteger64vFunc getInteger64v;
glGetIntegeri_vFunc getIntegeri_v;
@@ -400,7 +401,9 @@
glGetnTexImageFunc getnTexImage;
glGetnUniformdvFunc getnUniformdv;
glGetnUniformfvFunc getnUniformfv;
+glGetnUniformfvEXTFunc getnUniformfvEXT;
glGetnUniformivFunc getnUniformiv;
+glGetnUniformivEXTFunc getnUniformivEXT;
glGetnUniformuivFunc getnUniformuiv;
glHintFunc hint;
glInsertEventMarkerEXTFunc insertEventMarkerEXT;
diff --git a/framework/opengl/wrapper/glwImpl.inl b/framework/opengl/wrapper/glwImpl.inl
index 7c11b5a..859a16d 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
void glwActiveShaderProgram (GLuint pipeline, GLuint program)
@@ -2124,6 +2124,14 @@
return gl->getGraphicsResetStatus();
}
+GLenum glwGetGraphicsResetStatusEXT (void)
+{
+ const glw::Functions* gl = glw::getCurrentThreadFunctions();
+ if (!gl)
+ return (GLenum)0;
+ return gl->getGraphicsResetStatusEXT();
+}
+
void glwGetInteger64i_v (GLenum target, GLuint index, GLint64 *data)
{
const glw::Functions* gl = glw::getCurrentThreadFunctions();
@@ -3180,6 +3188,14 @@
gl->getnUniformfv(program, location, bufSize, params);
}
+void glwGetnUniformfvEXT (GLuint program, GLint location, GLsizei bufSize, GLfloat *params)
+{
+ const glw::Functions* gl = glw::getCurrentThreadFunctions();
+ if (!gl)
+ return;
+ gl->getnUniformfvEXT(program, location, bufSize, params);
+}
+
void glwGetnUniformiv (GLuint program, GLint location, GLsizei bufSize, GLint *params)
{
const glw::Functions* gl = glw::getCurrentThreadFunctions();
@@ -3188,6 +3204,14 @@
gl->getnUniformiv(program, location, bufSize, params);
}
+void glwGetnUniformivEXT (GLuint program, GLint location, GLsizei bufSize, GLint *params)
+{
+ const glw::Functions* gl = glw::getCurrentThreadFunctions();
+ if (!gl)
+ return;
+ gl->getnUniformivEXT(program, location, bufSize, params);
+}
+
void glwGetnUniformuiv (GLuint program, GLint location, GLsizei bufSize, GLuint *params)
{
const glw::Functions* gl = glw::getCurrentThreadFunctions();
diff --git a/framework/opengl/wrapper/glwInitES20.inl b/framework/opengl/wrapper/glwInitES20.inl
index 921c26e..c6e6f0f 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
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 d315267..ce21ae6 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
gl->activeTexture = &glActiveTexture;
gl->attachShader = &glAttachShader;
diff --git a/framework/opengl/wrapper/glwInitES30.inl b/framework/opengl/wrapper/glwInitES30.inl
index ba73a6a..e765528 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
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 bac790a..445d2c0 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
gl->activeTexture = &glActiveTexture;
gl->attachShader = &glAttachShader;
diff --git a/framework/opengl/wrapper/glwInitES31.inl b/framework/opengl/wrapper/glwInitES31.inl
index 5a63a36..67d5faf 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
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 f2a44b7..713cc49 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
gl->activeShaderProgram = &glActiveShaderProgram;
gl->activeTexture = &glActiveTexture;
diff --git a/framework/opengl/wrapper/glwInitES32.inl b/framework/opengl/wrapper/glwInitES32.inl
index 3ec0bb2..4bcbebb 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
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 4803493..79a203d 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
gl->activeShaderProgram = &glActiveShaderProgram;
gl->activeTexture = &glActiveTexture;
diff --git a/framework/opengl/wrapper/glwInitExtES.inl b/framework/opengl/wrapper/glwInitExtES.inl
index b29d861..8fe5a40 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
if (de::contains(extSet, "GL_KHR_blend_equation_advanced"))
@@ -45,10 +45,10 @@
if (de::contains(extSet, "GL_EXT_robustness"))
{
- gl->getGraphicsResetStatus = (glGetGraphicsResetStatusFunc) loader->get("glGetGraphicsResetStatusEXT");
- gl->getnUniformfv = (glGetnUniformfvFunc) loader->get("glGetnUniformfvEXT");
- gl->getnUniformiv = (glGetnUniformivFunc) loader->get("glGetnUniformivEXT");
- gl->readnPixels = (glReadnPixelsFunc) loader->get("glReadnPixelsEXT");
+ gl->getGraphicsResetStatusEXT = (glGetGraphicsResetStatusEXTFunc) loader->get("glGetGraphicsResetStatusEXT");
+ gl->getnUniformfvEXT = (glGetnUniformfvEXTFunc) loader->get("glGetnUniformfvEXT");
+ gl->getnUniformivEXT = (glGetnUniformivEXTFunc) loader->get("glGetnUniformivEXT");
+ gl->readnPixels = (glReadnPixelsFunc) loader->get("glReadnPixelsEXT");
}
if (de::contains(extSet, "GL_EXT_texture_buffer"))
diff --git a/framework/opengl/wrapper/glwInitExtGL.inl b/framework/opengl/wrapper/glwInitExtGL.inl
index 7fd490a..00ab28c 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
if (de::contains(extSet, "GL_KHR_blend_equation_advanced"))
@@ -573,12 +573,6 @@
gl->dispatchComputeIndirect = (glDispatchComputeIndirectFunc) loader->get("glDispatchComputeIndirect");
}
-if (de::contains(extSet, "GL_ARB_draw_instanced"))
-{
- gl->drawArraysInstanced = (glDrawArraysInstancedFunc) loader->get("glDrawArraysInstancedARB");
- gl->drawElementsInstanced = (glDrawElementsInstancedFunc) loader->get("glDrawElementsInstancedARB");
-}
-
if (de::contains(extSet, "GL_ARB_draw_elements_base_vertex"))
{
gl->drawElementsBaseVertex = (glDrawElementsBaseVertexFunc) loader->get("glDrawElementsBaseVertex");
@@ -706,16 +700,6 @@
gl->getInternalformativ = (glGetInternalformativFunc) loader->get("glGetInternalformativ");
}
-if (de::contains(extSet, "GL_ARB_instanced_arrays"))
-{
- gl->vertexAttribDivisor = (glVertexAttribDivisorFunc) loader->get("glVertexAttribDivisorARB");
-}
-
-if (de::contains(extSet, "GL_ARB_parallel_shader_compile"))
-{
- gl->maxShaderCompilerThreadsARB = (glMaxShaderCompilerThreadsARBFunc) loader->get("glMaxShaderCompilerThreadsARB");
-}
-
if (de::contains(extSet, "GL_ARB_program_interface_query"))
{
gl->getProgramInterfaceiv = (glGetProgramInterfaceivFunc) loader->get("glGetProgramInterfaceiv");
diff --git a/framework/opengl/wrapper/glwInitGL30.inl b/framework/opengl/wrapper/glwInitGL30.inl
index dcbd864..9aea113 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
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 4ffbaf5..af71dc4 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
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 64b0b4e..7c7fbda 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
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 ec4feb6..6472c21 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
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 fb93dcf..a0a0c11 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
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 3772046..2228280 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
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 e331aa2..1d931a4 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
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 afb6557..225a51f 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
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 3558eb6..b15f933 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
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 65d556e..c2e8815 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
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 2c1c845..c8611bc 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
#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 bf8bbe4..95b07c1 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
GLW_APICALL void GLW_APIENTRY glActiveShaderProgram (GLuint pipeline, GLuint program)
@@ -2253,6 +2253,12 @@
return (GLenum)0;
}
+GLW_APICALL GLenum GLW_APIENTRY glGetGraphicsResetStatusEXT (void)
+{
+
+ return (GLenum)0;
+}
+
GLW_APICALL void GLW_APIENTRY glGetInteger64i_v (GLenum target, GLuint index, GLint64 *data)
{
DE_UNREF(target);
@@ -3368,6 +3374,15 @@
}
+GLW_APICALL void GLW_APIENTRY glGetnUniformfvEXT (GLuint program, GLint location, GLsizei bufSize, GLfloat *params)
+{
+ DE_UNREF(program);
+ DE_UNREF(location);
+ DE_UNREF(bufSize);
+ DE_UNREF(params);
+
+}
+
GLW_APICALL void GLW_APIENTRY glGetnUniformiv (GLuint program, GLint location, GLsizei bufSize, GLint *params)
{
DE_UNREF(program);
@@ -3377,6 +3392,15 @@
}
+GLW_APICALL void GLW_APIENTRY glGetnUniformivEXT (GLuint program, GLint location, GLsizei bufSize, GLint *params)
+{
+ DE_UNREF(program);
+ DE_UNREF(location);
+ DE_UNREF(bufSize);
+ DE_UNREF(params);
+
+}
+
GLW_APICALL void GLW_APIENTRY glGetnUniformuiv (GLuint program, GLint location, GLsizei bufSize, GLuint *params)
{
DE_UNREF(program);
diff --git a/framework/platform/null/tcuNullRenderContextInitFuncs.inl b/framework/platform/null/tcuNullRenderContextInitFuncs.inl
index fe84c03..f02990a 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 967f96c92bae15baa1a4326a55222984befdc9ed.
+ * Generated from Khronos GL API description (gl.xml) revision db2965fc26513b254e2f964171f79e416a05fe29.
*/
gl->activeShaderProgram = glActiveShaderProgram;
gl->activeTexture = glActiveTexture;
@@ -268,6 +268,7 @@
gl->getFramebufferParameteriv = glGetFramebufferParameteriv;
gl->getFramebufferParameterivEXT = glGetFramebufferParameterivEXT;
gl->getGraphicsResetStatus = glGetGraphicsResetStatus;
+gl->getGraphicsResetStatusEXT = glGetGraphicsResetStatusEXT;
gl->getInteger64i_v = glGetInteger64i_v;
gl->getInteger64v = glGetInteger64v;
gl->getIntegeri_v = glGetIntegeri_v;
@@ -400,7 +401,9 @@
gl->getnTexImage = glGetnTexImage;
gl->getnUniformdv = glGetnUniformdv;
gl->getnUniformfv = glGetnUniformfv;
+gl->getnUniformfvEXT = glGetnUniformfvEXT;
gl->getnUniformiv = glGetnUniformiv;
+gl->getnUniformivEXT = glGetnUniformivEXT;
gl->getnUniformuiv = glGetnUniformuiv;
gl->hint = glHint;
gl->insertEventMarkerEXT = glInsertEventMarkerEXT;
diff --git a/modules/egl/teglGetProcAddressTests.inl b/modules/egl/teglGetProcAddressTests.inl
index acefb72..5f0cd81 100644
--- a/modules/egl/teglGetProcAddressTests.inl
+++ b/modules/egl/teglGetProcAddressTests.inl
@@ -1389,15 +1389,6 @@
"glDrawElementsInstancedNV",
};
-static const char* s_GL_NV_draw_vulkan_image[] =
-{
- "glDrawVkImageNV",
- "glGetVkProcAddrNV",
- "glWaitVkSemaphoreNV",
- "glSignalVkSemaphoreNV",
- "glSignalVkFenceNV",
-};
-
static const char* s_GL_NV_fragment_coverage_to_color[] =
{
"glFragmentCoverageColorNV",
@@ -1703,6 +1694,15 @@
"glFramebufferFoveationParametersQCOM",
};
+static const char* s_GL_NV_draw_vulkan_image[] =
+{
+ "glDrawVkImageNV",
+ "glGetVkProcAddrNV",
+ "glWaitVkSemaphoreNV",
+ "glSignalVkSemaphoreNV",
+ "glSignalVkFenceNV",
+};
+
static const struct
{
const char* name;
@@ -1834,7 +1834,6 @@
{ "GL_NV_coverage_sample", DE_LENGTH_OF_ARRAY(s_GL_NV_coverage_sample), s_GL_NV_coverage_sample },
{ "GL_NV_draw_buffers", DE_LENGTH_OF_ARRAY(s_GL_NV_draw_buffers), s_GL_NV_draw_buffers },
{ "GL_NV_draw_instanced", DE_LENGTH_OF_ARRAY(s_GL_NV_draw_instanced), s_GL_NV_draw_instanced },
- { "GL_NV_draw_vulkan_image", DE_LENGTH_OF_ARRAY(s_GL_NV_draw_vulkan_image), s_GL_NV_draw_vulkan_image },
{ "GL_NV_fragment_coverage_to_color", DE_LENGTH_OF_ARRAY(s_GL_NV_fragment_coverage_to_color), s_GL_NV_fragment_coverage_to_color },
{ "GL_NV_framebuffer_blit", DE_LENGTH_OF_ARRAY(s_GL_NV_framebuffer_blit), s_GL_NV_framebuffer_blit },
{ "GL_NV_framebuffer_mixed_samples", DE_LENGTH_OF_ARRAY(s_GL_NV_framebuffer_mixed_samples), s_GL_NV_framebuffer_mixed_samples },
@@ -1867,4 +1866,5 @@
{ "GL_OVR_multiview_multisampled_render_to_texture", DE_LENGTH_OF_ARRAY(s_GL_OVR_multiview_multisampled_render_to_texture), s_GL_OVR_multiview_multisampled_render_to_texture },
{ "GL_QCOM_alpha_test", DE_LENGTH_OF_ARRAY(s_GL_QCOM_alpha_test), s_GL_QCOM_alpha_test },
{ "GL_QCOM_framebuffer_foveated", DE_LENGTH_OF_ARRAY(s_GL_QCOM_framebuffer_foveated), s_GL_QCOM_framebuffer_foveated },
+ { "GL_NV_draw_vulkan_image", DE_LENGTH_OF_ARRAY(s_GL_NV_draw_vulkan_image), s_GL_NV_draw_vulkan_image },
};
diff --git a/scripts/opengl/src_util.py b/scripts/opengl/src_util.py
index d9bc04f..7e7183b 100644
--- a/scripts/opengl/src_util.py
+++ b/scripts/opengl/src_util.py
@@ -38,8 +38,8 @@
GL_SOURCE = khr_util.registry_cache.RegistrySource(
"https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry",
"xml/gl.xml",
- "967f96c92bae15baa1a4326a55222984befdc9ed",
- "f281f2dc6b2206a8852670d161e15fa43723dac5042a991ff4e1702e29d7403d")
+ "db2965fc26513b254e2f964171f79e416a05fe29",
+ "c4a4e241dc63ed3d1c4cd50451e5baef330dbb51dd3ecb278be80a5779f5b348")
EXTENSIONS = [
'GL_KHR_texture_compression_astc_ldr',