Commit 8fda73af by Greg Hartman

Improve log messages on unsupported formats

Change-Id: Idb24d792f8a50ca9a560a8a2d7b23e1053afaf5e Reviewed-on: https://swiftshader-review.googlesource.com/3118Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarGreg Hartman <ghartman@google.com>
parent 03382453
...@@ -27,7 +27,8 @@ GLenum getColorFormatFromAndroid(int format) ...@@ -27,7 +27,8 @@ GLenum getColorFormatFromAndroid(int format)
if (GrallocModule::getInstance()->supportsConversion()) { if (GrallocModule::getInstance()->supportsConversion()) {
return GL_RGB565_OES; return GL_RGB565_OES;
} else { } else {
UNIMPLEMENTED(); ALOGE("%s badness converting gralloc not supported for RGB_565",
__FUNCTION__);
return GL_RGB565_OES; return GL_RGB565_OES;
} }
#else #else
...@@ -41,7 +42,7 @@ GLenum getColorFormatFromAndroid(int format) ...@@ -41,7 +42,7 @@ GLenum getColorFormatFromAndroid(int format)
case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED: case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:
case HAL_PIXEL_FORMAT_YCbCr_420_888: case HAL_PIXEL_FORMAT_YCbCr_420_888:
default: default:
UNIMPLEMENTED(); ALOGE("%s badness unsupported format=%x", __FUNCTION__, format);
} }
return GL_RGBA; return GL_RGBA;
} }
...@@ -61,7 +62,8 @@ GLenum getPixelFormatFromAndroid(int format) ...@@ -61,7 +62,8 @@ GLenum getPixelFormatFromAndroid(int format)
if (GrallocModule::getInstance()->supportsConversion()) { if (GrallocModule::getInstance()->supportsConversion()) {
return GL_UNSIGNED_SHORT_5_6_5; return GL_UNSIGNED_SHORT_5_6_5;
} else { } else {
UNIMPLEMENTED(); ALOGE("%s badness converting gralloc not supported for RGB_565",
__FUNCTION__);
return GL_UNSIGNED_SHORT_5_6_5; return GL_UNSIGNED_SHORT_5_6_5;
} }
#else #else
...@@ -75,7 +77,7 @@ GLenum getPixelFormatFromAndroid(int format) ...@@ -75,7 +77,7 @@ GLenum getPixelFormatFromAndroid(int format)
case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED: case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:
case HAL_PIXEL_FORMAT_YCbCr_420_888: case HAL_PIXEL_FORMAT_YCbCr_420_888:
default: default:
UNIMPLEMENTED(); ALOGE("%s badness unsupported format=%x", __FUNCTION__, format);
} }
return GL_UNSIGNED_BYTE; return GL_UNSIGNED_BYTE;
} }
...@@ -85,20 +87,22 @@ GLenum isSupportedAndroidBuffer(GLuint name) ...@@ -85,20 +87,22 @@ GLenum isSupportedAndroidBuffer(GLuint name)
{ {
ANativeWindowBuffer *nativeBuffer = reinterpret_cast<ANativeWindowBuffer*>(name); ANativeWindowBuffer *nativeBuffer = reinterpret_cast<ANativeWindowBuffer*>(name);
if(!name) if (!name)
{ {
ALOGE("%s called with name==NULL %s:%d", __FUNCTION__, __FILE__, __LINE__); ALOGE("badness %s called with name==NULL %s:%d", __FUNCTION__, __FILE__, __LINE__);
return EGL_BAD_PARAMETER; return EGL_BAD_PARAMETER;
} }
if(nativeBuffer->common.magic != ANDROID_NATIVE_BUFFER_MAGIC) if (nativeBuffer->common.magic != ANDROID_NATIVE_BUFFER_MAGIC)
{ {
ALOGE("%s: failed: bad magic", __FUNCTION__); ALOGE("badness %s failed: bad magic=%x, expected=%x",
__FUNCTION__, nativeBuffer->common.magic, ANDROID_NATIVE_BUFFER_MAGIC);
return EGL_BAD_PARAMETER; return EGL_BAD_PARAMETER;
} }
if(nativeBuffer->common.version != sizeof(ANativeWindowBuffer)) if (nativeBuffer->common.version != sizeof(ANativeWindowBuffer))
{ {
ALOGE("%s: failed: bad size", __FUNCTION__ ); ALOGE("badness %s failed: bad size=%d, expected=%d",
__FUNCTION__, nativeBuffer->common.version, sizeof(ANativeWindowBuffer));
return EGL_BAD_PARAMETER; return EGL_BAD_PARAMETER;
} }
...@@ -112,14 +116,14 @@ GLenum isSupportedAndroidBuffer(GLuint name) ...@@ -112,14 +116,14 @@ GLenum isSupportedAndroidBuffer(GLuint name)
if (GrallocModule::getInstance()->supportsConversion()) { if (GrallocModule::getInstance()->supportsConversion()) {
return EGL_SUCCESS; return EGL_SUCCESS;
} else { } else {
ALOGE("%s: failed: bad format", __FUNCTION__ ); ALOGE("badness %s failed: conversion not supported", __FUNCTION__ );
return EGL_BAD_PARAMETER; return EGL_BAD_PARAMETER;
} }
#else #else
return EGL_SUCCESS; return EGL_SUCCESS;
#endif #endif
default: default:
ALOGE("%s: failed: bad format", __FUNCTION__ ); ALOGE("badness %s failed: bad format=%x", __FUNCTION__, nativeBuffer->format);
return EGL_BAD_PARAMETER; return EGL_BAD_PARAMETER;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment