Merge vk-gl-cts/vulkan-cts-1.2.2 into vk-gl-cts/vulkan-cts-1.2.3

Change-Id: I866350c03d9b27e87b39653aef4415f326e2510a

diff --git a/framework/opengl/wrapper/glwInitExtES.inl b/framework/opengl/wrapper/glwInitExtES.inl
index b5ad2bb..26962da 100644 (file)
--- a/framework/opengl/wrapper/glwInitExtES.inl
+++ b/framework/opengl/wrapper/glwInitExtES.inl
@@ -122,7 +122,7 @@ if (de::contains(extSet, "GL_EXT_texture_border_clamp"))
 if (de::contains(extSet, "GL_EXT_multisampled_render_to_texture"))
 {
        gl->framebufferTexture2DMultisampleEXT  = (glFramebufferTexture2DMultisampleEXTFunc)    loader->get("glFramebufferTexture2DMultisampleEXT");
-       gl->renderbufferStorageMultisample              = (glRenderbufferStorageMultisampleFunc)                loader->get("glRenderbufferStorageMultisampleEXT");
+       gl->renderbufferStorageMultisampleEXT   = (glRenderbufferStorageMultisampleEXTFunc)             loader->get("glRenderbufferStorageMultisampleEXT");
 }
 
 if (de::contains(extSet, "GL_EXT_debug_marker"))

diff --git a/scripts/opengl/gen_ext_init.py b/scripts/opengl/gen_ext_init.py
index 321707e..db91765 100644 (file)
--- a/scripts/opengl/gen_ext_init.py
+++ b/scripts/opengl/gen_ext_init.py
@@ -53,7 +53,7 @@ def genExtensions (registry, iface, api):
                yield "{"
 
                def genInit (command):
-                       ifaceName = command.alias.name if command.alias else command.name
+                       ifaceName = command.alias.name if command.alias and command.name not in ALIASING_EXCEPTIONS else command.name
                        return "gl->%s\t= (%s)\tloader->get(\"%s\");" % (
                                getFunctionMemberName(ifaceName),
                                getFunctionTypeName(ifaceName),