diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-27 10:48:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-30 10:52:07 +0000 |
| commit | 9c9a711ac5d8f32ac318d0e4ecab7b3a26bc2150 (patch) | |
| tree | 927f6acdccb70e544dd94a129f656ca311e87006 /external/skia/share-grcontext.patch.1 | |
| parent | e2c811e6f9c0b2de47153a70a783f4d808eab3ab (diff) | |
Update skia to m111
(*) Remove patches already upstream
(*) Remove the skia_sk_cpu_sse_level_0_by_default.patch.1 patch and rather set
that define via -D parameter, because that is how the skia BUILD.gn
seems to do it.
(*) I hand edited the PCH file, because running the update_pch script failed for me.
Change-Id: I1fd175b9f63f8d2792a1876e4ece03fe92fb5374
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146251
Tested-by: Jenkins
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'external/skia/share-grcontext.patch.1')
| -rw-r--r-- | external/skia/share-grcontext.patch.1 | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/external/skia/share-grcontext.patch.1 b/external/skia/share-grcontext.patch.1 index 2a957c284358..c2f132047971 100644 --- a/external/skia/share-grcontext.patch.1 +++ b/external/skia/share-grcontext.patch.1 @@ -278,7 +278,7 @@ index c9db528ca4..634034da5a 100644 PFN_vkGetInstanceProcAddr getInstanceProc = fGetInstanceProcAddr; - GrVkBackendContext backendContext; + GrVkBackendContext& backendContext = fGlobalShared->backendContext; - GrVkExtensions extensions; + skgpu::VulkanExtensions extensions; - VkPhysicalDeviceFeatures2 features; - if (!sk_gpu_test::CreateVkBackendContext(getInstanceProc, &backendContext, &extensions, - &features, &fDebugCallback, &fPresentQueueIndex, @@ -327,10 +327,10 @@ index c9db528ca4..634034da5a 100644 + localGetPhysicalDeviceProperties(backendContext.fPhysicalDevice, &d->physDeviceProperties); + uint32_t physDevVersion = d->physDeviceProperties.apiVersion; -- fInterface.reset(new GrVkInterface(backendContext.fGetProc, fInstance, fDevice, -+ d->fInterface.reset(new GrVkInterface(backendContext.fGetProc, d->fInstance, d->fDevice, - backendContext.fInstanceVersion, physDevVersion, - &extensions)); +- fInterface.reset(new skgpu::VulkanInterface(backendContext.fGetProc, fInstance, fDevice, ++ d->fInterface.reset(new skgpu::VulkanInterface(backendContext.fGetProc, d->fInstance, d->fDevice, + backendContext.fInstanceVersion, physDevVersion, + &extensions)); - GET_PROC(DestroyInstance); - if (fDebugCallback != VK_NULL_HANDLE) { @@ -650,8 +650,8 @@ index c9db528ca4..634034da5a 100644 GrFlushInfo info; info.fNumSemaphores = 1; info.fSignalSemaphores = &beSemaphore; -- GrBackendSurfaceMutableState presentState(VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, fPresentQueueIndex); -+ GrBackendSurfaceMutableState presentState(VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, fShared->fPresentQueueIndex); +- skgpu::MutableTextureState presentState(VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, fPresentQueueIndex); ++ skgpu::MutableTextureState presentState(VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, fShared->fPresentQueueIndex); surface->flush(info, &presentState); surface->recordingContext()->asDirectContext()->submit(); @@ -666,7 +666,7 @@ diff --git a/tools/sk_app/VulkanWindowContext.h b/tools/sk_app/VulkanWindowConte index 7e1fdd9af5..946bca7522 100644 --- a/tools/sk_app/VulkanWindowContext.h +++ b/tools/sk_app/VulkanWindowContext.h -@@ -19,18 +19,22 @@ +@@ -19,20 +19,24 @@ #include "tools/gpu/vk/VkTestUtils.h" #include "tools/sk_app/WindowContext.h" @@ -674,6 +674,8 @@ index 7e1fdd9af5..946bca7522 100644 + class GrRenderTarget; + namespace skgpu { struct VulkanInterface; } + namespace sk_app { -class VulkanWindowContext : public WindowContext { @@ -742,7 +744,7 @@ index 7e1fdd9af5..946bca7522 100644 + VkDevice fDevice = VK_NULL_HANDLE; + VkDebugReportCallbackEXT fDebugCallback = VK_NULL_HANDLE; + - sk_sp<const GrVkInterface> fInterface; + sk_sp<const skgpu::VulkanInterface> fInterface; - VkSurfaceKHR fSurface; - VkSwapchainKHR fSwapchain; |