summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-05-23 04:28:00 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-05-23 04:28:00 -0700
commit33744cc5b708d4a87eda3ff545599ae4da9ef729 (patch)
tree0b70b3d6432e440eae60bc91ee0a2a2f05f1878e
parent6f068cedf9665df4e2ed63dfbad76bb1da4da409 (diff)
parent5e6e7662f0ba9ce1acfe5c05d6475a403af471f4 (diff)
downloadandroid_hardware_qcom_display-33744cc5b708d4a87eda3ff545599ae4da9ef729.tar.gz
android_hardware_qcom_display-33744cc5b708d4a87eda3ff545599ae4da9ef729.tar.bz2
android_hardware_qcom_display-33744cc5b708d4a87eda3ff545599ae4da9ef729.zip
Merge "gralloc: Handle RAW_OPAQUE formats similar to blob" into dev-2.0
-rw-r--r--libgralloc/alloc_controller.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libgralloc/alloc_controller.cpp b/libgralloc/alloc_controller.cpp
index 9eb786eee..39acf6624 100644
--- a/libgralloc/alloc_controller.cpp
+++ b/libgralloc/alloc_controller.cpp
@@ -257,6 +257,7 @@ void AdrenoMemInfo::getAlignedWidthAndHeight(int width, int height, int format,
aligned_h = VENUS_Y_SCANLINES(COLOR_FMT_NV21, height);
break;
case HAL_PIXEL_FORMAT_BLOB:
+ case HAL_PIXEL_FORMAT_RAW_OPAQUE:
break;
case HAL_PIXEL_FORMAT_NV21_ZSL:
aligned_w = ALIGN(width, 64);
@@ -609,6 +610,7 @@ unsigned int getSize(int format, int width, int height, int usage,
size = VENUS_BUFFER_SIZE(COLOR_FMT_NV21, width, height);
break;
case HAL_PIXEL_FORMAT_BLOB:
+ case HAL_PIXEL_FORMAT_RAW_OPAQUE:
if(height != 1) {
ALOGE("%s: Buffers with format HAL_PIXEL_FORMAT_BLOB \
must have height==1 ", __FUNCTION__);