diff options
| author |  bsalomon <bsalomon@google.com> | 2016-04-01 07:42:05 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-01 07:42:05 -0700 |
| commit | 7c62b47800bc145369504feb3e127a70724655d4 (patch) | |
| tree | 91ea1fac410e153ff6d528e57bb6c2a5f542c4b2 /tools/gpu | |
| parent | cafbfe65a0da2af2caeeba1577c45925374b7d77 (diff) | |
Restore Vulkan setup code accidentally reverted in GrContextFactory.cpp
TBR=egdaniel@google.com,jvanverth@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1852553004
Review URL: https://codereview.chromium.org/1852553004
Diffstat (limited to 'tools/gpu')
| -rwxr-xr-x | tools/gpu/GrContextFactory.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp index e5fa2c799e..bae73a4e19 100755 --- a/tools/gpu/GrContextFactory.cpp +++ b/tools/gpu/GrContextFactory.cpp @@ -19,6 +19,9 @@ #if SK_MESA #include "gl/mesa/GLTestContext_mesa.h" #endif +#if SK_VULKAN +#include "vk/GrVkBackendContext.h" +#endif #include "gl/null/NullGLTestContext.h" #include "gl/GrGLGpu.h" #include "GrCaps.h" @@ -128,14 +131,15 @@ GrContextFactory::ContextInfo GrContextFactory::getContextInfo(GLContextType typ } glCtx->makeCurrent(); - GrBackendContext p3dctx = reinterpret_cast<GrBackendContext>(glInterface.get()); #ifdef SK_VULKAN if (kEnableNVPR_GLContextOptions & options) { return ContextInfo(); } else { + GrBackendContext p3dctx = reinterpret_cast<GrBackendContext>(GrVkBackendContext::Create()); grCtx.reset(GrContext::Create(kVulkan_GrBackend, p3dctx, fGlobalOptions)); } #else + GrBackendContext p3dctx = reinterpret_cast<GrBackendContext>(glInterface.get()); grCtx.reset(GrContext::Create(kOpenGL_GrBackend, p3dctx, fGlobalOptions)); #endif if (!grCtx.get()) { |