diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-04-24 16:49:05 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-24 21:29:44 +0000 |
| commit | c1889823de68ffd2ef08b5c1969d41c98034ec6a (patch) | |
| tree | 5c917abacf7b4db4b18630bde0be2e963d329d50 /tools | |
| parent | bb05f70b4be231d6d643d21cad43d06dcb7638a7 (diff) | |
Add new GrVkBackendContext::Create explicitly requiring vk proc getters
Also remove the feature of GrVkGpu that creates the instance/device if the client doesn't provide one.
Change-Id: Ie617313b6c684ed355333a475b80d0aae7e3a026
Reviewed-on: https://skia-review.googlesource.com/14261
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gpu/vk/VkTestContext.cpp | 3 | ||||
| -rw-r--r-- | tools/viewer/sk_app/VulkanWindowContext.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/gpu/vk/VkTestContext.cpp b/tools/gpu/vk/VkTestContext.cpp index b1e7ad450f..3e76d87830 100644 --- a/tools/gpu/vk/VkTestContext.cpp +++ b/tools/gpu/vk/VkTestContext.cpp @@ -109,7 +109,8 @@ GR_STATIC_ASSERT(sizeof(VkFence) <= sizeof(sk_gpu_test::PlatformFence)); class VkTestContextImpl : public sk_gpu_test::VkTestContext { public: static VkTestContext* Create() { - sk_sp<const GrVkBackendContext> backendContext(GrVkBackendContext::Create()); + sk_sp<const GrVkBackendContext> backendContext( + GrVkBackendContext::Create(vkGetInstanceProcAddr, vkGetDeviceProcAddr)); if (!backendContext) { return nullptr; } diff --git a/tools/viewer/sk_app/VulkanWindowContext.cpp b/tools/viewer/sk_app/VulkanWindowContext.cpp index 831c7ae0c2..f483c27163 100644 --- a/tools/viewer/sk_app/VulkanWindowContext.cpp +++ b/tools/viewer/sk_app/VulkanWindowContext.cpp @@ -41,7 +41,8 @@ VulkanWindowContext::VulkanWindowContext(const DisplayParams& params, , fBackbuffers(nullptr) { // any config code here (particularly for msaa)? - fBackendContext.reset(GrVkBackendContext::Create(&fPresentQueueIndex, canPresent)); + fBackendContext.reset(GrVkBackendContext::Create(vkGetInstanceProcAddr, vkGetDeviceProcAddr, + &fPresentQueueIndex, canPresent)); if (!(fBackendContext->fExtensions & kKHR_surface_GrVkExtensionFlag) || !(fBackendContext->fExtensions & kKHR_swapchain_GrVkExtensionFlag)) { |