diff options
| author | Mathias Agopian <mathias@google.com> | 2013-07-26 14:49:50 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2013-07-26 15:43:33 -0700 |
| commit | c2414bb0989763641ca57cf72c11ef6d86565a23 (patch) | |
| tree | 241ef0d78bc4fccaa73167f64a79e9ab33d94cf4 /opengl | |
| parent | dd533712f8dd21c0dadfd5ce8a0ad85aa3e96ada (diff) | |
| download | frameworks_native-c2414bb0989763641ca57cf72c11ef6d86565a23.zip frameworks_native-c2414bb0989763641ca57cf72c11ef6d86565a23.tar.gz frameworks_native-c2414bb0989763641ca57cf72c11ef6d86565a23.tar.bz2 | |
get rid of HAL pixelformats 5551 and 4444
Change-Id: I39409103144c1ba09078c4ddc323a58987fb09ea
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/egl.cpp | 2 | ||||
| -rw-r--r-- | opengl/tests/hwc/hwcTestLib.cpp | 8 | ||||
| -rw-r--r-- | opengl/tests/hwc/hwcTestLib.h | 2 |
3 files changed, 0 insertions, 12 deletions
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index 0ed5727..bbbda76 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -2051,8 +2051,6 @@ EGLImageKHR eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, case HAL_PIXEL_FORMAT_RGB_888: case HAL_PIXEL_FORMAT_RGB_565: case HAL_PIXEL_FORMAT_BGRA_8888: - case HAL_PIXEL_FORMAT_RGBA_5551: - case HAL_PIXEL_FORMAT_RGBA_4444: break; default: return setError(EGL_BAD_PARAMETER, EGL_NO_IMAGE_KHR); diff --git a/opengl/tests/hwc/hwcTestLib.cpp b/opengl/tests/hwc/hwcTestLib.cpp index d567e6e..9b224e2 100644 --- a/opengl/tests/hwc/hwcTestLib.cpp +++ b/opengl/tests/hwc/hwcTestLib.cpp @@ -560,8 +560,6 @@ uint32_t hwcTestColor2Pixel(uint32_t format, ColorFract color, float alpha) {HAL_PIXEL_FORMAT_RGB_888, false, 3, 0, 8, 8, 8, 16, 8, 0, 0}, {HAL_PIXEL_FORMAT_RGB_565, true, 2, 0, 5, 5, 6, 11, 5, 0, 0}, {HAL_PIXEL_FORMAT_BGRA_8888, false, 4, 16, 8, 8, 8, 0, 8, 24, 8}, - {HAL_PIXEL_FORMAT_RGBA_5551, true , 2, 0, 5, 5, 5, 10, 5, 15, 1}, - {HAL_PIXEL_FORMAT_RGBA_4444, false, 2, 12, 4, 0, 4, 4, 4, 8, 4}, {HAL_PIXEL_FORMAT_YV12, true, 3, 16, 8, 8, 8, 0, 8, 0, 0}, }; @@ -614,8 +612,6 @@ void hwcTestSetPixel(GraphicBuffer *gBuf, unsigned char *buf, {HAL_PIXEL_FORMAT_RGB_888, 3}, {HAL_PIXEL_FORMAT_RGB_565, 2}, {HAL_PIXEL_FORMAT_BGRA_8888, 4}, - {HAL_PIXEL_FORMAT_RGBA_5551, 2}, - {HAL_PIXEL_FORMAT_RGBA_4444, 2}, }; if (gBuf->getPixelFormat() == HAL_PIXEL_FORMAT_YV12) { @@ -813,10 +809,6 @@ void hwcTestColorConvert(uint32_t fromFormat, uint32_t toFormat, 0, 0, 31, 31, 0, 0, 63, 63, 0, 0, 31, 31}, {HAL_PIXEL_FORMAT_BGRA_8888, true, false, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255}, - {HAL_PIXEL_FORMAT_RGBA_5551, true, false, - 0, 0, 31, 31, 0, 0, 31, 31, 0, 0, 31, 31}, - {HAL_PIXEL_FORMAT_RGBA_4444, true, false, - 0, 0, 15, 15, 0, 0, 15, 15, 0, 0, 15, 15}, {HAL_PIXEL_FORMAT_YV12, false, true, 0, 16, 235, 255, 0, 16, 240, 255, 0, 16, 240, 255}, }; diff --git a/opengl/tests/hwc/hwcTestLib.h b/opengl/tests/hwc/hwcTestLib.h index d7d5837..d403308 100644 --- a/opengl/tests/hwc/hwcTestLib.h +++ b/opengl/tests/hwc/hwcTestLib.h @@ -46,8 +46,6 @@ const struct hwcTestGraphicFormat { {HAL_PIXEL_FORMAT_RGB_888, "RGB888", 1, 1}, {HAL_PIXEL_FORMAT_RGB_565, "RGB565", 1, 1}, {HAL_PIXEL_FORMAT_BGRA_8888, "BGRA8888", 1, 1}, - {HAL_PIXEL_FORMAT_RGBA_5551, "RGBA5551", 1, 1}, - {HAL_PIXEL_FORMAT_RGBA_4444, "RGBA4444", 1, 1}, {HAL_PIXEL_FORMAT_YV12, "YV12", 2, 2}, }; |