commit 5b49bb8316226b5614250ce0d09381d392691bdb
author Geoff Lang <geofflang@chromium.org> Mon Aug 31 18:48:50 2015 +0000
committer Geoff Lang <geofflang@chromium.org> Mon Aug 31 18:49:05 2015 +0000
tree 8277d3717bef8786d62c051cfcfc501b01f71a3e
parent 23a22c871a7d425574cecf31a04c6f74e241045c

Revert "Implement the instanced draw calls in RendererGL."

Causing crashes in some dEQP tests.

This reverts commit c1948415e52dbaefb0d3176b75a58a7b86bd091a.

Change-Id: Idedb32484b4f2b09090346bc4228fe536190a621
Reviewed-on: https://chromium-review.googlesource.com/296440
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/renderer/gl/FunctionsGL.cpp

diff --git a/src/libANGLE/renderer/gl/FunctionsGL.cpp b/src/libANGLE/renderer/gl/FunctionsGL.cpp
index d383d6f..9bc4603 100644
--- a/src/libANGLE/renderer/gl/FunctionsGL.cpp
+++ b/src/libANGLE/renderer/gl/FunctionsGL.cpp
@@ -71,6 +71,7 @@
     {
         if (std::find(extensions.begin(), extensions.end(), requiredExtension) == extensions.end())
         {
+            *outFunction = nullptr;
             return;
         }
     }
@@ -797,8 +798,6 @@
         profile = 0;
     }
 
-    // clang-format off
-
     // Load extensions
     // Even though extensions are written against specific versions of GL, many drivers expose the extensions
     // in even older versions.  Always try loading the extensions regardless of GL version.
@@ -881,17 +880,6 @@
     AssignGLExtensionEntryPoint(extensions, "GL_ARB_ES2_compatibility", loadProcAddress("glDepthRangef"), &depthRangef);
     AssignGLExtensionEntryPoint(extensions, "GL_ARB_ES2_compatibility", loadProcAddress("glClearDepthf"), &clearDepthf);
 
-    // GL_ARB_instanced_arrays
-    AssignGLExtensionEntryPoint(extensions, "GL_ARB_instanced_arrays", loadProcAddress("glVertexAttribDivisorARB"), &vertexAttribDivisor);
-
-    // GL_EXT_draw_instanced
-    AssignGLExtensionEntryPoint(extensions, "GL_EXT_draw_instanced", loadProcAddress("glDrawArraysInstancedEXT"), &drawArraysInstanced);
-    AssignGLExtensionEntryPoint(extensions, "GL_EXT_draw_instanced", loadProcAddress("glDrawElementsInstancedEXT"), &drawElementsInstanced);
-
-    // GL_ARB_draw_instanced
-    AssignGLExtensionEntryPoint(extensions, "GL_ARB_draw_instanced", loadProcAddress("glDrawArraysInstancedARB"), &drawArraysInstanced);
-    AssignGLExtensionEntryPoint(extensions, "GL_ARB_draw_instanced", loadProcAddress("glDrawElementsInstancedARB"), &drawElementsInstanced);
-
     // 1.0
     if (isAtLeastGL(gl::Version(1, 0)))
     {
@@ -1634,8 +1622,6 @@
         AssignGLEntryPoint(loadProcAddress("glVertexArrayVertexBuffer"), &vertexArrayVertexBuffer);
         AssignGLEntryPoint(loadProcAddress("glVertexArrayVertexBuffers"), &vertexArrayVertexBuffers);
     }
-
-    // clang-format on
 }
 
 bool FunctionsGL::isAtLeastGL(const gl::Version &glVersion) const