summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-10-26 12:23:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-26 12:23:46 -0700
commit324be170219987d643c1d05701a00cd358bc03e2 (patch)
treec63128e44b832ba78f37e4d1a4ba38b9967ed206 /opengl
parenteb1f2de6310df5a26eca658de5bac9e74d7a3ee9 (diff)
parentd9588e9c3cd5ffd6bcab28d41b6eda83a1d3d65a (diff)
downloadframeworks_base-324be170219987d643c1d05701a00cd358bc03e2.zip
frameworks_base-324be170219987d643c1d05701a00cd358bc03e2.tar.gz
frameworks_base-324be170219987d643c1d05701a00cd358bc03e2.tar.bz2
am d9588e9c: am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread
Diffstat (limited to 'opengl')
-rw-r--r--opengl/libagl/egl.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp
index e38b9cc..e44c485 100644
--- a/opengl/libagl/egl.cpp
+++ b/opengl/libagl/egl.cpp
@@ -833,6 +833,9 @@ struct config_management_t {
static bool mask(GLint reqValue, GLint confValue) {
return (confValue & reqValue) == reqValue;
}
+ static bool ignore(GLint reqValue, GLint confValue) {
+ return true;
+ }
};
// ----------------------------------------------------------------------------
@@ -1060,11 +1063,11 @@ static config_management_t const gConfigManagement[] = {
{ EGL_CONFIG_CAVEAT, config_management_t::exact },
{ EGL_CONFIG_ID, config_management_t::exact },
{ EGL_LEVEL, config_management_t::exact },
- { EGL_MAX_PBUFFER_HEIGHT, config_management_t::exact },
- { EGL_MAX_PBUFFER_PIXELS, config_management_t::exact },
- { EGL_MAX_PBUFFER_WIDTH, config_management_t::exact },
+ { EGL_MAX_PBUFFER_HEIGHT, config_management_t::ignore },
+ { EGL_MAX_PBUFFER_PIXELS, config_management_t::ignore },
+ { EGL_MAX_PBUFFER_WIDTH, config_management_t::ignore },
{ EGL_NATIVE_RENDERABLE, config_management_t::exact },
- { EGL_NATIVE_VISUAL_ID, config_management_t::exact },
+ { EGL_NATIVE_VISUAL_ID, config_management_t::ignore },
{ EGL_NATIVE_VISUAL_TYPE, config_management_t::exact },
{ EGL_SAMPLES, config_management_t::exact },
{ EGL_SAMPLE_BUFFERS, config_management_t::exact },