Fix scanForWantedComponents not ignoring attribute values of 0.

Slightly refactor scanForWantedComponents to not iterate over every attribute and only check the needed ones. BUG=angleproject:2069 Change-Id: I77bab7764552093f79472809aad3594be351831a Reviewed-on: https://chromium-review.googlesource.com/537132 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Fix scanForWantedComponents not ignoring attribute values of 0.
2648d929 · Geoff Lang · Commit Bot · 165dcf15 · 2648d929
Commit 2648d929 authored Jun 15, 2017 by Geoff Lang Committed by Commit Bot Jun 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 17 deletions

Config.cpp src/libANGLE/Config.cpp +12 -17

No files found.
--- a/src/libANGLE/Config.cpp
+++ b/src/libANGLE/Config.cpp
@@ -165,27 +165,22 @@ class ConfigSorter
    }
  private:
-    void scanForWantedComponents(const AttributeMap &attributeMap)
+    static bool wantsComponent(const AttributeMap &attributeMap, EGLAttrib component)
    {
        // [EGL 1.5] section 3.4.1.2 page 30
        // Sorting rule #3: by larger total number of color bits, not considering
        // components that are 0 or don't-care.
-        for (auto attribIter = attributeMap.begin(); attribIter != attributeMap.end(); attribIter++)
+        EGLAttrib value = attributeMap.get(component, 0);
-        {
+        return value != 0 && value != EGL_DONT_CARE;
-            EGLAttrib attributeKey   = attribIter->first;
+    }
-            EGLAttrib attributeValue = attribIter->second;
-            if (attributeKey != 0 && attributeValue != EGL_DONT_CARE)
+    void scanForWantedComponents(const AttributeMap &attributeMap)
-            {
+    {
-                switch (attributeKey)
+        mWantRed       = wantsComponent(attributeMap, EGL_RED_SIZE);
-                {
+        mWantGreen     = wantsComponent(attributeMap, EGL_GREEN_SIZE);
-                case EGL_RED_SIZE:       mWantRed = true; break;
+        mWantBlue      = wantsComponent(attributeMap, EGL_BLUE_SIZE);
-                case EGL_GREEN_SIZE:     mWantGreen = true; break;
+        mWantAlpha     = wantsComponent(attributeMap, EGL_ALPHA_SIZE);
-                case EGL_BLUE_SIZE:      mWantBlue = true; break;
+        mWantLuminance = wantsComponent(attributeMap, EGL_LUMINANCE_SIZE);
-                case EGL_ALPHA_SIZE:     mWantAlpha = true; break;
-                case EGL_LUMINANCE_SIZE: mWantLuminance = true; break;
-                }
-            }
-        }
    }
    EGLint wantedComponentsSize(const Config &config) const