Skip to content

A
angle
Commit c76dc21a by Geoff Lang
Options

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

This reverts commit 5ec636f6. Change-Id: I68b87279f08e558948216630259349e4db8481d7 Reviewed-on: https://chromium-review.googlesource.com/272785Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 5ec636f6
Showing with 3 additions and 18 deletions
src/libANGLE/renderer/gl/FunctionsGL.cpp
...@@ -65,20 +65,12 @@ static void AssignGLEntryPoint(void *function, T *outFunction) ...@@ -65,20 +65,12 @@ static void AssignGLEntryPoint(void *function, T *outFunction)
} }
template <typename T> template <typename T>
static void AssignGLExtensionEntryPoint(const std::vector<std::string> &extensions, const char *requiredExtensionString, static void AssignGLExtensionEntryPoint(const std::vector<std::string> &extensions, const std::string &extension, void *function, T *outFunction)
void *function, T *outFunction)
{ {
std::vector<std::string> requiredExtensions = TokenizeExtensionsString(requiredExtensionString); if (std::find(extensions.begin(), extensions.end(), extension) != extensions.end())
for (const std::string& requiredExtension : requiredExtensions)
{ {
if (std::find(extensions.begin(), extensions.end(), requiredExtension) == extensions.end()) *outFunction = reinterpret_cast<T>(function);
{
*outFunction = nullptr;
return;
}
} }
*outFunction = reinterpret_cast<T>(function);
} }
FunctionsGL::FunctionsGL() FunctionsGL::FunctionsGL()
...@@ -895,13 +887,6 @@ void FunctionsGL::initialize() ...@@ -895,13 +887,6 @@ void FunctionsGL::initialize()
AssignGLExtensionEntryPoint(extensions, "GL_NV_fence", loadProcAddress("glGetFenceivNV"), &getFenceivNV); AssignGLExtensionEntryPoint(extensions, "GL_NV_fence", loadProcAddress("glGetFenceivNV"), &getFenceivNV);
AssignGLExtensionEntryPoint(extensions, "GL_NV_fence", loadProcAddress("glFinishFenceNV"), &finishFenceNV); AssignGLExtensionEntryPoint(extensions, "GL_NV_fence", loadProcAddress("glFinishFenceNV"), &finishFenceNV);
AssignGLExtensionEntryPoint(extensions, "GL_NV_fence", loadProcAddress("glSetFenceNV"), &setFenceNV); 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 // 1.3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment