Remove const qualifier from generateConfigs

src/libANGLE/renderer/DisplayImpl.h

@@ -52,7 +52,7 @@ class DisplayImpl : public EGLImplFactory
 
     virtual egl::Error makeCurrent(egl::Surface *drawSurface, egl::Surface *readSurface, gl::Context *context) = 0;
 
-    virtual egl::ConfigSet generateConfigs() const = 0;
+    virtual egl::ConfigSet generateConfigs() = 0;
 
     virtual bool isDeviceLost() const = 0;
     virtual bool testDeviceLost() = 0;

src/libANGLE/renderer/d3d/DisplayD3D.cpp

@@ -241,7 +241,7 @@ void DisplayD3D::terminate()
     SafeDelete(mRenderer);
 }
 
-egl::ConfigSet DisplayD3D::generateConfigs() const
+egl::ConfigSet DisplayD3D::generateConfigs()
 {
     ASSERT(mRenderer != nullptr);
     return mRenderer->generateConfigs();

src/libANGLE/renderer/d3d/DisplayD3D.h

@@ -53,7 +53,7 @@ class DisplayD3D : public DisplayImpl
 
     egl::Error makeCurrent(egl::Surface *drawSurface, egl::Surface *readSurface, gl::Context *context) override;
 
-    egl::ConfigSet generateConfigs() const override;
+    egl::ConfigSet generateConfigs() override;
 
     bool isDeviceLost() const override;
     bool testDeviceLost() override;

src/libANGLE/renderer/d3d/RendererD3D.h

@@ -106,7 +106,7 @@ class RendererD3D : public BufferFactoryD3D
 
     virtual egl::Error initialize() = 0;
 
-    virtual egl::ConfigSet generateConfigs() const = 0;
+    virtual egl::ConfigSet generateConfigs() = 0;
     virtual void generateDisplayExtensions(egl::DisplayExtensions *outExtensions) const = 0;
 
     virtual ContextImpl *createContext(const gl::ContextState &state) = 0;

src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp

@@ -916,7 +916,7 @@ void Renderer11::populateRenderer11DeviceCaps()
     SafeRelease(dxgiAdapter2);
 }
 
-egl::ConfigSet Renderer11::generateConfigs() const
+egl::ConfigSet Renderer11::generateConfigs()
 {
     std::vector<GLenum> colorBufferFormats;
 

src/libANGLE/renderer/d3d/d3d11/Renderer11.h

@@ -107,7 +107,7 @@ class Renderer11 : public RendererD3D
     egl::Error initialize() override;
     virtual bool resetDevice();
 
-    egl::ConfigSet generateConfigs() const override;
+    egl::ConfigSet generateConfigs() override;
     void generateDisplayExtensions(egl::DisplayExtensions *outExtensions) const override;
 
     ContextImpl *createContext(const gl::ContextState &state) override;

src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp

@@ -397,7 +397,7 @@ D3DPRESENT_PARAMETERS Renderer9::getDefaultPresentParameters()
     return presentParameters;
 }
 
-egl::ConfigSet Renderer9::generateConfigs() const
+egl::ConfigSet Renderer9::generateConfigs()
 {
     static const GLenum colorBufferFormats[] =
     {

src/libANGLE/renderer/d3d/d3d9/Renderer9.h

@@ -71,7 +71,7 @@ class Renderer9 : public RendererD3D
     egl::Error initialize() override;
     virtual bool resetDevice();
 
-    egl::ConfigSet generateConfigs() const override;
+    egl::ConfigSet generateConfigs() override;
     void generateDisplayExtensions(egl::DisplayExtensions *outExtensions) const override;
 
     void startScene();

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

@@ -42,7 +42,7 @@ class DisplayCGL : public DisplayGL
                                      NativePixmapType nativePixmap,
                                      const egl::AttributeMap &attribs) override;
 
-    egl::ConfigSet generateConfigs() const override;
+    egl::ConfigSet generateConfigs() override;
 
     bool isDeviceLost() const override;
     bool testDeviceLost() override;

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

@@ -150,7 +150,7 @@ egl::Error DisplayCGL::getDevice(DeviceImpl **device)
     return egl::Error(EGL_BAD_DISPLAY);
 }
 
-egl::ConfigSet DisplayCGL::generateConfigs() const
+egl::ConfigSet DisplayCGL::generateConfigs()
 {
     // TODO(cwallez): generate more config permutations
     egl::ConfigSet configs;

src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp

@@ -923,7 +923,7 @@ EGLContext DisplayOzone::initializeContext(EGLConfig config, const egl::Attribut
     return EGL_NO_CONTEXT;
 }
 
-egl::ConfigSet DisplayOzone::generateConfigs() const
+egl::ConfigSet DisplayOzone::generateConfigs()
 {
     egl::ConfigSet configs;
 

src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.h

@@ -125,7 +125,7 @@ class DisplayOzone final : public DisplayGL
                                      NativePixmapType nativePixmap,
                                      const egl::AttributeMap &attribs) override;
 
-    egl::ConfigSet generateConfigs() const override;
+    egl::ConfigSet generateConfigs() override;
 
     bool isDeviceLost() const override;
     bool testDeviceLost() override;

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

@@ -550,7 +550,7 @@ egl::Error DisplayGLX::initializeContext(glx::FBConfig config,
     return egl::Error(EGL_NOT_INITIALIZED, "Could not create a backing OpenGL context.");
 }
 
-egl::ConfigSet DisplayGLX::generateConfigs() const
+egl::ConfigSet DisplayGLX::generateConfigs()
 {
     egl::ConfigSet configs;
     configIdToGLXConfig.clear();

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

@@ -60,7 +60,7 @@ class DisplayGLX : public DisplayGL
                                      NativePixmapType nativePixmap,
                                      const egl::AttributeMap &attribs) override;
 
-    egl::ConfigSet generateConfigs() const override;
+    egl::ConfigSet generateConfigs() override;
 
     bool isDeviceLost() const override;
     bool testDeviceLost() override;
@@ -113,8 +113,7 @@ class DisplayGLX : public DisplayGL
 
     FunctionsGL *mFunctionsGL;
 
-    //TODO(cwallez) yuck, change generateConfigs to be non-const or add a userdata member to egl::Config?
-    mutable std::map<int, glx::FBConfig> configIdToGLXConfig;
+    std::map<int, glx::FBConfig> configIdToGLXConfig;
 
     EGLint mRequestedVisual;
     glx::FBConfig mContextConfig;

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

@@ -466,7 +466,7 @@ egl::Error DisplayWGL::getDevice(DeviceImpl **device)
     return egl::Error(EGL_BAD_DISPLAY);
 }
 
-egl::ConfigSet DisplayWGL::generateConfigs() const
+egl::ConfigSet DisplayWGL::generateConfigs()
 {
     egl::ConfigSet configs;
 

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

@@ -44,7 +44,7 @@ class DisplayWGL : public DisplayGL
                                      NativePixmapType nativePixmap,
                                      const egl::AttributeMap &attribs) override;
 
-    egl::ConfigSet generateConfigs() const override;
+    egl::ConfigSet generateConfigs() override;
 
     bool isDeviceLost() const override;
     bool testDeviceLost() override;

src/libANGLE/renderer/vulkan/DisplayVk.cpp

@@ -41,7 +41,7 @@ egl::Error DisplayVk::makeCurrent(egl::Surface *drawSurface,
     return egl::Error(EGL_BAD_ACCESS);
 }
 
-egl::ConfigSet DisplayVk::generateConfigs() const
+egl::ConfigSet DisplayVk::generateConfigs()
 {
     UNIMPLEMENTED();
     return egl::ConfigSet();

src/libANGLE/renderer/vulkan/DisplayVk.h

@@ -28,7 +28,7 @@ class DisplayVk : public DisplayImpl
                            egl::Surface *readSurface,
                            gl::Context *context) override;
 
-    egl::ConfigSet generateConfigs() const override;
+    egl::ConfigSet generateConfigs() override;
 
     bool isDeviceLost() const override;
     bool testDeviceLost() override;