Store WGL extensions in FunctionsWGL.

src/libANGLE/renderer/gl/wgl/FunctionsWGL.cpp

@@ -8,6 +8,8 @@
 
 #include "libANGLE/renderer/gl/wgl/FunctionsWGL.h"
 
+#include "common/string_utils.h"
+
 namespace rx
 {
 
@@ -30,12 +32,15 @@ static void GetWGLProcAddress(HMODULE glModule, PFNWGLGETPROCADDRESSPROC getProc
 }
 
 template <typename T>
-static void GetWGLExtensionProcAddress(HMODULE glModule, PFNWGLGETPROCADDRESSPROC getProcAddressWGL,
-                                       const std::string &extensions, const std::string &extensionName,
-                                       const std::string &procName, T *outProcAddress)
+static void GetWGLExtensionProcAddress(HMODULE glModule,
+                                       PFNWGLGETPROCADDRESSPROC getProcAddressWGL,
+                                       const std::vector<std::string> &extensions,
+                                       const std::string &extensionName,
+                                       const std::string &procName,
+                                       T *outProcAddress)
 {
     T proc = nullptr;
-    if (extensions.find(extensionName) != std::string::npos)
+    if (std::find(extensions.begin(), extensions.end(), extensionName) != extensions.end())
     {
         GetWGLProcAddress(glModule, getProcAddressWGL, procName, &proc);
     }
@@ -112,15 +117,16 @@ void FunctionsWGL::initialize(HMODULE glModule, HDC context)
     GetWGLProcAddress(glModule, getProcAddress, "wglGetExtensionsStringEXT", &getExtensionStringEXT);
     GetWGLProcAddress(glModule, getProcAddress, "wglGetExtensionsStringARB", &getExtensionStringARB);
 
-    std::string extensions = "";
+    std::string extensionString = "";
     if (getExtensionStringEXT)
     {
-        extensions = getExtensionStringEXT();
+        extensionString = getExtensionStringEXT();
     }
     else if (getExtensionStringARB && context)
     {
-        extensions = getExtensionStringARB(context);
+        extensionString = getExtensionStringARB(context);
     }
+    angle::SplitStringAlongWhitespace(extensionString, &extensions);
 
     // Load the wgl extension functions by checking if the context supports the extension first
 
@@ -148,4 +154,8 @@ void FunctionsWGL::initialize(HMODULE glModule, HDC context)
     GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_render_texture", "wglSetPbufferAttribARB", &setPbufferAttribARB);
 }
 
+bool FunctionsWGL::hasExtension(const std::string &ext) const
+{
+    return std::find(extensions.begin(), extensions.end(), ext) != extensions.end();
+}
 }

src/libANGLE/renderer/gl/wgl/FunctionsWGL.h

@@ -20,6 +20,10 @@ class FunctionsWGL : angle::NonCopyable
     // Loads all available wgl functions, may be called multiple times
     void initialize(HMODULE glModule, HDC context);
 
+    // Extension information
+    std::vector<std::string> extensions;
+    bool hasExtension(const std::string &ext) const;
+
     // Base WGL functions
     PFNWGLCOPYCONTEXTPROC copyContext;
     PFNWGLCREATECONTEXTPROC createContext;