Give sorted configs a unique ID without changing the original set

src/libEGL/Config.cpp

@@ -296,17 +296,6 @@ void ConfigSet::add(D3DDISPLAYMODE displayMode, EGLint minSwapInterval, EGLint m
     mSet.insert(config);
 }
 
-void ConfigSet::enumerate()
-{
-    EGLint index = 1;
-
-    for (Iterator config = mSet.begin(); config != mSet.end(); config++)
-    {
-        config->mConfigID = index;
-        index++;
-    }
-}
-
 size_t ConfigSet::size() const
 {
     return mSet.size();

src/libEGL/Config.h

@@ -21,6 +21,8 @@
 
 namespace egl
 {
+class Display;
+
 class Config
 {
   public:
@@ -92,22 +94,23 @@ class SortConfig
 
 class ConfigSet
 {
+    friend Display;
+
   public:
     ConfigSet();
 
     void add(D3DDISPLAYMODE displayMode, EGLint minSwapInterval, EGLint maxSwapInterval, D3DFORMAT renderTargetFormat, D3DFORMAT depthStencilFormat, EGLint multiSample);
-    void enumerate();
     size_t size() const;
     bool getConfigs(EGLConfig *configs, const EGLint *attribList, EGLint configSize, EGLint *numConfig);
     const egl::Config *get(EGLConfig configHandle);
 
+  private:
+    DISALLOW_COPY_AND_ASSIGN(ConfigSet);
+
     typedef std::set<Config, SortConfig> Set;
     typedef Set::iterator Iterator;
     Set mSet;
 
-  private:
-    DISALLOW_COPY_AND_ASSIGN(ConfigSet);
-
     static const EGLint mSortAttribs[];
 };
 }

src/libEGL/Display.cpp

@@ -103,6 +103,8 @@ bool Display::initialize()
             D3DDISPLAYMODE currentDisplayMode;
             mD3d9->GetAdapterDisplayMode(mAdapter, &currentDisplayMode);
 
+            ConfigSet configSet;
+
             for (int formatIndex = 0; formatIndex < sizeof(renderTargetFormats) / sizeof(D3DFORMAT); formatIndex++)
             {
                 D3DFORMAT renderTargetFormat = renderTargetFormats[formatIndex];
@@ -124,15 +126,24 @@ bool Display::initialize()
                             {
                                 // FIXME: Enumerate multi-sampling
 
-                                mConfigSet.add(currentDisplayMode, mMinSwapInterval, mMaxSwapInterval, renderTargetFormat, depthStencilFormat, 0);
-                            }
+                                configSet.add(currentDisplayMode, mMinSwapInterval, mMaxSwapInterval, renderTargetFormat, depthStencilFormat, 0);
                             }
                         }
                     }
                 }
             }
 
-        mConfigSet.enumerate();
+            // Give the sorted configs a unique ID and store them internally
+            EGLint index = 1;
+            for (ConfigSet::Iterator config = configSet.mSet.begin(); config != configSet.mSet.end(); config++)
+            {
+                Config configuration = *config;
+                configuration.mConfigID = index;
+                index++;
+
+                mConfigSet.mSet.insert(configuration);
+            }
+        }
     }
 
     if (!isInitialized())