Factor GL extension parsing in renderergl_utils.cpp

src/libANGLE/renderer/gl/FunctionsGL.cpp

@@ -40,20 +40,6 @@ static void GetGLVersion(PFNGLGETSTRINGPROC getStringFunction, GLuint *outMajorV
     }
 }
 
-static std::vector<std::string> GetNonIndexedExtensions(PFNGLGETSTRINGPROC getStringFunction)
-{
-    std::vector<std::string> result;
-
-    std::istringstream stream(reinterpret_cast<const char*>(getStringFunction(GL_EXTENSIONS)));
-    std::string extension;
-    while (std::getline(stream, extension, ' '))
-    {
-        result.push_back(extension);
-    }
-
-    return result;
-}
-
 static std::vector<std::string> GetIndexedExtensions(PFNGLGETINTEGERVPROC getIntegerFunction, PFNGLGETSTRINGIPROC getStringIFunction)
 {
     std::vector<std::string> result;
@@ -792,7 +778,8 @@ void FunctionsGL::initialize()
     }
     else
     {
-        extensions = GetNonIndexedExtensions(getString);
+        const char *exts = reinterpret_cast<const char*>(getString(GL_EXTENSIONS));
+        extensions = TokenizeExtensionsString(exts);
     }
 
     // 1.0

src/libANGLE/renderer/gl/renderergl_utils.cpp

@@ -17,6 +17,7 @@
 #include "libANGLE/renderer/gl/formatutilsgl.h"
 
 #include <algorithm>
+#include <sstream>
 
 namespace rx
 {
@@ -160,4 +161,18 @@ void GenerateCaps(const FunctionsGL *functions, gl::Caps *caps, gl::TextureCapsM
 
 }
 
+std::vector<std::string> TokenizeExtensionsString(const char *extensions)
+{
+    std::vector<std::string> result;
+
+    std::istringstream stream(extensions);
+    std::string extension;
+    while (std::getline(stream, extension, ' '))
+    {
+        result.push_back(extension);
+    }
+
+    return result;
+}
+
 }

src/libANGLE/renderer/gl/renderergl_utils.h

@@ -12,6 +12,7 @@
 
 #include "libANGLE/renderer/gl/functionsgl_typedefs.h"
 
+#include <string>
 #include <vector>
 
 namespace gl
@@ -30,9 +31,9 @@ namespace nativegl_gl
 
 void GenerateCaps(const FunctionsGL *functions, gl::Caps *caps, gl::TextureCapsMap *textureCapsMap,
                   gl::Extensions *extensions);
-
 }
 
+std::vector<std::string> TokenizeExtensionsString(const char *extensions);
 }
 
 #endif // LIBANGLE_RENDERER_GL_RENDERERGLUTILS_H_