From 25ec00fd13a6310d80a726cc9493a4b394056063 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Thu, 6 Aug 2009 16:04:29 -0700 Subject: added NATIVE_WINDOW_FORMAT attribute to android_native_window_t --- include/ui/egl/android_natives.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/ui') diff --git a/include/ui/egl/android_natives.h b/include/ui/egl/android_natives.h index a3a1316fa504..7da69b144a49 100644 --- a/include/ui/egl/android_natives.h +++ b/include/ui/egl/android_natives.h @@ -63,7 +63,8 @@ struct android_native_base_t /* attributes queriable with query() */ enum { NATIVE_WINDOW_WIDTH = 0, - NATIVE_WINDOW_HEIGHT = 1 + NATIVE_WINDOW_HEIGHT = 1, + NATIVE_WINDOW_FORMAT = 2, }; struct android_native_window_t -- cgit v1.2.3-59-g8ed1b From 265d9c076a588cf4cd811fbafd999c7ffe36641b Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Thu, 6 Aug 2009 16:05:39 -0700 Subject: added two EGL helpers for selecting a config matching a certain pixelformat or native window type --- include/ui/EGLUtils.h | 51 ++++++++++ .../DisplayHardware/DisplayHardware.cpp | 32 ++----- libs/ui/Android.mk | 2 + libs/ui/EGLUtils.cpp | 104 +++++++++++++++++++++ opengl/tests/swapinterval/swapinterval.cpp | 42 +++------ 5 files changed, 174 insertions(+), 57 deletions(-) create mode 100644 include/ui/EGLUtils.h create mode 100644 libs/ui/EGLUtils.cpp (limited to 'include/ui') diff --git a/include/ui/EGLUtils.h b/include/ui/EGLUtils.h new file mode 100644 index 000000000000..48777b6f8635 --- /dev/null +++ b/include/ui/EGLUtils.h @@ -0,0 +1,51 @@ +/* + * 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. + */ + + +#ifndef ANDROID_UI_EGLUTILS_H +#define ANDROID_UI_EGLUTILS_H + +#include +#include +#include + + +// ---------------------------------------------------------------------------- +namespace android { +// ---------------------------------------------------------------------------- + +class EGLUtils +{ +public: + + static status_t selectConfigForPixelFormat( + EGLDisplay dpy, + EGLint const* attrs, + PixelFormat format, + EGLConfig* outConfig); + + static status_t selectConfigForNativeWindow( + EGLDisplay dpy, + EGLint const* attrs, + EGLNativeWindowType window, + EGLConfig* outConfig); +}; + +// ---------------------------------------------------------------------------- +}; // namespace android +// ---------------------------------------------------------------------------- + +#endif /* ANDROID_UI_EGLUTILS_H */ diff --git a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp index f0615f0bd906..002a3ab7e780 100644 --- a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp +++ b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -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 ; iformat, &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 49939ca6950c..93c7263502bc 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 000000000000..9b2839d25282 --- /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 + +#include + +#include + +#include + +// ---------------------------------------------------------------------------- +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 ; iquery(window, NATIVE_WINDOW_FORMAT, &format)) < 0) { + return err; + } + + return selectConfigForPixelFormat(dpy, attrs, format, outConfig); +} + +// ---------------------------------------------------------------------------- +}; // namespace android +// ---------------------------------------------------------------------------- diff --git a/opengl/tests/swapinterval/swapinterval.cpp b/opengl/tests/swapinterval/swapinterval.cpp index f51d882a5ae3..cf908a0d97f7 100644 --- a/opengl/tests/swapinterval/swapinterval.cpp +++ b/opengl/tests/swapinterval/swapinterval.cpp @@ -26,6 +26,7 @@ #include #include +#include using namespace android; @@ -36,48 +37,27 @@ int main(int argc, char** argv) EGL_NONE }; - EGLint numConfigs = -1, n=0; EGLint majorVersion; EGLint minorVersion; - EGLConfig config; EGLContext context; + EGLConfig config; EGLSurface surface; EGLint w, h; - EGLDisplay dpy; dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY); eglInitialize(dpy, &majorVersion, &minorVersion); + + EGLNativeWindowType window = android_createDisplaySurface(); - // Get all the "potential match" configs... - eglGetConfigs(dpy, NULL, 0, &numConfigs); - EGLConfig* const configs = (EGLConfig*)malloc(sizeof(EGLConfig)*numConfigs); - eglChooseConfig(dpy, configAttribs, configs, numConfigs, &n); - 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 = 0; // should not hardcode - int fbSzR = 5; // should not hardcode - int fbSzG = 6; // should not hardcode - int fbSzB = 5; // should not hardcode - int i; - for (i=0 ; i