Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use gralloc usage conversion library" into oc-dev

Browse Source 
am: 2f44ec6c86

Change-Id: I692ea8e24c0d87e7729e52c1e35d7d40eab12a0f
This commit is contained in:
Jesse Hall
2017-03-28 21:04:31 +00:00
committed by android-build-merger
parent b350bbe7b8 2f44ec6c86
commit 112daef624
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
graphics/allocator/2.0/default/Android.bp
View File

@@ -41,4 +41,5 @@ cc_library_static {
include_dirs: ["system/core/libsync/include"],
cflags: ["-Wall", "-Wextra", "-Wno-unused-parameter"],
export_include_dirs: ["."],
whole_static_libs: ["libgrallocusage"],
}

10
graphics/allocator/2.0/default/Gralloc1On0Adapter.cpp
View File

@@ -21,6 +21,8 @@
#include "Gralloc1On0Adapter.h"
#include "gralloc1-adapter.h"
#include <grallocusage/GrallocUsageConversion.h>
#include <hardware/gralloc.h>
#include <utils/Log.h>
@@ -240,8 +242,8 @@ gralloc1_error_t Gralloc1On0Adapter::allocate(
// pointer, which only occurs when mDevice has been loaded successfully and
// we are permitted to allocate
int usage = static_cast<int>(descriptor->producerUsage) |
static_cast<int>(descriptor->consumerUsage);
int usage = android_convertGralloc1To0Usage(
descriptor->producerUsage, descriptor->consumerUsage);
buffer_handle_t handle = nullptr;
int stride = 0;
ALOGV("Calling alloc(%p, %u, %u, %i, %u)", mDevice, descriptor->width,
@@ -438,7 +440,7 @@ gralloc1_error_t Gralloc1On0Adapter::lock(
{
if (mMinorVersion >= 3) {
int result = mModule->lockAsync(mModule, buffer->getHandle(),
static_cast<int32_t>(producerUsage | consumerUsage),
android_convertGralloc1To0Usage(producerUsage, consumerUsage),
accessRegion.left, accessRegion.top, accessRegion.width,
accessRegion.height, outData, acquireFence);
if (result != 0) {
@@ -448,7 +450,7 @@ gralloc1_error_t Gralloc1On0Adapter::lock(
syncWaitForever(acquireFence, "Gralloc1On0Adapter::lock");
int result = mModule->lock(mModule, buffer->getHandle(),
static_cast<int32_t>(producerUsage | consumerUsage),
android_convertGralloc1To0Usage(producerUsage, consumerUsage),
accessRegion.left, accessRegion.top, accessRegion.width,
accessRegion.height, outData);
ALOGV("gralloc0 lock returned %d", result);