commit c76dc21afe45f1d97b39f0adee1d2c95b4fa50ad
author Geoff Lang <geofflang@chromium.org> Fri May 22 15:21:48 2015 +0000
committer Geoff Lang <geofflang@chromium.org> Fri May 22 15:22:12 2015 +0000
tree ff4ccd8743b6917f953a1c177c1ade343ee4e497
parent 5ec636f67cb65438b71ca46375fa45e33eb2e4ba

Revert "Load texture storage extension entry points in RendererGL."

This reverts commit 5ec636f67cb65438b71ca46375fa45e33eb2e4ba.

Change-Id: I68b87279f08e558948216630259349e4db8481d7
Reviewed-on: https://chromium-review.googlesource.com/272785
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 95baebe..536572e 100644
--- a/src/libANGLE/renderer/gl/FunctionsGL.cpp
+++ b/src/libANGLE/renderer/gl/FunctionsGL.cpp
@@ -65,20 +65,12 @@
 }
 
 template <typename T>
-static void AssignGLExtensionEntryPoint(const std::vector<std::string> &extensions, const char *requiredExtensionString,
-                                        void *function, T *outFunction)
+static void AssignGLExtensionEntryPoint(const std::vector<std::string> &extensions, const std::string &extension, void *function, T *outFunction)
 {
-    std::vector<std::string> requiredExtensions = TokenizeExtensionsString(requiredExtensionString);
-    for (const std::string& requiredExtension : requiredExtensions)
+    if (std::find(extensions.begin(), extensions.end(), extension) != extensions.end())
     {
-        if (std::find(extensions.begin(), extensions.end(), requiredExtension) == extensions.end())
-        {
-            *outFunction = nullptr;
-            return;
-        }
+        *outFunction = reinterpret_cast<T>(function);
     }
-
-    *outFunction = reinterpret_cast<T>(function);
 }
 
 FunctionsGL::FunctionsGL()
@@ -895,13 +887,6 @@
         AssignGLExtensionEntryPoint(extensions, "GL_NV_fence", loadProcAddress("glGetFenceivNV"), &getFenceivNV);
         AssignGLExtensionEntryPoint(extensions, "GL_NV_fence", loadProcAddress("glFinishFenceNV"), &finishFenceNV);
         AssignGLExtensionEntryPoint(extensions, "GL_NV_fence", loadProcAddress("glSetFenceNV"), &setFenceNV);
-
-        AssignGLExtensionEntryPoint(extensions, "GL_EXT_texture_storage", loadProcAddress("glTexStorage1DEXT"), &texStorage1D);
-        AssignGLExtensionEntryPoint(extensions, "GL_EXT_texture_storage", loadProcAddress("glTexStorage2DEXT"), &texStorage2D);
-        AssignGLExtensionEntryPoint(extensions, "GL_EXT_texture_storage GL_EXT_texture3D", loadProcAddress("glTexStorage3DEXT"), &texStorage3D);
-        AssignGLExtensionEntryPoint(extensions, "GL_EXT_texture_storage GL_EXT_direct_state_access", loadProcAddress("glTextureStorage1DEXT"), &textureStorage1D);
-        AssignGLExtensionEntryPoint(extensions, "GL_EXT_texture_storage GL_EXT_direct_state_access", loadProcAddress("glTextureStorage2DEXT"), &textureStorage2D);
-        AssignGLExtensionEntryPoint(extensions, "GL_EXT_texture_storage GL_EXT_direct_state_access GL_EXT_texture3D", loadProcAddress("glTextureStorage3DEXT"), &textureStorage3D);
     }
 
     // 1.3