diff options
author | Mathias Agopian <mathias@google.com> | 2009-08-06 16:05:39 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2009-08-06 16:05:39 -0700 |
commit | 265d9c076a588cf4cd811fbafd999c7ffe36641b (patch) | |
tree | 8e4b8a390de2d36c8bd0e2a92d1907bdcbb99f04 /libs | |
parent | 25ec00fd13a6310d80a726cc9493a4b394056063 (diff) | |
download | frameworks_base-265d9c076a588cf4cd811fbafd999c7ffe36641b.zip frameworks_base-265d9c076a588cf4cd811fbafd999c7ffe36641b.tar.gz frameworks_base-265d9c076a588cf4cd811fbafd999c7ffe36641b.tar.bz2 |
added two EGL helpers for selecting a config matching a certain pixelformat or native window type
Diffstat (limited to 'libs')
-rw-r--r-- | libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp | 32 | ||||
-rw-r--r-- | libs/ui/Android.mk | 2 | ||||
-rw-r--r-- | libs/ui/EGLUtils.cpp | 104 |
3 files changed, 112 insertions, 26 deletions
diff --git a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp index f0615f0..002a3ab 100644 --- a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp +++ b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp @@ -26,6 +26,7 @@ #include <ui/PixelFormat.h> #include <ui/FramebufferNativeWindow.h> +#include <ui/EGLUtils.h> #include <GLES/gl.h> #include <EGL/egl.h> @@ -144,32 +145,11 @@ void DisplayHardware::init(uint32_t dpy) eglInitialize(display, NULL, NULL); eglGetConfigs(display, NULL, 0, &numConfigs); - // Get all the "potential match" configs... - EGLConfig* const configs = new EGLConfig[numConfigs]; - eglChooseConfig(display, attribs, configs, numConfigs, &n); - LOGE_IF(n<=0, "no EGLConfig available!"); - EGLConfig config = configs[0]; - if (n > 1) { - // if there is more than one candidate, go through the list - // and pick one that matches our framebuffer format - int fbSzA = fbFormatInfo.getSize(PixelFormatInfo::INDEX_ALPHA); - int fbSzR = fbFormatInfo.getSize(PixelFormatInfo::INDEX_RED); - int fbSzG = fbFormatInfo.getSize(PixelFormatInfo::INDEX_GREEN); - int fbSzB = fbFormatInfo.getSize(PixelFormatInfo::INDEX_BLUE); - for (int i=0 ; i<n ; i++) { - EGLint r,g,b,a; - eglGetConfigAttrib(display, configs[i], EGL_RED_SIZE, &r); - eglGetConfigAttrib(display, configs[i], EGL_GREEN_SIZE, &g); - eglGetConfigAttrib(display, configs[i], EGL_BLUE_SIZE, &b); - eglGetConfigAttrib(display, configs[i], EGL_ALPHA_SIZE, &a); - if (fbSzA == a && fbSzR == r && fbSzG == g && fbSzB == b) { - config = configs[i]; - break; - } - } - } - delete [] configs; - + EGLConfig config; + status_t err = EGLUtils::selectConfigForPixelFormat( + display, attribs, fbDev->format, &config); + LOGE_IF(err, "couldn't find an EGLConfig matching the screen format"); + /* * Gather EGL extensions */ diff --git a/libs/ui/Android.mk b/libs/ui/Android.mk index 49939ca..93c7263 100644 --- a/libs/ui/Android.mk +++ b/libs/ui/Android.mk @@ -5,6 +5,7 @@ LOCAL_SRC_FILES:= \ BufferMapper.cpp \ Camera.cpp \ CameraParameters.cpp \ + EGLUtils.cpp \ EventHub.cpp \ EventRecurrence.cpp \ FramebufferNativeWindow.cpp \ @@ -29,6 +30,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libcutils \ libutils \ + libEGL \ libbinder \ libpixelflinger \ libhardware \ diff --git a/libs/ui/EGLUtils.cpp b/libs/ui/EGLUtils.cpp new file mode 100644 index 0000000..9b2839d --- /dev/null +++ b/libs/ui/EGLUtils.cpp @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +#define LOG_TAG "EGLUtils" + +#include <utils/Errors.h> + +#include <ui/EGLUtils.h> + +#include <EGL/egl.h> + +#include <private/ui/android_natives_priv.h> + +// ---------------------------------------------------------------------------- +namespace android { +// ---------------------------------------------------------------------------- + +status_t EGLUtils::selectConfigForPixelFormat( + EGLDisplay dpy, + EGLint const* attrs, + PixelFormat format, + EGLConfig* outConfig) +{ + EGLint numConfigs = -1, n=0; + + 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; + + EGLConfig* const configs = (EGLConfig*)malloc(sizeof(EGLConfig)*numConfigs); + if (eglChooseConfig(dpy, attrs, configs, numConfigs, &n) == EGL_FALSE) { + 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); + + EGLConfig config = NULL; + for (int i=0 ; i<n ; i++) { + EGLint r,g,b,a; + eglGetConfigAttrib(dpy, configs[i], EGL_RED_SIZE, &r); + eglGetConfigAttrib(dpy, configs[i], EGL_GREEN_SIZE, &g); + eglGetConfigAttrib(dpy, configs[i], EGL_BLUE_SIZE, &b); + eglGetConfigAttrib(dpy, configs[i], EGL_ALPHA_SIZE, &a); + if (fbSzA == a && fbSzR == r && fbSzG == g && fbSzB == b) { + config = configs[i]; + break; + } + } + + free(configs); + + if (config) { + *outConfig = config; + return NO_ERROR; + } + + return NAME_NOT_FOUND; +} + +status_t EGLUtils::selectConfigForNativeWindow( + EGLDisplay dpy, + EGLint const* attrs, + EGLNativeWindowType window, + EGLConfig* outConfig) +{ + int err; + int format; + if ((err = window->query(window, NATIVE_WINDOW_FORMAT, &format)) < 0) { + return err; + } + + return selectConfigForPixelFormat(dpy, attrs, format, outConfig); +} + +// ---------------------------------------------------------------------------- +}; // namespace android +// ---------------------------------------------------------------------------- |