aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/sk_app
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2018-03-23 16:10:36 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-03-23 21:12:50 +0000
commit032aaae5be51e92ec9677d6c511241b19a7cb70d (patch)
tree8fe817c2a16ff23bcb18dfda5a70cec1cc9524de /tools/sk_app
parenta6a3df7d64dc81082619ab103450fc6d0af7c644 (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/sk_app')
-rw-r--r--tools/sk_app/GLWindowContext.h4
-rw-r--r--tools/sk_app/RasterWindowContext.h3
-rw-r--r--tools/sk_app/VulkanWindowContext.h4
-rw-r--r--tools/sk_app/WindowContext.h1
4 files changed, 0 insertions, 12 deletions
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<VkSurfaceKHR(VkInstance)>;
/** 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; }