summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2013-07-26 14:49:13 -0700
committerMathias Agopian <mathias@google.com>2013-07-26 14:49:13 -0700
commit07da94023283a7be99fdde9b05e54d9204f7deff (patch)
tree0107c086cc5720c42e090cf1b4aa60fabd6605ec
parenta4c19be9274d8bb993f88a6a1cbd2ad92f4a48fa (diff)
downloadandroid_device_generic_goldfish-07da94023283a7be99fdde9b05e54d9204f7deff.tar.gz
android_device_generic_goldfish-07da94023283a7be99fdde9b05e54d9204f7deff.tar.bz2
android_device_generic_goldfish-07da94023283a7be99fdde9b05e54d9204f7deff.zip
get rid of HAL pixelformats 5551 and 4444
Change-Id: If69c5cdb02dd8308963165a09b5d7fe3b00077ae
-rw-r--r--opengl/system/egl/egl.cpp2
-rw-r--r--opengl/system/gralloc/gralloc.cpp10
2 files changed, 0 insertions, 12 deletions
diff --git a/opengl/system/egl/egl.cpp b/opengl/system/egl/egl.cpp
index da89c4d..2ec17fb 100644
--- a/opengl/system/egl/egl.cpp
+++ b/opengl/system/egl/egl.cpp
@@ -1154,8 +1154,6 @@ EGLImageKHR eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EG
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:
setErrorReturn(EGL_BAD_PARAMETER, EGL_NO_IMAGE_KHR);
diff --git a/opengl/system/gralloc/gralloc.cpp b/opengl/system/gralloc/gralloc.cpp
index ed5d05f..6250a2f 100644
--- a/opengl/system/gralloc/gralloc.cpp
+++ b/opengl/system/gralloc/gralloc.cpp
@@ -219,16 +219,6 @@ static int gralloc_alloc(alloc_device_t* dev,
glFormat = GL_RGB;
glType = GL_UNSIGNED_SHORT_5_6_5;
break;
- case HAL_PIXEL_FORMAT_RGBA_5551:
- bpp = 2;
- glFormat = GL_RGB5_A1_OES;
- glType = GL_UNSIGNED_SHORT_5_5_5_1;
- break;
- case HAL_PIXEL_FORMAT_RGBA_4444:
- bpp = 2;
- glFormat = GL_RGBA4_OES;
- glType = GL_UNSIGNED_SHORT_4_4_4_4;
- break;
case HAL_PIXEL_FORMAT_RAW_SENSOR:
bpp = 2;
align = 16*bpp;