From 850054cb46b25e20c1ae0b409734c0fa5c634b18 Mon Sep 17 00:00:00 2001 From: Craig Donner Date: Wed, 26 Oct 2016 11:47:23 -0700 Subject: [PATCH] Use layered version of graphic buffer allocation calls. Allocators now require a layer count, but in these cases we can assume that a single layer is sufficient, since that's what they effectively do now. Bug: 31686534 Test: manual Change-Id: I30e498f8cb3e27c497f7bab9fbf2e7b4dad842d5 --- core/jni/android_view_GraphicBuffer.cpp | 2 +- libs/hwui/hwui/Bitmap.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/jni/android_view_GraphicBuffer.cpp b/core/jni/android_view_GraphicBuffer.cpp index 17437318470d2..b9376d8c6e66f 100644 --- a/core/jni/android_view_GraphicBuffer.cpp +++ b/core/jni/android_view_GraphicBuffer.cpp @@ -111,7 +111,7 @@ static jlong android_view_GraphiceBuffer_create(JNIEnv* env, jobject clazz, } status_t error; - sp buffer(alloc->createGraphicBuffer(width, height, format, usage, &error)); + sp buffer(alloc->createGraphicBuffer(width, height, format, 1, usage, &error)); if (buffer == NULL) { if (kDebugGraphicBuffer) { ALOGW("createGraphicBuffer() failed in GraphicBuffer.create()"); diff --git a/libs/hwui/hwui/Bitmap.cpp b/libs/hwui/hwui/Bitmap.cpp index b8f7d9f016976..2077b0ec87f9d 100644 --- a/libs/hwui/hwui/Bitmap.cpp +++ b/libs/hwui/hwui/Bitmap.cpp @@ -227,7 +227,7 @@ sk_sp Bitmap::allocateHardwareBitmap(uirenderer::renderthread::RenderThr PixelFormat pixelFormat = internalFormatToPixelFormat(internalFormat); status_t error; sp buffer = alloc->createGraphicBuffer(info.width(), info.height(), pixelFormat, - GraphicBuffer::USAGE_HW_TEXTURE | GraphicBuffer::USAGE_SW_WRITE_NEVER + 1, GraphicBuffer::USAGE_HW_TEXTURE | GraphicBuffer::USAGE_SW_WRITE_NEVER | GraphicBuffer::USAGE_SW_READ_NEVER , &error); if (!buffer.get()) {