eglChooseConfig must return filtered size when configs is NULL.

TRAC #12234 Signed-off-by: Shannon Woods Signed-off-by: Daniel Koch Author: Andrew Lewycky git-svn-id: https://angleproject.googlecode.com/svn/trunk@275 736b8ea6-26fd-11df-bfd4-992fa37f6226

eglChooseConfig must return filtered size when configs is NULL.
6a94b97d · daniel@transgaming.com · 7e0ed77c · 6a94b97d
Commit 6a94b97d authored May 13, 2010 by daniel@transgaming.com
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Config.cpp src/libEGL/Config.cpp +3 -3

No files found.
--- a/src/libEGL/Config.cpp
+++ b/src/libEGL/Config.cpp
@@ -314,8 +314,6 @@ size_t ConfigSet::size() const

 bool ConfigSet::getConfigs(EGLConfig *configs, const EGLint *attribList, EGLint configSize, EGLint *numConfig)
 {
-    if (configs)
-    {
    vector<const Config*> passed;
    passed.reserve(mSet.size());

@@ -375,6 +373,8 @@ bool ConfigSet::getConfigs(EGLConfig *configs, const EGLint *attribList, EGLint 
        }
    }

+    if (configs)
+    {
        sort(passed.begin(), passed.end(), SortConfig(attribList));

        EGLint index;
@@ -387,7 +387,7 @@ bool ConfigSet::getConfigs(EGLConfig *configs, const EGLint *attribList, EGLint 
    }
    else
    {
-        *numConfig = (EGLint)mSet.size();
+        *numConfig = passed.size();
    }

    return true;