Return EGL_BAD_ATTRIBUTE for unsupported HAL formats.

As prescribed by the EGL_ANDROID_image_native_buffer extension spec. Change-Id: Id4213e245d055971bd687f484dbc5efa7958adda Reviewed-on: https://swiftshader-review.googlesource.com/4518Tested-by: Nicolas Capens <capn@google.com> Reviewed-by: Greg Hartman <ghartman@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Return EGL_BAD_ATTRIBUTE for unsupported HAL formats.
b65c82ea · Nicolas Capens · c0fb8a07 · b65c82ea · b65c82ea
Commit b65c82ea authored Jan 05, 2016 by Nicolas Capens
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 33 deletions

Image.hpp src/OpenGL/common/Image.hpp +14 -32

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

No files found.
--- a/src/OpenGL/common/Image.hpp
+++ b/src/OpenGL/common/Image.hpp
@@ -174,46 +174,28 @@ inline GLenum GLPixelFormatFromAndroid(int halFormat)
 {
 	switch(halFormat)
 	{
-	case HAL_PIXEL_FORMAT_RGBA_8888:
-		return GL_RGBA;
-	case HAL_PIXEL_FORMAT_RGBX_8888:
-		return GL_RGB;
-	case HAL_PIXEL_FORMAT_RGB_888:
-		ALOGE("%s badness unsupported format HAL_PIXEL_FORMAT_RGB_888", __FUNCTION__);
-		return GL_RGB;
-	case HAL_PIXEL_FORMAT_BGRA_8888:
-		return GL_BGRA_EXT;
-	case HAL_PIXEL_FORMAT_RGB_565:
-		return GL_RGB565;
-	case HAL_PIXEL_FORMAT_YV12:
-		return SW_YV12_BT601;
-	default:
-		ALOGE("%s badness unsupported HAL format=%x", __FUNCTION__, halFormat);
+	case HAL_PIXEL_FORMAT_RGBA_8888: return GL_RGBA;
+	case HAL_PIXEL_FORMAT_RGBX_8888: return GL_RGB;
+	case HAL_PIXEL_FORMAT_RGB_888:   return GL_NONE;   // Unsupported
+	case HAL_PIXEL_FORMAT_BGRA_8888: return GL_BGRA_EXT;
+	case HAL_PIXEL_FORMAT_RGB_565:   return GL_RGB565;
+	case HAL_PIXEL_FORMAT_YV12:      return SW_YV12_BT601;
+	default:                         return GL_NONE;
 	}
-
-	return GL_RGBA;
 }

 inline GLenum GLPixelTypeFromAndroid(int halFormat)
 {
 	switch(halFormat)
 	{
-	case HAL_PIXEL_FORMAT_RGBA_8888:
-	case HAL_PIXEL_FORMAT_RGBX_8888:
-	case HAL_PIXEL_FORMAT_BGRA_8888:
-		return GL_UNSIGNED_BYTE;
-	case HAL_PIXEL_FORMAT_RGB_565:
-		return GL_UNSIGNED_SHORT_5_6_5;
-	case HAL_PIXEL_FORMAT_YV12:
-		return GL_UNSIGNED_BYTE;
-	case HAL_PIXEL_FORMAT_RGB_888:
-		ALOGE("%s badness unsupported format HAL_PIXEL_FORMAT_RGB_888", __FUNCTION__);
-		return GL_UNSIGNED_BYTE;
-	default:
-		ALOGE("%s badness unsupported HAL format=%x", __FUNCTION__, halFormat);
+	case HAL_PIXEL_FORMAT_RGBA_8888: return GL_UNSIGNED_BYTE;
+	case HAL_PIXEL_FORMAT_RGBX_8888: return GL_UNSIGNED_BYTE;
+	case HAL_PIXEL_FORMAT_RGB_888:   return GL_NONE;   // Unsupported
+	case HAL_PIXEL_FORMAT_BGRA_8888: return GL_UNSIGNED_BYTE;
+	case HAL_PIXEL_FORMAT_RGB_565:   return GL_UNSIGNED_SHORT_5_6_5;
+	case HAL_PIXEL_FORMAT_YV12:      return GL_UNSIGNED_BYTE;
+	default:                         return GL_NONE;
 	}
-
-	return GL_UNSIGNED_BYTE;
 }

 class AndroidNativeImage : public egl::Image

--- a/src/OpenGL/libEGL/libEGL.cpp
+++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -896,7 +896,15 @@ EGLImageKHR CreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLCl
 	#if defined(__ANDROID__)
 		if(target == EGL_NATIVE_BUFFER_ANDROID)
 		{
-			return new AndroidNativeImage(reinterpret_cast<ANativeWindowBuffer*>(buffer));
+			ANativeWindowBuffer *nativeBuffer = reinterpret_cast<ANativeWindowBuffer*>(buffer);
+
+			if(!nativeBuffer || GLPixelFormatFromAndroid(nativeBuffer->format) == GL_NONE)
+			{
+				ALOGW("%s badness unsupported HAL format=%x", __FUNCTION__, nativeBuffer ? nativeBuffer->format : 0);
+				return error(EGL_BAD_ATTRIBUTE, EGL_NO_IMAGE_KHR);
+			}
+
+			return new AndroidNativeImage(nativeBuffer);
 		}
 	#endif