Skip to content

S
swiftshader
Commit 1de497cc by Jason Macnak
Options

Support Gralloc3 in SwiftShader

Also moves the -DHAVE_GRALLOC cflags away from the host build as hosts do not have gralloc and mapper 3 does not have a header only library available. Bug: b/157902551 Test: launch_cvd w/ Cuttlefish ashmem Gralloc0 Test: launch_cvd w/ Cuttlefish minigbm Gralloc3 Change-Id: I99da611a2b72f9d39df32ab9883dc52f2c081217 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/46408 Presubmit-Ready: Jason Macnak <natsu@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com> Tested-by: 's avatarJason Macnak <natsu@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 100707a3
Showing with 256 additions and 16 deletions
src/Android.bp
...@@ -26,7 +26,6 @@ cc_defaults { ...@@ -26,7 +26,6 @@ cc_defaults {
"-D__STDC_LIMIT_MACROS", "-D__STDC_LIMIT_MACROS",
"-D__STDC_CONSTANT_MACROS", "-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS", "-D__STDC_FORMAT_MACROS",
"-DHAVE_GRALLOC1",
"-DNO_SANITIZE_FUNCTION=", "-DNO_SANITIZE_FUNCTION=",
// FIXME: Use <android/api-level.h> instead? // FIXME: Use <android/api-level.h> instead?
"-DANDROID_PLATFORM_SDK_VERSION=10000", "-DANDROID_PLATFORM_SDK_VERSION=10000",
...@@ -44,17 +43,24 @@ cc_defaults { ...@@ -44,17 +43,24 @@ cc_defaults {
target: { target: {
android: { android: {
cflags: [
"-DHAVE_GRALLOC1",
"-DHAVE_GRALLOC3",
],
relative_install_path: "egl", relative_install_path: "egl",
header_libs: [ header_libs: [
"swiftshader_platform_headers", "swiftshader_platform_headers",
"libnativebase_headers", "libnativebase_headers",
], ],
shared_libs: [ shared_libs: [
"android.hardware.graphics.mapper@3.0",
"libnativewindow", "libnativewindow",
"libhardware", "libhardware",
"libhidlbase",
"libcutils", "libcutils",
"libsync", "libsync",
"liblog", "liblog",
"libutils",
], ],
static_libs: [ static_libs: [
"libarect", "libarect",
...@@ -539,6 +545,7 @@ cc_defaults { ...@@ -539,6 +545,7 @@ cc_defaults {
"-D__STDC_CONSTANT_MACROS", "-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS", "-D__STDC_FORMAT_MACROS",
"-DHAVE_GRALLOC1", "-DHAVE_GRALLOC1",
"-DHAVE_GRALLOC3",
"-DNO_SANITIZE_FUNCTION=", "-DNO_SANITIZE_FUNCTION=",
// FIXME: Use <android/api-level.h> instead? // FIXME: Use <android/api-level.h> instead?
"-DANDROID_PLATFORM_SDK_VERSION=10000", "-DANDROID_PLATFORM_SDK_VERSION=10000",
...@@ -576,11 +583,14 @@ cc_defaults { ...@@ -576,11 +583,14 @@ cc_defaults {
"hwvulkan_headers", "hwvulkan_headers",
], ],
shared_libs: [ shared_libs: [
"android.hardware.graphics.mapper@3.0",
"libnativewindow", "libnativewindow",
"libhardware", "libhardware",
"libhidlbase",
"libcutils", "libcutils",
"libsync", "libsync",
"liblog", "liblog",
"libutils",
], ],
static_libs: [ static_libs: [
"libarect", "libarect",
......
src/Common/GrallocAndroid.cpp
...@@ -16,7 +16,12 @@ ...@@ -16,7 +16,12 @@
#include "Debug.hpp" #include "Debug.hpp"
#ifdef HAVE_GRALLOC1 #ifdef HAVE_GRALLOC1
#include <sync/sync.h> # include <sync/sync.h>
#endif
#ifdef HAVE_GRALLOC3
using V3Error = android::hardware::graphics::mapper::V3_0::Error;
using V3Mapper = android::hardware::graphics::mapper::V3_0::IMapper;
using android::hardware::hidl_handle;
#endif #endif
GrallocModule *GrallocModule::getInstance() GrallocModule *GrallocModule::getInstance()
...@@ -27,6 +32,14 @@ GrallocModule *GrallocModule::getInstance() ...@@ -27,6 +32,14 @@ GrallocModule *GrallocModule::getInstance()
GrallocModule::GrallocModule() GrallocModule::GrallocModule()
{ {
#ifdef HAVE_GRALLOC3
m_gralloc3_mapper = V3Mapper::getService();
if(m_gralloc3_mapper != nullptr)
{
return;
}
#endif
const hw_module_t *module = nullptr; const hw_module_t *module = nullptr;
hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module); hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module);
...@@ -34,12 +47,12 @@ GrallocModule::GrallocModule() ...@@ -34,12 +47,12 @@ GrallocModule::GrallocModule()
switch(m_major_version) switch(m_major_version)
{ {
case 0: case 0:
m_module = reinterpret_cast<const gralloc_module_t*>(module); m_module = reinterpret_cast<const gralloc_module_t *>(module);
break; break;
case 1: case 1:
#ifdef HAVE_GRALLOC1 #ifdef HAVE_GRALLOC1
gralloc1_open(module, &m_gralloc1_device); gralloc1_open(module, &m_gralloc1_device);
m_gralloc1_lock = (GRALLOC1_PFN_LOCK) m_gralloc1_device->getFunction(m_gralloc1_device, GRALLOC1_FUNCTION_LOCK); m_gralloc1_lock = (GRALLOC1_PFN_LOCK)m_gralloc1_device->getFunction(m_gralloc1_device, GRALLOC1_FUNCTION_LOCK);
m_gralloc1_unlock = (GRALLOC1_PFN_UNLOCK)m_gralloc1_device->getFunction(m_gralloc1_device, GRALLOC1_FUNCTION_UNLOCK); m_gralloc1_unlock = (GRALLOC1_PFN_UNLOCK)m_gralloc1_device->getFunction(m_gralloc1_device, GRALLOC1_FUNCTION_UNLOCK);
break; break;
#endif #endif
...@@ -49,8 +62,72 @@ GrallocModule::GrallocModule() ...@@ -49,8 +62,72 @@ GrallocModule::GrallocModule()
} }
} }
int GrallocModule::import(buffer_handle_t handle, buffer_handle_t *imported_handle)
{
#ifdef HAVE_GRALLOC3
if(m_gralloc3_mapper != nullptr)
{
V3Error error;
auto ret = m_gralloc3_mapper->importBuffer(handle,
[&](const auto &tmp_err, const auto &tmp_buf) {
error = tmp_err;
if(error == V3Error::NONE)
{
*imported_handle = static_cast<buffer_handle_t>(tmp_buf);
}
});
return ret.isOk() && error == V3Error::NONE ? 0 : -1;
}
#endif
*imported_handle = handle;
return 0;
}
int GrallocModule::release(buffer_handle_t handle)
{
#ifdef HAVE_GRALLOC3
if(m_gralloc3_mapper != nullptr)
{
native_handle_t *native_handle = const_cast<native_handle_t *>(handle);
return m_gralloc3_mapper->freeBuffer(native_handle).isOk() ? 0 : 1;
}
#endif
return 0;
}
int GrallocModule::lock(buffer_handle_t handle, int usage, int left, int top, int width, int height, void **vaddr) int GrallocModule::lock(buffer_handle_t handle, int usage, int left, int top, int width, int height, void **vaddr)
{ {
#ifdef HAVE_GRALLOC3
if(m_gralloc3_mapper != nullptr)
{
native_handle_t *native_handle = const_cast<native_handle_t *>(handle);
V3Mapper::Rect rect;
rect.left = left;
rect.top = top;
rect.width = width;
rect.height = height;
hidl_handle empty_fence_handle;
V3Error error;
auto ret = m_gralloc3_mapper->lock(native_handle, usage, rect, empty_fence_handle,
[&](const auto &tmp_err,
const auto &tmp_vaddr,
const auto & /*bytes_per_pixel*/,
const auto & /*bytes_per_stride*/) {
error = tmp_err;
if(tmp_err == V3Error::NONE)
{
*vaddr = tmp_vaddr;
}
});
return ret.isOk() && error == V3Error::NONE ? 0 : -1;
}
#endif
switch(m_major_version) switch(m_major_version)
{ {
case 0: case 0:
...@@ -78,6 +155,20 @@ int GrallocModule::lock(buffer_handle_t handle, int usage, int left, int top, in ...@@ -78,6 +155,20 @@ int GrallocModule::lock(buffer_handle_t handle, int usage, int left, int top, in
int GrallocModule::unlock(buffer_handle_t handle) int GrallocModule::unlock(buffer_handle_t handle)
{ {
#ifdef HAVE_GRALLOC3
if(m_gralloc3_mapper != nullptr)
{
native_handle_t *native_handle = const_cast<native_handle_t *>(handle);
V3Error error;
auto ret = m_gralloc3_mapper->unlock(native_handle,
[&](const auto &tmp_err, const auto &) {
error = tmp_err;
});
return ret.isOk() && error == V3Error::NONE ? 0 : -1;
}
#endif
switch(m_major_version) switch(m_major_version)
{ {
case 0: case 0:
...@@ -89,7 +180,7 @@ int GrallocModule::unlock(buffer_handle_t handle) ...@@ -89,7 +180,7 @@ int GrallocModule::unlock(buffer_handle_t handle)
{ {
int32_t fenceFd = -1; int32_t fenceFd = -1;
int error = m_gralloc1_unlock(m_gralloc1_device, handle, &fenceFd); int error = m_gralloc1_unlock(m_gralloc1_device, handle, &fenceFd);
if (!error) if(!error)
{ {
sync_wait(fenceFd, -1); sync_wait(fenceFd, -1);
close(fenceFd); close(fenceFd);
......
src/Common/GrallocAndroid.hpp
...@@ -16,9 +16,10 @@ ...@@ -16,9 +16,10 @@
#define GRALLOC_ANDROID #define GRALLOC_ANDROID
#include <hardware/gralloc.h> #include <hardware/gralloc.h>
#ifdef HAVE_GRALLOC1
#include <hardware/gralloc1.h> #include <hardware/gralloc1.h>
#ifdef HAVE_GRALLOC3
# include <android/hardware/graphics/mapper/3.0/IMapper.h>
# include <utils/StrongPointer.h>
#endif #endif
#include <unistd.h> // for close() #include <unistd.h> // for close()
...@@ -27,6 +28,10 @@ class GrallocModule ...@@ -27,6 +28,10 @@ class GrallocModule
{ {
public: public:
static GrallocModule *getInstance(); static GrallocModule *getInstance();
int import(buffer_handle_t handle, buffer_handle_t *imported_handle);
int release(buffer_handle_t handle);
int lock(buffer_handle_t handle, int usage, int left, int top, int width, int height, void **vaddr); int lock(buffer_handle_t handle, int usage, int left, int top, int width, int height, void **vaddr);
int unlock(buffer_handle_t handle); int unlock(buffer_handle_t handle);
...@@ -39,6 +44,9 @@ private: ...@@ -39,6 +44,9 @@ private:
GRALLOC1_PFN_LOCK m_gralloc1_lock = nullptr; GRALLOC1_PFN_LOCK m_gralloc1_lock = nullptr;
GRALLOC1_PFN_UNLOCK m_gralloc1_unlock = nullptr; GRALLOC1_PFN_UNLOCK m_gralloc1_unlock = nullptr;
#endif #endif
#ifdef HAVE_GRALLOC3
android::sp<android::hardware::graphics::mapper::V3_0::IMapper> m_gralloc3_mapper;
#endif
}; };
#endif // GRALLOC_ANDROID #endif // GRALLOC_ANDROID
src/Main/FrameBufferAndroid.cpp
...@@ -126,7 +126,12 @@ namespace sw ...@@ -126,7 +126,12 @@ namespace sw
{ {
return nullptr; return nullptr;
} }
if(GrallocModule::getInstance()->lock(buffer->handle, if(GrallocModule::getInstance()->import(buffer->handle, &bufferImportedHandle) != 0) {
TRACE("%s failed to import buffer %p", __FUNCTION__, buffer);
return nullptr;
}
if(GrallocModule::getInstance()->lock(bufferImportedHandle,
GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN, GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN,
0, 0, buffer->width, buffer->height, &framebuffer) != 0) 0, 0, buffer->width, buffer->height, &framebuffer) != 0)
{ {
...@@ -179,10 +184,13 @@ namespace sw ...@@ -179,10 +184,13 @@ namespace sw
#ifdef ANDROID_NDK_BUILD #ifdef ANDROID_NDK_BUILD
ANativeWindow_unlockAndPost(nativeWindow); ANativeWindow_unlockAndPost(nativeWindow);
#else #else
if(GrallocModule::getInstance()->unlock(buffer->handle) != 0) if(GrallocModule::getInstance()->unlock(bufferImportedHandle) != 0)
{ {
TRACE("%s: badness unlock failed", __FUNCTION__); TRACE("%s: badness unlock failed", __FUNCTION__);
} }
if(GrallocModule::getInstance()->release(bufferImportedHandle) != 0) {
TRACE("%s: badness release failed", __FUNCTION__);
}
#endif #endif
} }
} }
......
src/Main/FrameBufferAndroid.hpp
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
#ifndef sw_FrameBufferAndroid_hpp #ifndef sw_FrameBufferAndroid_hpp
#define sw_FrameBufferAndroid_hpp #define sw_FrameBufferAndroid_hpp
#include <cutils/native_handle.h>
#include "Main/FrameBuffer.hpp" #include "Main/FrameBuffer.hpp"
#include "Common/Debug.hpp" #include "Common/Debug.hpp"
...@@ -41,6 +43,7 @@ namespace sw ...@@ -41,6 +43,7 @@ namespace sw
private: private:
ANativeWindow *nativeWindow; ANativeWindow *nativeWindow;
ANativeWindowBuffer *buffer; ANativeWindowBuffer *buffer;
buffer_handle_t bufferImportedHandle;
}; };
} }
......
src/OpenGL/common/Image.hpp
...@@ -273,15 +273,20 @@ public: ...@@ -273,15 +273,20 @@ public:
nativeBuffer(nativeBuffer) nativeBuffer(nativeBuffer)
{ {
nativeBuffer->common.incRef(&nativeBuffer->common); nativeBuffer->common.incRef(&nativeBuffer->common);
GrallocModule::getInstance()->import(nativeBuffer->handle, &nativeBufferImportedHandle);
} }
private: private:
ANativeWindowBuffer *nativeBuffer; ANativeWindowBuffer *nativeBuffer;
buffer_handle_t nativeBufferImportedHandle;
~AndroidNativeImage() override ~AndroidNativeImage() override
{ {
sync(); // Wait for any threads that use this image to finish. sync(); // Wait for any threads that use this image to finish.
GrallocModule::getInstance()->release(nativeBufferImportedHandle);
nativeBuffer->common.decRef(&nativeBuffer->common); nativeBuffer->common.decRef(&nativeBuffer->common);
} }
...@@ -340,14 +345,14 @@ private: ...@@ -340,14 +345,14 @@ private:
void *lockNativeBuffer(int usage) void *lockNativeBuffer(int usage)
{ {
void *buffer = nullptr; void *buffer = nullptr;
GrallocModule::getInstance()->lock(nativeBuffer->handle, usage, 0, 0, nativeBuffer->width, nativeBuffer->height, &buffer); GrallocModule::getInstance()->lock(nativeBufferImportedHandle, usage, 0, 0, nativeBuffer->width, nativeBuffer->height, &buffer);
return buffer; return buffer;
} }
void unlockNativeBuffer() void unlockNativeBuffer()
{ {
GrallocModule::getInstance()->unlock(nativeBuffer->handle); GrallocModule::getInstance()->unlock(nativeBufferImportedHandle);
} }
void release() override void release() override
......
src/System/GrallocAndroid.cpp
...@@ -18,6 +18,11 @@ ...@@ -18,6 +18,11 @@
#ifdef HAVE_GRALLOC1 #ifdef HAVE_GRALLOC1
# include <sync/sync.h> # include <sync/sync.h>
#endif #endif
#ifdef HAVE_GRALLOC3
using V3Error = android::hardware::graphics::mapper::V3_0::Error;
using V3Mapper = android::hardware::graphics::mapper::V3_0::IMapper;
using android::hardware::hidl_handle;
#endif
GrallocModule *GrallocModule::getInstance() GrallocModule *GrallocModule::getInstance()
{ {
...@@ -27,6 +32,14 @@ GrallocModule *GrallocModule::getInstance() ...@@ -27,6 +32,14 @@ GrallocModule *GrallocModule::getInstance()
GrallocModule::GrallocModule() GrallocModule::GrallocModule()
{ {
#ifdef HAVE_GRALLOC3
m_gralloc3_mapper = V3Mapper::getService();
if(m_gralloc3_mapper != nullptr)
{
return;
}
#endif
const hw_module_t *module = nullptr; const hw_module_t *module = nullptr;
hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module); hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module);
...@@ -49,8 +62,72 @@ GrallocModule::GrallocModule() ...@@ -49,8 +62,72 @@ GrallocModule::GrallocModule()
} }
} }
int GrallocModule::import(buffer_handle_t handle, buffer_handle_t *imported_handle)
{
#ifdef HAVE_GRALLOC3
if(m_gralloc3_mapper != nullptr)
{
V3Error error;
auto ret = m_gralloc3_mapper->importBuffer(handle,
[&](const auto &tmp_err, const auto &tmp_buf) {
error = tmp_err;
if(error == V3Error::NONE)
{
*imported_handle = static_cast<buffer_handle_t>(tmp_buf);
}
});
return ret.isOk() && error == V3Error::NONE ? 0 : -1;
}
#endif
*imported_handle = handle;
return 0;
}
int GrallocModule::release(buffer_handle_t handle)
{
#ifdef HAVE_GRALLOC3
if(m_gralloc3_mapper != nullptr)
{
native_handle_t *native_handle = const_cast<native_handle_t *>(handle);
return m_gralloc3_mapper->freeBuffer(native_handle).isOk() ? 0 : 1;
}
#endif
return 0;
}
int GrallocModule::lock(buffer_handle_t handle, int usage, int left, int top, int width, int height, void **vaddr) int GrallocModule::lock(buffer_handle_t handle, int usage, int left, int top, int width, int height, void **vaddr)
{ {
#ifdef HAVE_GRALLOC3
if(m_gralloc3_mapper != nullptr)
{
native_handle_t *native_handle = const_cast<native_handle_t *>(handle);
V3Mapper::Rect rect;
rect.left = left;
rect.top = top;
rect.width = width;
rect.height = height;
hidl_handle empty_fence_handle;
V3Error error;
auto ret = m_gralloc3_mapper->lock(native_handle, usage, rect, empty_fence_handle,
[&](const auto &tmp_err,
const auto &tmp_vaddr,
const auto & /*bytes_per_pixel*/,
const auto & /*bytes_per_stride*/) {
error = tmp_err;
if(tmp_err == V3Error::NONE)
{
*vaddr = tmp_vaddr;
}
});
return ret.isOk() && error == V3Error::NONE ? 0 : -1;
}
#endif
switch(m_major_version) switch(m_major_version)
{ {
case 0: case 0:
...@@ -78,6 +155,20 @@ int GrallocModule::lock(buffer_handle_t handle, int usage, int left, int top, in ...@@ -78,6 +155,20 @@ int GrallocModule::lock(buffer_handle_t handle, int usage, int left, int top, in
int GrallocModule::unlock(buffer_handle_t handle) int GrallocModule::unlock(buffer_handle_t handle)
{ {
#ifdef HAVE_GRALLOC3
if(m_gralloc3_mapper != nullptr)
{
native_handle_t *native_handle = const_cast<native_handle_t *>(handle);
V3Error error;
auto ret = m_gralloc3_mapper->unlock(native_handle,
[&](const auto &tmp_err, const auto &) {
error = tmp_err;
});
return ret.isOk() && error == V3Error::NONE ? 0 : -1;
}
#endif
switch(m_major_version) switch(m_major_version)
{ {
case 0: case 0:
......
src/System/GrallocAndroid.hpp
...@@ -16,9 +16,10 @@ ...@@ -16,9 +16,10 @@
#define GRALLOC_ANDROID #define GRALLOC_ANDROID
#include <hardware/gralloc.h> #include <hardware/gralloc.h>
#include <hardware/gralloc1.h>
#ifdef HAVE_GRALLOC1 #ifdef HAVE_GRALLOC3
# include <hardware/gralloc1.h> # include <android/hardware/graphics/mapper/3.0/IMapper.h>
# include <utils/StrongPointer.h>
#endif #endif
#include <unistd.h> // for close() #include <unistd.h> // for close()
...@@ -27,6 +28,10 @@ class GrallocModule ...@@ -27,6 +28,10 @@ class GrallocModule
{ {
public: public:
static GrallocModule *getInstance(); static GrallocModule *getInstance();
int import(buffer_handle_t handle, buffer_handle_t *imported_handle);
int release(buffer_handle_t handle);
int lock(buffer_handle_t handle, int usage, int left, int top, int width, int height, void **vaddr); int lock(buffer_handle_t handle, int usage, int left, int top, int width, int height, void **vaddr);
int unlock(buffer_handle_t handle); int unlock(buffer_handle_t handle);
...@@ -39,6 +44,9 @@ private: ...@@ -39,6 +44,9 @@ private:
GRALLOC1_PFN_LOCK m_gralloc1_lock = nullptr; GRALLOC1_PFN_LOCK m_gralloc1_lock = nullptr;
GRALLOC1_PFN_UNLOCK m_gralloc1_unlock = nullptr; GRALLOC1_PFN_UNLOCK m_gralloc1_unlock = nullptr;
#endif #endif
#ifdef HAVE_GRALLOC3
android::sp<android::hardware::graphics::mapper::V3_0::IMapper> m_gralloc3_mapper;
#endif
}; };
#endif // GRALLOC_ANDROID #endif // GRALLOC_ANDROID
src/Vulkan/VkImage.cpp
...@@ -236,7 +236,17 @@ VkResult Image::prepareForExternalUseANDROID() const ...@@ -236,7 +236,17 @@ VkResult Image::prepareForExternalUseANDROID() const
void *nativeBuffer = nullptr; void *nativeBuffer = nullptr;
VkExtent3D extent = getMipLevelExtent(VK_IMAGE_ASPECT_COLOR_BIT, 0); VkExtent3D extent = getMipLevelExtent(VK_IMAGE_ASPECT_COLOR_BIT, 0);
if(GrallocModule::getInstance()->lock(backingMemory.nativeHandle, GRALLOC_USAGE_SW_WRITE_OFTEN, 0, 0, extent.width, extent.height, &nativeBuffer) != 0) buffer_handle_t importedBufferHandle = nullptr;
if(GrallocModule::getInstance()->import(backingMemory.nativeHandle, &importedBufferHandle) != 0)
{
return VK_ERROR_OUT_OF_DATE_KHR;
}
if(!importedBufferHandle)
{
return VK_ERROR_OUT_OF_DATE_KHR;
}
if(GrallocModule::getInstance()->lock(importedBufferHandle, GRALLOC_USAGE_SW_WRITE_OFTEN, 0, 0, extent.width, extent.height, &nativeBuffer) != 0)
{ {
return VK_ERROR_OUT_OF_DATE_KHR; return VK_ERROR_OUT_OF_DATE_KHR;
} }
...@@ -257,7 +267,12 @@ VkResult Image::prepareForExternalUseANDROID() const ...@@ -257,7 +267,12 @@ VkResult Image::prepareForExternalUseANDROID() const
memcpy(dstBuffer + (i * bufferRowBytes), srcBuffer + (i * imageRowBytes), imageRowBytes); memcpy(dstBuffer + (i * bufferRowBytes), srcBuffer + (i * imageRowBytes), imageRowBytes);
} }
if(GrallocModule::getInstance()->unlock(backingMemory.nativeHandle) != 0) if(GrallocModule::getInstance()->unlock(importedBufferHandle) != 0)
{
return VK_ERROR_OUT_OF_DATE_KHR;
}
if(GrallocModule::getInstance()->release(importedBufferHandle) != 0)
{ {
return VK_ERROR_OUT_OF_DATE_KHR; return VK_ERROR_OUT_OF_DATE_KHR;
} }
......
src/Vulkan/libVulkan.cpp
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
# include "commit.h" # include "commit.h"
# include "System/GrallocAndroid.hpp" # include "System/GrallocAndroid.hpp"
# include <android/log.h> # include <android/log.h>
# include <hardware/gralloc1.h>
# include <sync/sync.h> # include <sync/sync.h>
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment