commit c5a98b505c23e854036429c6aedf59aa6f213dbf
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jan 03 18:23:27 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 03 18:23:27 2019 +0000
tree e263f4e3c9919119523796fc7852182ab4bbfe84
parent 69ca43e36679de0795967be37b54304e7793c71c
parent c4b9ce02d0a230acf8b4acbcf1d7cde8ca467c8c

Merge "Fix AHardwareBuffer_isSupported for cube maps."

libs/nativewindow/AHardwareBuffer.cpp

diff --git a/libs/nativewindow/AHardwareBuffer.cpp b/libs/nativewindow/AHardwareBuffer.cpp
index a19fe17..6ea1270 100644
--- a/libs/nativewindow/AHardwareBuffer.cpp
+++ b/libs/nativewindow/AHardwareBuffer.cpp
@@ -268,7 +268,11 @@
     AHardwareBuffer_Desc trialDesc = *desc;
     trialDesc.width = 4;
     trialDesc.height = desc->format == AHARDWAREBUFFER_FORMAT_BLOB ? 1 : 4;
-    trialDesc.layers = desc->layers == 1 ? 1 : 2;
+    if (desc->usage & AHARDWAREBUFFER_USAGE_GPU_CUBE_MAP) {
+        trialDesc.layers = desc->layers == 6 ? 6 : 12;
+    } else {
+        trialDesc.layers = desc->layers == 1 ? 1 : 2;
+    }
     AHardwareBuffer* trialBuffer = nullptr;
     int result = AHardwareBuffer_allocate(&trialDesc, &trialBuffer);
     if (result == NO_ERROR) {