GL: Consolidate glGetString calls

src/libANGLE/renderer/gl/DisplayGL.cpp

@@ -99,4 +99,15 @@ egl::Error DisplayGL::makeCurrentSurfaceless(gl::Context *context)
     UNIMPLEMENTED();
     return egl::NoError();
 }
+
+std::string DisplayGL::getVendorString() const
+{
+    return GetVendorString(getRenderer()->getFunctions());
+}
+
+std::string DisplayGL::getVersionString() const
+{
+    return GetVersionString(getRenderer()->getFunctions());
+}
+
 }  // namespace rx

src/libANGLE/renderer/gl/DisplayGL.h

@@ -50,6 +50,11 @@ class DisplayGL : public DisplayImpl
 
     gl::Version getMaxConformantESVersion() const override;
 
+    virtual RendererGL *getRenderer() const = 0;
+
+    std::string getVendorString() const override;
+    std::string getVersionString() const override;
+
   protected:
     void generateExtensions(egl::DisplayExtensions *outExtensions) const override;
 

src/libANGLE/renderer/gl/RendererGL.cpp

@@ -255,7 +255,7 @@ void RendererGL::popDebugGroup() {}
 
 std::string RendererGL::getRendererDescription() const
 {
-    return std::string(reinterpret_cast<const char *>(mFunctions->getString(GL_RENDERER)));
+    return GetRendererString(mFunctions.get());
 }
 
 const gl::Version &RendererGL::getMaxSupportedESVersion() const

src/libANGLE/renderer/gl/cgl/DisplayCGL.h

@@ -84,9 +84,6 @@ class DisplayCGL : public DisplayGL
 
     DeviceImpl *createDevice() override;
 
-    std::string getVendorString() const override;
-    std::string getVersionString() const override;
-
     egl::Error waitClient(const gl::Context *context) override;
     egl::Error waitNative(const gl::Context *context, EGLint engine) override;
 
@@ -101,6 +98,8 @@ class DisplayCGL : public DisplayGL
 
     void populateFeatureList(angle::FeatureList *features) override;
 
+    RendererGL *getRenderer() const override;
+
     // Support for dual-GPU MacBook Pros. Used only by ContextCGL. The use of
     // these entry points is gated by the presence of dual GPUs.
     egl::Error referenceDiscreteGPU();

src/libANGLE/renderer/gl/cgl/DisplayCGL.mm

@@ -460,16 +460,6 @@ egl::Error DisplayCGL::validateClientBuffer(const egl::Config *configuration,
     return egl::NoError();
 }
 
-std::string DisplayCGL::getVendorString() const
-{
-    return GetVendorString(mRenderer->getFunctions());
-}
-
-std::string DisplayCGL::getVersionString() const
-{
-    return GetVersionString(mRenderer->getFunctions());
-}
-
 CGLContextObj DisplayCGL::getCGLContext() const
 {
     return mContext;
@@ -587,6 +577,11 @@ void DisplayCGL::populateFeatureList(angle::FeatureList *features)
     mRenderer->getFeatures().populateFeatureList(features);
 }
 
+RendererGL *DisplayCGL::getRenderer() const
+{
+    return mRenderer.get();
+}
+
 egl::Error DisplayCGL::referenceDiscreteGPU()
 {
     // Should have been rejected by validation if not supported.

src/libANGLE/renderer/gl/eagl/DisplayEAGL.h

@@ -73,9 +73,6 @@ class DisplayEAGL : public DisplayGL
 
     DeviceImpl *createDevice() override;
 
-    std::string getVendorString() const override;
-    std::string getVersionString() const override;
-
     egl::Error waitClient(const gl::Context *context) override;
     egl::Error waitNative(const gl::Context *context, EGLint engine) override;
 
@@ -89,6 +86,8 @@ class DisplayEAGL : public DisplayGL
 
     void populateFeatureList(angle::FeatureList *features) override;
 
+    RendererGL *getRenderer() const override;
+
   private:
     egl::Error makeCurrentSurfaceless(gl::Context *context) override;
 

src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm

@@ -294,16 +294,6 @@ egl::Error DisplayEAGL::validateClientBuffer(const egl::Config *configuration,
     return egl::NoError();
 }
 
-std::string DisplayEAGL::getVendorString() const
-{
-    return GetVendorString(mRenderer->getFunctions());
-}
-
-std::string DisplayEAGL::getVersionString() const
-{
-    return GetVersionString(mRenderer->getFunctions());
-}
-
 EAGLContextObj DisplayEAGL::getEAGLContext() const
 {
     return mContext;
@@ -410,6 +400,12 @@ void DisplayEAGL::populateFeatureList(angle::FeatureList *features)
 {
     mRenderer->getFeatures().populateFeatureList(features);
 }
+
+RendererGL *DisplayEAGL::getRenderer() const
+{
+    return mRenderer.get();
+}
+
 }
 
 #endif  // defined(ANGLE_ENABLE_EAGL)

src/libANGLE/renderer/gl/egl/DisplayEGL.cpp

@@ -133,16 +133,6 @@ EGLSyncImpl *DisplayEGL::createSync(const egl::AttributeMap &attribs)
     return new SyncEGL(attribs, mEGL);
 }
 
-std::string DisplayEGL::getVendorString() const
-{
-    return GetVendorString(mRenderer->getFunctions());
-}
-
-std::string DisplayEGL::getVersionString() const
-{
-    return GetVersionString(mRenderer->getFunctions());
-}
-
 egl::Error DisplayEGL::initializeContext(EGLContext shareContext,
                                          const egl::AttributeMap &eglAttributes,
                                          EGLContext *outContext,
@@ -782,6 +772,11 @@ void DisplayEGL::populateFeatureList(angle::FeatureList *features)
     mRenderer->getFeatures().populateFeatureList(features);
 }
 
+RendererGL *DisplayEGL::getRenderer() const
+{
+    return reinterpret_cast<RendererGL *>(mRenderer.get());
+}
+
 egl::Error DisplayEGL::validateImageClientBuffer(const gl::Context *context,
                                                  EGLenum target,
                                                  EGLClientBuffer clientBuffer,

src/libANGLE/renderer/gl/egl/DisplayEGL.h

@@ -37,9 +37,6 @@ class DisplayEGL : public DisplayGL
 
     EGLSyncImpl *createSync(const egl::AttributeMap &attribs) override;
 
-    std::string getVendorString() const override;
-    std::string getVersionString() const override;
-
     void setBlobCacheFuncs(EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get) override;
 
     virtual void destroyNativeContext(EGLContext context);
@@ -91,6 +88,8 @@ class DisplayEGL : public DisplayGL
 
     void populateFeatureList(angle::FeatureList *features) override;
 
+    RendererGL *getRenderer() const override;
+
     egl::Error validateImageClientBuffer(const gl::Context *context,
                                          EGLenum target,
                                          EGLClientBuffer clientBuffer,

src/libANGLE/renderer/gl/glx/DisplayGLX.cpp

@@ -787,16 +787,6 @@ bool DisplayGLX::isValidNativeWindow(EGLNativeWindowType window) const
     return status != 0;
 }
 
-std::string DisplayGLX::getVendorString() const
-{
-    return GetVendorString(mRenderer->getFunctions());
-}
-
-std::string DisplayGLX::getVersionString() const
-{
-    return GetVersionString(mRenderer->getFunctions());
-}
-
 egl::Error DisplayGLX::waitClient(const gl::Context *context)
 {
     mGLX.waitGL();
@@ -1084,4 +1074,9 @@ void DisplayGLX::populateFeatureList(angle::FeatureList *features)
     mRenderer->getFeatures().populateFeatureList(features);
 }
 
+RendererGL *DisplayGLX::getRenderer() const
+{
+    return mRenderer.get();
+}
+
 }  // namespace rx

src/libANGLE/renderer/gl/glx/DisplayGLX.h

@@ -70,9 +70,6 @@ class DisplayGLX : public DisplayGL
 
     bool isValidNativeWindow(EGLNativeWindowType window) const override;
 
-    std::string getVendorString() const override;
-    std::string getVersionString() const override;
-
     egl::Error waitClient(const gl::Context *context) override;
     egl::Error waitNative(const gl::Context *context, EGLint engine) override;
 
@@ -99,7 +96,7 @@ class DisplayGLX : public DisplayGL
 
     void populateFeatureList(angle::FeatureList *features) override;
 
-    RendererGL *getRenderer() const { return mRenderer.get(); }
+    RendererGL *getRenderer() const override;
 
   private:
     egl::Error initializeContext(glx::FBConfig config,

src/libANGLE/renderer/gl/renderergl_utils.cpp

@@ -2340,6 +2340,11 @@ std::vector<ContextCreationTry> GenerateContextCreationToTry(EGLint requestedTyp
     return contextsToTry;
 }
 
+std::string GetRendererString(const FunctionsGL *functions)
+{
+    return std::string(reinterpret_cast<const char *>(functions->getString(GL_RENDERER)));
+}
+
 std::string GetVendorString(const FunctionsGL *functions)
 {
     return std::string(reinterpret_cast<const char *>(functions->getString(GL_VENDOR)));

src/libANGLE/renderer/gl/renderergl_utils.h

@@ -165,6 +165,7 @@ struct ContextCreationTry
 
 std::vector<ContextCreationTry> GenerateContextCreationToTry(EGLint requestedType, bool isMesaGLX);
 
+std::string GetRendererString(const FunctionsGL *functions);
 std::string GetVendorString(const FunctionsGL *functions);
 std::string GetVersionString(const FunctionsGL *functions);
 

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

@@ -472,16 +472,6 @@ rx::ContextImpl *DisplayWGL::createContext(const gl::State &state,
     return new ContextWGL(state, errorSet, mRenderer);
 }
 
-std::string DisplayWGL::getVendorString() const
-{
-    return GetVendorString(mRenderer->getFunctions());
-}
-
-std::string DisplayWGL::getVersionString() const
-{
-    return GetVersionString(mRenderer->getFunctions());
-}
-
 egl::ConfigSet DisplayWGL::generateConfigs()
 {
     egl::ConfigSet configs;
@@ -1059,4 +1049,9 @@ void DisplayWGL::populateFeatureList(angle::FeatureList *features)
     mRenderer->getFeatures().populateFeatureList(features);
 }
 
+RendererGL *DisplayWGL::getRenderer() const
+{
+    return reinterpret_cast<RendererGL *>(mRenderer.get());
+}
+
 }  // namespace rx

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

@@ -63,9 +63,6 @@ class DisplayWGL : public DisplayGL
                                     EGLClientBuffer clientBuffer,
                                     const egl::AttributeMap &attribs) const override;
 
-    std::string getVendorString() const override;
-    std::string getVersionString() const override;
-
     egl::Error waitClient(const gl::Context *context) override;
     egl::Error waitNative(const gl::Context *context, EGLint engine) override;
 
@@ -89,6 +86,8 @@ class DisplayWGL : public DisplayGL
 
     void populateFeatureList(angle::FeatureList *features) override;
 
+    RendererGL *getRenderer() const override;
+
   private:
     egl::Error initializeImpl(egl::Display *display);
     void destroy();