From 925ff0b5341e0df494b647f02fbc136757fdd48e Mon Sep 17 00:00:00 2001 From: Tomasz Figa Date: Wed, 9 Nov 2016 17:32:54 +0900 Subject: [PATCH] egl/android: Remove handling of RGB_888 pixel format It is currently completely broken, as it ends up using RGBX_8888 on hardware side, due to no way of distinguishing between these two in the DRI API, while HAL_PIXEL_FORMAT_RGB_888 is clearly defined to be the 3-byte per pixel RGB format. Signed-off-by: Tomasz Figa Reviewed-by: Emil Velikov --- src/egl/drivers/dri2/platform_android.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 4efba98d2b5..f62a0386d9b 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -54,9 +54,6 @@ get_format_bpp(int native) case HAL_PIXEL_FORMAT_BGRA_8888: bpp = 4; break; - case HAL_PIXEL_FORMAT_RGB_888: - bpp = 3; - break; case HAL_PIXEL_FORMAT_RGB_565: bpp = 2; break; @@ -93,8 +90,6 @@ static int get_format(int format) case HAL_PIXEL_FORMAT_RGB_565: return __DRI_IMAGE_FORMAT_RGB565; case HAL_PIXEL_FORMAT_RGBA_8888: return __DRI_IMAGE_FORMAT_ABGR8888; case HAL_PIXEL_FORMAT_RGBX_8888: return __DRI_IMAGE_FORMAT_XBGR8888; - case HAL_PIXEL_FORMAT_RGB_888: - /* unsupported */ default: _eglLog(_EGL_WARNING, "unsupported native buffer format 0x%x", format); } @@ -819,7 +814,6 @@ droid_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *dpy) } visuals[] = { { HAL_PIXEL_FORMAT_RGBA_8888, { 0xff, 0xff00, 0xff0000, 0xff000000 } }, { HAL_PIXEL_FORMAT_RGBX_8888, { 0xff, 0xff00, 0xff0000, 0x0 } }, - { HAL_PIXEL_FORMAT_RGB_888, { 0xff, 0xff00, 0xff0000, 0x0 } }, { HAL_PIXEL_FORMAT_RGB_565, { 0xf800, 0x7e0, 0x1f, 0x0 } }, { HAL_PIXEL_FORMAT_BGRA_8888, { 0xff0000, 0xff00, 0xff, 0xff000000 } }, }; -- 2.30.2