Fix returning EGL_BAD_ATTRIBUTE on unknown EGL config attributes.

Bug 23017372 Change-Id: Ie29ca3f67c79b0cb707dda216c256723d3721f28 Reviewed-on: https://swiftshader-review.googlesource.com/3861Reviewed-by: Ping-Hao Wu <pinghao@google.com> Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>

Fix returning EGL_BAD_ATTRIBUTE on unknown EGL config attributes.
0c19ed89 · Nicolas Capens · cf0e85b5 · 0c19ed89 · 0c19ed89
Commit 0c19ed89 authored Aug 12, 2015 by Nicolas Capens
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

Config.cpp src/OpenGL/libEGL/Config.cpp +2 -2

libEGL.cpp src/OpenGL/libEGL/libEGL.cpp +4 -1

No files found.
--- a/src/OpenGL/libEGL/Config.cpp
+++ b/src/OpenGL/libEGL/Config.cpp
@@ -355,8 +355,8 @@ bool ConfigSet::getConfigs(EGLConfig *configs, const EGLint *attribList, EGLint 
 				case EGL_RECORDABLE_ANDROID:         match = true; /* UNIMPLEMENTED(); EGL_ANDROID_recordable */       break;
 				case EGL_FRAMEBUFFER_TARGET_ANDROID: match = true; /* UNIMPLEMENTED(); EGL_ANDROID_framebuffer_target */ break;
 				default:
-					UNIMPLEMENTED();
-					match = false;
+					*numConfig = 0;
+					return false;
 				}

 				if(!match)

--- a/src/OpenGL/libEGL/libEGL.cpp
+++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -240,7 +240,10 @@ EGLBoolean ChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *co
 		attrib_list = attribList;
 	}

-	display->getConfigs(configs, attrib_list, config_size, num_config);
+	if(!display->getConfigs(configs, attrib_list, config_size, num_config))
+	{
+		return error(EGL_BAD_ATTRIBUTE, EGL_FALSE);
+	}

 	return success(EGL_TRUE);
 }