diff options
| author | Stan Iliev <stani@google.com> | 2019-09-17 14:07:23 -0400 |
|---|---|---|
| committer | Stan Iliev <stani@google.com> | 2019-11-08 15:37:17 +0000 |
| commit | aaa9e834d443a56671eccbe97c755c253fa94afe (patch) | |
| tree | e67daf0782137e572f6be35e9a24b146c4fd4b57 /libs/hwui/renderthread/VulkanManager.h | |
| parent | 707ba29a6621220c2713468bf095178dcc1e376e (diff) | |
Decouple SurfaceTexture from HWUI
Remove all Skia and HWUI types from SurfaceTexture
implementation.
Move SurfaceTexture to libgui (ag/9578265).
Define private C++ API for SurfaceTexture, which is consumed
by DeferredLayerUpdater.
Move AutoBackendTextureRelease/Skia code from SurfaceTexture
to HWUI.
Test: pass CtsUiRenderingTestCases and CtsViewTestCases
Bug: 136263580
Change-Id: I3f971bb490f64a3ac0b2a66a89ba935bf7f08213
Diffstat (limited to 'libs/hwui/renderthread/VulkanManager.h')
| -rw-r--r-- | libs/hwui/renderthread/VulkanManager.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libs/hwui/renderthread/VulkanManager.h b/libs/hwui/renderthread/VulkanManager.h index 4c6a75504cd0..8b19f13fdfb9 100644 --- a/libs/hwui/renderthread/VulkanManager.h +++ b/libs/hwui/renderthread/VulkanManager.h @@ -20,14 +20,13 @@ #if !defined(VK_USE_PLATFORM_ANDROID_KHR) #define VK_USE_PLATFORM_ANDROID_KHR #endif -#include <vulkan/vulkan.h> - #include <GrContextOptions.h> #include <SkSurface.h> -#include <ui/Fence.h> #include <utils/StrongPointer.h> #include <vk/GrVkBackendContext.h> #include <vk/GrVkExtensions.h> +#include <vulkan/vulkan.h> + #include "Frame.h" #include "IRenderPipeline.h" #include "VulkanSurface.h" @@ -71,11 +70,11 @@ public: void destroy(); // Inserts a wait on fence command into the Vulkan command buffer. - status_t fenceWait(sp<Fence>& fence, GrContext* grContext); + status_t fenceWait(int fence, GrContext* grContext); // Creates a fence that is signaled when all the pending Vulkan commands are finished on the // GPU. - status_t createReleaseFence(sp<Fence>& nativeFence, GrContext* grContext); + status_t createReleaseFence(int* nativeFence, GrContext* grContext); // Returned pointers are owned by VulkanManager. // An instance of VkFunctorInitParams returned from getVkFunctorInitParams refers to |