Snap for 6852881 from bf1c412d257467c633b948e84530a166f54c9a63 to rvc-qpr1-release
Change-Id: I86f22f1956075409b61a0438bac35277c9594639
diff --git a/gralloc/gr_adreno_info.cpp b/gralloc/gr_adreno_info.cpp
index d33f7db..9277e84 100644
--- a/gralloc/gr_adreno_info.cpp
+++ b/gralloc/gr_adreno_info.cpp
@@ -204,6 +204,10 @@
return ADRENO_PIXELFORMAT_R5G5B5A1;
case HAL_PIXEL_FORMAT_RGBA_4444:
return ADRENO_PIXELFORMAT_R4G4B4A4;
+ case HAL_PIXEL_FORMAT_R_8:
+ return ADRENO_PIXELFORMAT_R8_UNORM;
+ case HAL_PIXEL_FORMAT_RG_88:
+ return ADRENO_PIXELFORMAT_R8G8_UNORM;
case HAL_PIXEL_FORMAT_RGBA_1010102:
return ADRENO_PIXELFORMAT_R10G10B10A2_UNORM;
case HAL_PIXEL_FORMAT_RGBX_1010102:
diff --git a/gralloc/gr_adreno_info.h b/gralloc/gr_adreno_info.h
index 436e0c0..ad16943 100644
--- a/gralloc/gr_adreno_info.h
+++ b/gralloc/gr_adreno_info.h
@@ -43,7 +43,9 @@
ADRENO_PIXELFORMAT_R8G8B8A8_SRGB = 29,
ADRENO_PIXELFORMAT_D32_FLOAT = 40,
ADRENO_PIXELFORMAT_D24_UNORM_S8_UINT = 45,
+ ADRENO_PIXELFORMAT_R8G8_UNORM = 49,
ADRENO_PIXELFORMAT_D16_UNORM = 55,
+ ADRENO_PIXELFORMAT_R8_UNORM = 61,
ADRENO_PIXELFORMAT_B5G6R5 = 85,
ADRENO_PIXELFORMAT_B5G5R5A1 = 86,
ADRENO_PIXELFORMAT_B8G8R8A8_UNORM = 87,
diff --git a/gralloc/gr_utils.cpp b/gralloc/gr_utils.cpp
index 1072b54..663c180 100644
--- a/gralloc/gr_utils.cpp
+++ b/gralloc/gr_utils.cpp
@@ -172,8 +172,12 @@
case HAL_PIXEL_FORMAT_BGR_565:
case HAL_PIXEL_FORMAT_RGBA_5551:
case HAL_PIXEL_FORMAT_RGBA_4444:
+ case HAL_PIXEL_FORMAT_RG_88:
bpp = 2;
break;
+ case HAL_PIXEL_FORMAT_R_8:
+ bpp = 1;
+ break;
default:
ALOGE("Error : %s New format request = 0x%x", __FUNCTION__, format);
break;