Log use of RGB_888, which is currently not supported natively.

Change-Id: Ia1c7bf07e296c4f12334061f1a8b6ba695fea937 Reviewed-on: https://swiftshader-review.googlesource.com/4035Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>

Log use of RGB_888, which is currently not supported natively.
68f86947 · Nicolas Capens · b40a2568 · 68f86947
Commit 68f86947 authored Jan 05, 2016 by Nicolas Capens
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

Image.hpp src/OpenGL/common/Image.hpp +6 -3

No files found.
--- a/src/OpenGL/common/Image.hpp
+++ b/src/OpenGL/common/Image.hpp
@@ -170,7 +170,7 @@ protected:

 #ifdef __ANDROID__

-static GLenum GLPixelFormatFromAndroid(int halFormat)
+inline GLenum GLPixelFormatFromAndroid(int halFormat)
 {
 	switch(halFormat)
 	{
@@ -179,6 +179,7 @@ static GLenum GLPixelFormatFromAndroid(int halFormat)
 	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;
@@ -193,19 +194,21 @@ static GLenum GLPixelFormatFromAndroid(int halFormat)
 	return GL_RGBA;
 }

-static GLenum GLPixelTypeFromAndroid(int halFormat)
+inline GLenum GLPixelTypeFromAndroid(int halFormat)
 {
 	switch(halFormat)
 	{
 	case HAL_PIXEL_FORMAT_RGBA_8888:
 	case HAL_PIXEL_FORMAT_RGBX_8888:
-	case HAL_PIXEL_FORMAT_RGB_888:
 	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);
 	}