Merge vk-gl-cts/opengl-es-cts-3.2.2 into vk-gl-cts/master
Change-Id: I039aa2432d455394b254e0556a1ab63f02fba35a
diff --git a/framework/opengl/wrapper/glwInitExtGL.inl b/framework/opengl/wrapper/glwInitExtGL.inl
index bbef560..58f6de6 100644
--- a/framework/opengl/wrapper/glwInitExtGL.inl
+++ b/framework/opengl/wrapper/glwInitExtGL.inl
@@ -324,6 +324,12 @@
gl->getQueryIndexediv = (glGetQueryIndexedivFunc) loader->get("glGetQueryIndexediv");
}
+if (de::contains(extSet, "GL_ARB_transform_feedback_instanced"))
+{
+ gl->drawTransformFeedbackInstanced = (glDrawTransformFeedbackInstancedFunc) loader->get("glDrawTransformFeedbackInstanced");
+ gl->drawTransformFeedbackStreamInstanced = (glDrawTransformFeedbackStreamInstancedFunc) loader->get("glDrawTransformFeedbackStreamInstanced");
+}
+
if (de::contains(extSet, "GL_ARB_vertex_attrib_64bit"))
{
gl->getVertexAttribLdv = (glGetVertexAttribLdvFunc) loader->get("glGetVertexAttribLdv");
diff --git a/scripts/opengl/src_util.py b/scripts/opengl/src_util.py
index 638c53e..90bc672 100644
--- a/scripts/opengl/src_util.py
+++ b/scripts/opengl/src_util.py
@@ -108,6 +108,7 @@
'GL_ARB_texture_view',
'GL_ARB_transform_feedback2',
'GL_ARB_transform_feedback3',
+ 'GL_ARB_transform_feedback_instanced',
'GL_ARB_transform_feedback_overflow_query',
'GL_ARB_vertex_array_bgra',
'GL_ARB_vertex_attrib_64bit',