commit e76163e3cae02cc63d586fbf15c918c717ff54e2
author Nicolas Capens <capn@google.com> Wed Apr 18 14:46:17 2018 -0400
committer Nicolas Capens <nicolascapens@google.com> Thu May 03 19:08:57 2018 +0000
tree d2ea8f42c956f3ab158dd6da3e1eff4eb819bdc5
parent ce8eb945ca823a50eca9bb0d7b32c31e4c20a477

Skip ignored EGL config attributes.

The EGL 1.4 spec description of eglChooseConfig states:
"If EGL_MAX_PBUFFER_WIDTH, EGL_MAX_PBUFFER_HEIGHT, EGL_MAX_PBUFFER_-
PIXELS, or EGL_NATIVE_VISUAL_ID are specified in attrib_list, then they
are ignored"

Change-Id: I9ec90eff692f9759aa54a0a10f1e57f2c244db7f
Reviewed-on: https://swiftshader-review.googlesource.com/18608
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/OpenGL/libEGL/Config.cpp

diff --git a/src/OpenGL/libEGL/Config.cpp b/src/OpenGL/libEGL/Config.cpp
index d7fb273..66f4260 100644
--- a/src/OpenGL/libEGL/Config.cpp
+++ b/src/OpenGL/libEGL/Config.cpp
@@ -367,7 +367,6 @@
 				case EGL_CONFIG_ID:                  match = config->mConfigID == attribute[1];                             break;
 				case EGL_LEVEL:                      match = config->mLevel >= attribute[1];                                break;
 				case EGL_NATIVE_RENDERABLE:          match = config->mNativeRenderable == (EGLBoolean)attribute[1];         break;
-				case EGL_NATIVE_VISUAL_ID:           match = config->mNativeVisualID == attribute[1];                       break;
 				case EGL_NATIVE_VISUAL_TYPE:         match = config->mNativeVisualType == attribute[1];                     break;
 				case EGL_SAMPLES:                    match = config->mSamples >= attribute[1];                              break;
 				case EGL_SAMPLE_BUFFERS:             match = config->mSampleBuffers >= attribute[1];                        break;
@@ -386,11 +385,16 @@
 				case EGL_RENDERABLE_TYPE:            match = (config->mRenderableType & attribute[1]) == attribute[1];      break;
 				case EGL_MATCH_NATIVE_PIXMAP:        match = false; UNIMPLEMENTED();                                        break;
 				case EGL_CONFORMANT:                 match = (config->mConformant & attribute[1]) == attribute[1];          break;
-				case EGL_MAX_PBUFFER_WIDTH:          match = config->mMaxPBufferWidth >= attribute[1];                      break;
-				case EGL_MAX_PBUFFER_HEIGHT:         match = config->mMaxPBufferHeight >= attribute[1];                     break;
-				case EGL_MAX_PBUFFER_PIXELS:         match = config->mMaxPBufferPixels >= attribute[1];                     break;
 				case EGL_RECORDABLE_ANDROID:         match = config->mRecordableAndroid == (EGLBoolean)attribute[1];        break;
 				case EGL_FRAMEBUFFER_TARGET_ANDROID: match = config->mFramebufferTargetAndroid == (EGLBoolean)attribute[1]; break;
+
+				// Ignored attributes
+				case EGL_MAX_PBUFFER_WIDTH:
+				case EGL_MAX_PBUFFER_HEIGHT:
+				case EGL_MAX_PBUFFER_PIXELS:
+				case EGL_NATIVE_VISUAL_ID:
+					break;
+
 				default:
 					*numConfig = 0;
 					return false;