Revert "GL: Cache the results of glGetString"

This reverts commit 27906e9c. Reason for revert: Causes failures in mac_optional_gpu_tests_rel Original change's description: > GL: Cache the results of glGetString > > To reduce the amount of queries to the driver, we can cache the > results of glGetString. On Mac, we need to invalidate this cache > on GPU switch. > > Bug: chromium:1173672 > Change-Id: I039172068aec35034a87881a8804f52c080ce4ce > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2676882 > Commit-Queue: Jonah Ryan-Davis <jonahr@google.com> > Reviewed-by: Jamie Madill <jmadill@chromium.org> > Reviewed-by: Geoff Lang <geofflang@chromium.org> TBR=geofflang@chromium.org,jonahr@google.com,jmadill@chromium.org Change-Id: I5799c5d287dd01b946446bd66d4c89aef6756d3a Bug: chromium:1173672 Bug: angleproject:5639 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2690145Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Revert "GL: Cache the results of glGetString"
e281fbb0 · Shahbaz Youssefi · Commit Bot · 62d4b9be · e281fbb0 · e281fbb0
Commit e281fbb0 authored Feb 11, 2021 by Shahbaz Youssefi Committed by Commit Bot Feb 11, 2021
Showing with 4 additions and 33 deletions

DisplayGL.cpp src/libANGLE/renderer/gl/DisplayGL.cpp +4 -25

DisplayGL.h src/libANGLE/renderer/gl/DisplayGL.h +0 -6

DisplayCGL.mm src/libANGLE/renderer/gl/cgl/DisplayCGL.mm +0 -2

No files found.
--- a/src/libANGLE/renderer/gl/DisplayGL.cpp
+++ b/src/libANGLE/renderer/gl/DisplayGL.cpp
@@ -22,9 +22,7 @@
 namespace rx
 {

-DisplayGL::DisplayGL(const egl::DisplayState &state)
-    : DisplayImpl(state), mRendererDescription(""), mVendorString(""), mVersionString("")
-{}
+DisplayGL::DisplayGL(const egl::DisplayState &state) : DisplayImpl(state) {}

 DisplayGL::~DisplayGL() {}

@@ -104,36 +102,17 @@ egl::Error DisplayGL::makeCurrentSurfaceless(gl::Context *context)

 std::string DisplayGL::getRendererDescription()
 {
-    if (mRendererDescription.empty())
-    {
-        mRendererDescription = GetRendererString(getRenderer()->getFunctions());
-    }
-    return mRendererDescription;
+    return GetRendererString(getRenderer()->getFunctions());
 }

 std::string DisplayGL::getVendorString()
 {
-    if (mVendorString.empty())
-    {
-        mVendorString = GetVendorString(getRenderer()->getFunctions());
-    }
-    return mVendorString;
+    return GetVendorString(getRenderer()->getFunctions());
 }

 std::string DisplayGL::getVersionString()
 {
-    if (mVersionString.empty())
-    {
-        mVersionString = GetVersionString(getRenderer()->getFunctions());
-    }
-    return mVersionString;
-}
-
-void DisplayGL::resetCachedGLStrings()
-{
-    mRendererDescription = "";
-    mVendorString        = "";
-    mVersionString       = "";
+    return GetVersionString(getRenderer()->getFunctions());
 }

 }  // namespace rx
--- a/src/libANGLE/renderer/gl/DisplayGL.h
+++ b/src/libANGLE/renderer/gl/DisplayGL.h
@@ -56,17 +56,11 @@ class DisplayGL : public DisplayImpl
    std::string getVendorString() override;
    std::string getVersionString() override;

-    void resetCachedGLStrings();
-
  protected:
    void generateExtensions(egl::DisplayExtensions *outExtensions) const override;

  private:
    virtual egl::Error makeCurrentSurfaceless(gl::Context *context);
-
-    std::string mRendererDescription;
-    std::string mVendorString;
-    std::string mVersionString;
 };

 }  // namespace rx

--- a/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm
+++ b/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm
@@ -658,8 +658,6 @@ egl::Error DisplayCGL::handleGPUSwitch()
            CGLSetCurrentContext(mContext);
            onStateChange(angle::SubjectMessage::SubjectChanged);
            mCurrentGPUID = gpuID;
-            // Dirty the cache of the GL strings because we are on a new driver
-            resetCachedGLStrings();
        }
    }