diff options
author | Mathias Agopian <mathias@google.com> | 2010-10-26 12:23:46 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-26 12:23:46 -0700 |
commit | 698346ed5951f1172c1a71a68299b244e9d9b01e (patch) | |
tree | 546380c7715dfdcfec57a4876ec4cef34f5a3779 /opengl | |
parent | 22c8778e7a707b652d24c85211caed42f77c7024 (diff) | |
parent | 3e98e385109f838fc7798e1b4280e5ce005bc31a (diff) | |
download | frameworks_native-698346ed5951f1172c1a71a68299b244e9d9b01e.zip frameworks_native-698346ed5951f1172c1a71a68299b244e9d9b01e.tar.gz frameworks_native-698346ed5951f1172c1a71a68299b244e9d9b01e.tar.bz2 |
am d9588e9c: am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread
Diffstat (limited to 'opengl')
-rw-r--r-- | opengl/libagl/egl.cpp | 11 |
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 }, |