diff options
| author | Mathias Agopian <mathias@google.com> | 2010-10-26 12:19:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-26 12:19:43 -0700 |
| commit | d9588e9c3cd5ffd6bcab28d41b6eda83a1d3d65a (patch) | |
| tree | fc331b85ca1fb928474327b0d058ba2f338b2439 /opengl | |
| parent | f56aac4b6e169dc6e57aec6e94709e2425f34459 (diff) | |
| parent | a7b745ca75136112f369f249fd06c2edafe0a6f6 (diff) | |
| download | frameworks_base-d9588e9c3cd5ffd6bcab28d41b6eda83a1d3d65a.zip frameworks_base-d9588e9c3cd5ffd6bcab28d41b6eda83a1d3d65a.tar.gz frameworks_base-d9588e9c3cd5ffd6bcab28d41b6eda83a1d3d65a.tar.bz2 | |
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 1555801..5c09dcc 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 }, |