diff options
author | Brian Salomon <bsalomon@google.com> | 2018-03-23 16:10:36 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-23 21:12:50 +0000 |
commit | 032aaae5be51e92ec9677d6c511241b19a7cb70d (patch) | |
tree | 8fe817c2a16ff23bcb18dfda5a70cec1cc9524de /tools/gpu | |
parent | a6a3df7d64dc81082619ab103450fc6d0af7c644 (diff) |
Remove legacy GrContext factories function and supporting code/types.
Change-Id: I437a4a0a58bf70ea1b8b0659b099a2af2bfa64fe
Reviewed-on: https://skia-review.googlesource.com/116197
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'tools/gpu')
-rw-r--r-- | tools/gpu/TestContext.h | 1 | ||||
-rw-r--r-- | tools/gpu/gl/GLTestContext.h | 3 | ||||
-rw-r--r-- | tools/gpu/mock/MockTestContext.cpp | 4 | ||||
-rw-r--r-- | tools/gpu/mtl/MtlTestContext.mm | 2 | ||||
-rw-r--r-- | tools/gpu/vk/VkTestContext.h | 3 |
5 files changed, 1 insertions, 12 deletions
diff --git a/tools/gpu/TestContext.h b/tools/gpu/TestContext.h index 5b512db7ba..2949cc709e 100644 --- a/tools/gpu/TestContext.h +++ b/tools/gpu/TestContext.h @@ -59,7 +59,6 @@ public: SkScopeExit SK_WARN_UNUSED_RESULT makeCurrentAndAutoRestore() const; virtual GrBackend backend() = 0; - virtual GrBackendContext backendContext() = 0; virtual sk_sp<GrContext> makeGrContext(const GrContextOptions&); diff --git a/tools/gpu/gl/GLTestContext.h b/tools/gpu/gl/GLTestContext.h index cea630ac49..f5a05932a2 100644 --- a/tools/gpu/gl/GLTestContext.h +++ b/tools/gpu/gl/GLTestContext.h @@ -21,9 +21,6 @@ public: ~GLTestContext() override; virtual GrBackend backend() override { return kOpenGL_GrBackend; } - virtual GrBackendContext backendContext() override { - return reinterpret_cast<GrBackendContext>(fGL.get()); - } bool isValid() const { return SkToBool(this->gl()); } diff --git a/tools/gpu/mock/MockTestContext.cpp b/tools/gpu/mock/MockTestContext.cpp index 5cc5529dfe..6075bc83c2 100644 --- a/tools/gpu/mock/MockTestContext.cpp +++ b/tools/gpu/mock/MockTestContext.cpp @@ -20,9 +20,7 @@ public: ~MockTestContext() override {} virtual GrBackend backend() override { return kMock_GrBackend; } - virtual GrBackendContext backendContext() override { - return reinterpret_cast<GrBackendContext>(nullptr); - } + void testAbandon() override {} void submit() override {} void finish() override {} diff --git a/tools/gpu/mtl/MtlTestContext.mm b/tools/gpu/mtl/MtlTestContext.mm index 38755b2ef0..cdc0f8f168 100644 --- a/tools/gpu/mtl/MtlTestContext.mm +++ b/tools/gpu/mtl/MtlTestContext.mm @@ -122,8 +122,6 @@ public: GrBackend backend() override { return kMetal_GrBackend; } - GrBackendContext backendContext() override { return 0; } - void testAbandon() override {} // There is really nothing to here since we don't own any unqueued command buffers here. diff --git a/tools/gpu/vk/VkTestContext.h b/tools/gpu/vk/VkTestContext.h index 5090f556b4..9fd4170d9d 100644 --- a/tools/gpu/vk/VkTestContext.h +++ b/tools/gpu/vk/VkTestContext.h @@ -18,9 +18,6 @@ namespace sk_gpu_test { class VkTestContext : public TestContext { public: virtual GrBackend backend() override { return kVulkan_GrBackend; } - virtual GrBackendContext backendContext() override { - return reinterpret_cast<GrBackendContext>(fVk.get()); - } sk_sp<const GrVkBackendContext> getVkBackendContext() { return fVk; |