From dfa6dc5eb8e76953bfc45a966813f736b0aa2346 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 27 Jul 2014 03:27:08 +0100 Subject: [PATCH] android: drop HAL_PIXEL_FORMAT_RGBA_{5551,4444} Upstream Android (system/core) has dropped these formats with commit 6bac41f1bf9(get rid of HAL pixelformats 5551 and 4444) yet does not mention why. These formats never really worked so we're safe to drop them as well. Identical commit is available in the android-x86 external/mesa repo commit 06a2d36edcd1e2247440e5800e6bf3028f37aee6 Author: Chih-Wei Huang Date: Wed Sep 25 01:16:57 2013 +0800 android: get rid of HAL pixelformats 5551 and 4444 Cc: "10.1 10.2" Signed-off-by: Emil Velikov --- src/egl/drivers/dri2/platform_android.c | 4 ---- src/gallium/state_trackers/egl/android/native_android.cpp | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index d1f597c66b3..61a99ba68f1 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -54,8 +54,6 @@ get_format_bpp(int native) bpp = 3; break; case HAL_PIXEL_FORMAT_RGB_565: - case HAL_PIXEL_FORMAT_RGBA_5551: - case HAL_PIXEL_FORMAT_RGBA_4444: bpp = 2; break; default: @@ -371,8 +369,6 @@ dri2_create_image_android_native_buffer(_EGLDisplay *disp, _EGLContext *ctx, format = __DRI_IMAGE_FORMAT_XBGR8888; break; case HAL_PIXEL_FORMAT_RGB_888: - case HAL_PIXEL_FORMAT_RGBA_5551: - case HAL_PIXEL_FORMAT_RGBA_4444: /* unsupported */ default: _eglLog(_EGL_WARNING, "unsupported native buffer format 0x%x", buf->format); diff --git a/src/gallium/state_trackers/egl/android/native_android.cpp b/src/gallium/state_trackers/egl/android/native_android.cpp index 8620ed86578..889b6442285 100644 --- a/src/gallium/state_trackers/egl/android/native_android.cpp +++ b/src/gallium/state_trackers/egl/android/native_android.cpp @@ -147,10 +147,6 @@ get_pipe_format(int native) case HAL_PIXEL_FORMAT_BGRA_8888: fmt = PIPE_FORMAT_B8G8R8A8_UNORM; break; - case HAL_PIXEL_FORMAT_RGBA_5551: - /* fmt = PIPE_FORMAT_A1B5G5R5_UNORM; */ - case HAL_PIXEL_FORMAT_RGBA_4444: - /* fmt = PIPE_FORMAT_A4B4G4R4_UNORM; */ default: ALOGE("unsupported native format 0x%x", native); fmt = PIPE_FORMAT_NONE; -- 2.30.2