diff options
| author | Mathias Agopian <mathias@google.com> | 2011-01-19 11:31:07 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-19 11:31:07 -0800 |
| commit | a0bafb471385767f7c9c91efe7fd828b069b2e97 (patch) | |
| tree | 4ced35c9a056a6437885548a82fe9847bac13aaa /libs | |
| parent | e9a00235c102d198a702bc665b2ea5b5e8c4bc07 (diff) | |
| parent | 22a666a80b67b199188805b63ffc01a3e044b3ef (diff) | |
| download | frameworks_base-a0bafb471385767f7c9c91efe7fd828b069b2e97.zip frameworks_base-a0bafb471385767f7c9c91efe7fd828b069b2e97.tar.gz frameworks_base-a0bafb471385767f7c9c91efe7fd828b069b2e97.tar.bz2 | |
Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into gingerbread
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ui/EGLUtils.cpp | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/libs/ui/EGLUtils.cpp b/libs/ui/EGLUtils.cpp index 1663313..f24a71d 100644 --- a/libs/ui/EGLUtils.cpp +++ b/libs/ui/EGLUtils.cpp @@ -66,12 +66,6 @@ status_t EGLUtils::selectConfigForPixelFormat( if (outConfig == NULL) return BAD_VALUE; - int err; - PixelFormatInfo fbFormatInfo; - if ((err = getPixelFormatInfo(PixelFormat(format), &fbFormatInfo)) < 0) { - return err; - } - // Get all the "potential match" configs... if (eglGetConfigs(dpy, NULL, 0, &numConfigs) == EGL_FALSE) return BAD_VALUE; @@ -81,23 +75,14 @@ status_t EGLUtils::selectConfigForPixelFormat( free(configs); return BAD_VALUE; } - - const int fbSzA = fbFormatInfo.getSize(PixelFormatInfo::INDEX_ALPHA); - const int fbSzR = fbFormatInfo.getSize(PixelFormatInfo::INDEX_RED); - const int fbSzG = fbFormatInfo.getSize(PixelFormatInfo::INDEX_GREEN); - const int fbSzB = fbFormatInfo.getSize(PixelFormatInfo::INDEX_BLUE); int i; EGLConfig config = NULL; for (i=0 ; i<n ; i++) { - EGLint r,g,b,a; - EGLConfig curr = configs[i]; - eglGetConfigAttrib(dpy, curr, EGL_RED_SIZE, &r); - eglGetConfigAttrib(dpy, curr, EGL_GREEN_SIZE, &g); - eglGetConfigAttrib(dpy, curr, EGL_BLUE_SIZE, &b); - eglGetConfigAttrib(dpy, curr, EGL_ALPHA_SIZE, &a); - if (fbSzA == a && fbSzR == r && fbSzG == g && fbSzB == b) { - config = curr; + EGLint nativeVisualId = 0; + eglGetConfigAttrib(dpy, configs[i], EGL_NATIVE_VISUAL_ID, &nativeVisualId); + if (nativeVisualId>0 && format == nativeVisualId) { + config = configs[i]; break; } } |