From 032aaae5be51e92ec9677d6c511241b19a7cb70d Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 23 Mar 2018 16:10:36 -0400 Subject: Remove legacy GrContext factories function and supporting code/types. Change-Id: I437a4a0a58bf70ea1b8b0659b099a2af2bfa64fe Reviewed-on: https://skia-review.googlesource.com/116197 Commit-Queue: Brian Salomon Reviewed-by: Greg Daniel --- tools/sk_app/GLWindowContext.h | 4 ---- tools/sk_app/RasterWindowContext.h | 3 --- tools/sk_app/VulkanWindowContext.h | 4 ---- tools/sk_app/WindowContext.h | 1 - 4 files changed, 12 deletions(-) (limited to 'tools/sk_app') diff --git a/tools/sk_app/GLWindowContext.h b/tools/sk_app/GLWindowContext.h index 44810c93d2..68fd1eb709 100644 --- a/tools/sk_app/GLWindowContext.h +++ b/tools/sk_app/GLWindowContext.h @@ -31,10 +31,6 @@ public: void setDisplayParams(const DisplayParams& params) override; - GrBackendContext getBackendContext() override { - return (GrBackendContext) fBackendContext.get(); - } - protected: GLWindowContext(const DisplayParams&); // This should be called by subclass constructor. It is also called when window/display diff --git a/tools/sk_app/RasterWindowContext.h b/tools/sk_app/RasterWindowContext.h index 75bde03ad7..db8600acd5 100644 --- a/tools/sk_app/RasterWindowContext.h +++ b/tools/sk_app/RasterWindowContext.h @@ -16,9 +16,6 @@ class RasterWindowContext : public WindowContext { public: RasterWindowContext(const DisplayParams& params) : WindowContext(params) {} - // Explicitly convert nullptr to GrBackendContext is needed for compiling - GrBackendContext getBackendContext() override { return (GrBackendContext) nullptr; } - protected: bool isGpuContext() override { return false; } }; diff --git a/tools/sk_app/VulkanWindowContext.h b/tools/sk_app/VulkanWindowContext.h index df6ef33959..1fca9dc83e 100644 --- a/tools/sk_app/VulkanWindowContext.h +++ b/tools/sk_app/VulkanWindowContext.h @@ -38,10 +38,6 @@ public: this->initializeContext(); } - GrBackendContext getBackendContext() override { - return (GrBackendContext) fBackendContext.get(); - } - /** Platform specific function that creates a VkSurfaceKHR for a window */ using CreateVkSurfaceFn = std::function; /** Platform specific function that determines whether presentation will succeed. */ diff --git a/tools/sk_app/WindowContext.h b/tools/sk_app/WindowContext.h index 71c21ac089..9a12f2c04b 100644 --- a/tools/sk_app/WindowContext.h +++ b/tools/sk_app/WindowContext.h @@ -45,7 +45,6 @@ public: fSurfaceProps = props; } - virtual GrBackendContext getBackendContext() = 0; GrContext* getGrContext() const { return fContext.get(); } int width() const { return fWidth; } -- cgit v1.2.3