diff options
author | Scott Lobdell <slobdell@google.com> | 2020-10-15 11:45:45 -0700 |
---|---|---|
committer | Daniel Norman <danielnorman@google.com> | 2020-10-27 13:09:24 -0700 |
commit | 449f659b21d039b8692602294b040038ac1e6ccb (patch) | |
tree | 8d7f4ce2697ad1b591d2f953e69656bc9b0a4080 /libs/hwui/renderthread/VulkanSurface.cpp | |
parent | 5cced294627474a5a42b42e442a50690d5c76661 (diff) | |
parent | fb4ede1992df0344082bbdac60bcbc2a3a0a65ba (diff) |
Merge SP1A.201015.001
Change-Id: Ie33f12a2f4c73443640c28ad128be96b3533fd8c
Diffstat (limited to 'libs/hwui/renderthread/VulkanSurface.cpp')
-rw-r--r-- | libs/hwui/renderthread/VulkanSurface.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/hwui/renderthread/VulkanSurface.cpp b/libs/hwui/renderthread/VulkanSurface.cpp index 1da09b454da7..acf4931d6144 100644 --- a/libs/hwui/renderthread/VulkanSurface.cpp +++ b/libs/hwui/renderthread/VulkanSurface.cpp @@ -16,6 +16,7 @@ #include "VulkanSurface.h" +#include <GrDirectContext.h> #include <SkSurface.h> #include <algorithm> @@ -117,7 +118,7 @@ static bool ConnectAndSetWindowDefaults(ANativeWindow* window) { VulkanSurface* VulkanSurface::Create(ANativeWindow* window, ColorMode colorMode, SkColorType colorType, sk_sp<SkColorSpace> colorSpace, - GrContext* grContext, const VulkanManager& vkManager, + GrDirectContext* grContext, const VulkanManager& vkManager, uint32_t extraBuffers) { // Connect and set native window to default configurations. if (!ConnectAndSetWindowDefaults(window)) { @@ -310,7 +311,7 @@ bool VulkanSurface::UpdateWindow(ANativeWindow* window, const WindowInfo& window } VulkanSurface::VulkanSurface(ANativeWindow* window, const WindowInfo& windowInfo, - GrContext* grContext) + GrDirectContext* grContext) : mNativeWindow(window), mWindowInfo(windowInfo), mGrContext(grContext) {} VulkanSurface::~VulkanSurface() { |