diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-12-07 12:33:05 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-07 17:56:59 +0000 |
| commit | 384fab467e2a5f1754ec26eecde946ce28046d20 (patch) | |
| tree | c19ad170f2932c666c937736be71237c335e79b3 /tools/sk_app | |
| parent | 1cfb6bc9b63e9840d198a1ea8b1a20da2bfde818 (diff) | |
sk_spification of GrGpu creation.
Make GrContext::MakeGL take interface as sk_sp.
Make GrContext::MakeVulkan take GrVkBackendContext as sk_sp.
Change-Id: I13c22a57bd281c51738f503d9ed3418d35a466df
Reviewed-on: https://skia-review.googlesource.com/81842
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tools/sk_app')
| -rw-r--r-- | tools/sk_app/GLWindowContext.cpp | 2 | ||||
| -rw-r--r-- | tools/sk_app/VulkanWindowContext.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/sk_app/GLWindowContext.cpp b/tools/sk_app/GLWindowContext.cpp index bdfa12a8ec..d928a7bf43 100644 --- a/tools/sk_app/GLWindowContext.cpp +++ b/tools/sk_app/GLWindowContext.cpp @@ -33,7 +33,7 @@ void GLWindowContext::initializeContext() { SkASSERT(!fContext); fBackendContext = this->onInitializeContext(); - fContext = GrContext::MakeGL(fBackendContext.get(), fDisplayParams.fGrContextOptions); + fContext = GrContext::MakeGL(fBackendContext, fDisplayParams.fGrContextOptions); if (!fContext && fDisplayParams.fMSAASampleCount) { fDisplayParams.fMSAASampleCount /= 2; this->initializeContext(); diff --git a/tools/sk_app/VulkanWindowContext.cpp b/tools/sk_app/VulkanWindowContext.cpp index 5e0f12412e..35177494f7 100644 --- a/tools/sk_app/VulkanWindowContext.cpp +++ b/tools/sk_app/VulkanWindowContext.cpp @@ -72,7 +72,7 @@ void VulkanWindowContext::initializeContext() { GET_DEV_PROC(QueuePresentKHR); GET_DEV_PROC(GetDeviceQueue); - fContext = GrContext::MakeVulkan(fBackendContext.get(), fDisplayParams.fGrContextOptions); + fContext = GrContext::MakeVulkan(fBackendContext, fDisplayParams.fGrContextOptions); fSurface = fCreateVkSurfaceFn(instance); if (VK_NULL_HANDLE == fSurface) { |