commit 0c19ed89ee3e826447a7b72bf4bfcc8b66ac516e
author Nicolas Capens <capn@google.com> Wed Aug 12 17:21:06 2015 -0400
committer Nicolas Capens <capn@google.com> Thu Aug 20 14:15:24 2015 +0000
tree 31d7e6d6c32f5f5a81045285ab47657b7113a7dd
parent cf0e85b5ebc51b695c7d673047f84cbd2c7bfef9

Fix returning EGL_BAD_ATTRIBUTE on unknown EGL config attributes.

Bug 23017372

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

src/OpenGL/libEGL/Config.cpp

diff --git a/src/OpenGL/libEGL/Config.cpp b/src/OpenGL/libEGL/Config.cpp
index acabdce..31e98ad 100644
--- a/src/OpenGL/libEGL/Config.cpp
+++ b/src/OpenGL/libEGL/Config.cpp
@@ -355,8 +355,8 @@
 				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)

src/OpenGL/libEGL/libEGL.cpp

diff --git a/src/OpenGL/libEGL/libEGL.cpp b/src/OpenGL/libEGL/libEGL.cpp
index 2953d25..6363738 100644
--- a/src/OpenGL/libEGL/libEGL.cpp
+++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -240,7 +240,10 @@
 		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);

 }