Prefer KHR entrypoints instead of EXT for robustness tests

When resolving function entrypoints, framework resolves EXT
entrypoints after KHR to the same pointers. There are drivers that
implement only KHR entrypoints, prefer KHR over EXT so that KHR
entrypoints will be the ones used if both extensions are supported
by the driver.

Components: OpenGL ES
VK-GL-CTS issue: 1107

Affects:
KHR-NoContext.es32.robustness.getnuniform
KHR-NoContext.es32.robustness.readnpixels

Change-Id: Iec5f7cbdd53061e105b3445f7613ee41fccc4553
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>

diff --git a/framework/opengl/wrapper/glwInitExtES.inl b/framework/opengl/wrapper/glwInitExtES.inl
index ad7e564aeb397022f227d00fb31fdf0f89ea2111..66a52b7982bdf0521d503fd8c78037e5f61060e3 100644 (file)
--- a/framework/opengl/wrapper/glwInitExtES.inl
+++ b/framework/opengl/wrapper/glwInitExtES.inl
@@ -24,6 +24,14 @@ if (de::contains(extSet, "GL_KHR_debug"))
        gl->pushDebugGroup                      = (glPushDebugGroupFunc)                loader->get("glPushDebugGroupKHR");
 }
 
+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");
+}
+
 if (de::contains(extSet, "GL_KHR_robustness"))
 {
        gl->getGraphicsResetStatus      = (glGetGraphicsResetStatusFunc)        loader->get("glGetGraphicsResetStatusKHR");
@@ -48,14 +56,6 @@ if (de::contains(extSet, "GL_EXT_geometry_shader"))
        gl->framebufferTexture  = (glFramebufferTextureFunc)    loader->get("glFramebufferTextureEXT");
 }
 
-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");
-}
-
 if (de::contains(extSet, "GL_EXT_texture_buffer"))
 {
        gl->texBuffer           = (glTexBufferFunc)                     loader->get("glTexBufferEXT");

diff --git a/scripts/opengl/src_util.py b/scripts/opengl/src_util.py
index 96ae3415423f71293c5403cfa475014cbf084960..e474eb2eb6dd12c926bbfb1dd4e99abb37605d58 100644 (file)
--- a/scripts/opengl/src_util.py
+++ b/scripts/opengl/src_util.py
@@ -46,6 +46,7 @@ EXTENSIONS                    = [
        'GL_KHR_blend_equation_advanced',
        'GL_KHR_blend_equation_advanced_coherent',
        'GL_KHR_debug',
+       'GL_EXT_robustness',
        'GL_KHR_robustness',
        'GL_KHR_no_error',
        'GL_KHR_parallel_shader_compile',
@@ -53,7 +54,6 @@ EXTENSIONS                    = [
        'GL_EXT_geometry_point_size',
        'GL_EXT_tessellation_shader',
        'GL_EXT_geometry_shader',
-       'GL_EXT_robustness',
        'GL_EXT_texture_buffer',
        'GL_EXT_texture_filter_anisotropic',
        'GL_EXT_texture_cube_map_array',