diff options
author | Brian Salomon <bsalomon@google.com> | 2017-07-06 16:40:18 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-06 21:59:18 +0000 |
commit | cfe910dc794d8def481b532bfe68f4a3ff8fc9d7 (patch) | |
tree | 68e70fcdbba3af1f5a22b4b6237aed592b3075d7 /tools/gpu/GrContextFactory.cpp | |
parent | 0f3942fc247cb541a7327b6335054694d7b8e186 (diff) |
Revert "Revert "Make mock GrContext unit testable.""
This reverts commit c867a89b012c07e7e5cb719a31ed90e61f4a4901.
Reason for revert: test
Original change's description:
> Revert "Make mock GrContext unit testable."
>
> This reverts commit 993e7e25217df05d63c3354c817e8bd18ea3738b.
>
> Reason for revert: Seeing if this fixes the NexusPlayer bots
>
> Original change's description:
> > Make mock GrContext unit testable.
> >
> > Bug: skia:
> > Change-Id: I959122f1f2c390832ab1033bcdbdd2ca6cfc0419
> > Reviewed-on: https://skia-review.googlesource.com/20699
> > Reviewed-by: Greg Daniel <egdaniel@google.com>
> > Commit-Queue: Brian Salomon <bsalomon@google.com>
>
> TBR=egdaniel@google.com,bsalomon@google.com
>
> Change-Id: I25ed9329962d930fe38108f779ff7083e0e4847e
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/21731
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
TBR=egdaniel@google.com,bsalomon@google.com
Change-Id: I62c579e087db1ff9891cf6c41b3eb40f47561887
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/21733
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tools/gpu/GrContextFactory.cpp')
-rw-r--r-- | tools/gpu/GrContextFactory.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp index 23ffad155f..d614b0643e 100644 --- a/tools/gpu/GrContextFactory.cpp +++ b/tools/gpu/GrContextFactory.cpp @@ -22,6 +22,7 @@ #endif #include "gl/null/NullGLTestContext.h" #include "gl/GrGLGpu.h" +#include "mock/MockTestContext.h" #include "GrCaps.h" #if defined(SK_BUILD_FOR_WIN32) && defined(SK_ENABLE_DISCRETE_GPU) @@ -220,6 +221,19 @@ ContextInfo GrContextFactory::getContextInfoInternal(ContextType type, ContextOv break; } #endif + case kMock_GrBackend: { + TestContext* sharedContext = masterContext ? masterContext->fTestContext : nullptr; + SkASSERT(kMock_ContextType == type); + if (ContextOverrides::kRequireNVPRSupport & overrides) { + return ContextInfo(); + } + testCtx.reset(CreateMockTestContext(sharedContext)); + if (!testCtx) { + return ContextInfo(); + } + backendContext = testCtx->backendContext(); + break; + } default: return ContextInfo(); } |