diff options
| author | Mathias Agopian <mathias@google.com> | 2010-10-26 12:18:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-26 12:18:07 -0700 |
| commit | a7b745ca75136112f369f249fd06c2edafe0a6f6 (patch) | |
| tree | 838379172d20c272b75bb9435ca568bd149deb12 | |
| parent | d8cf2125c10466078bed73efa1cdc34f48ff1729 (diff) | |
| parent | d8e350bc96c3f170d3016989b249174e65c1a661 (diff) | |
| download | frameworks_base-a7b745ca75136112f369f249fd06c2edafe0a6f6.zip frameworks_base-a7b745ca75136112f369f249fd06c2edafe0a6f6.tar.gz frameworks_base-a7b745ca75136112f369f249fd06c2edafe0a6f6.tar.bz2 | |
Merge "fix eglChooseConfig() for special attributes." into gingerbread
| -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 ba33e17..662a1fa 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 }, |