diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-12-07 12:33:05 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-07 17:56:59 +0000 |
| commit | 384fab467e2a5f1754ec26eecde946ce28046d20 (patch) | |
| tree | c19ad170f2932c666c937736be71237c335e79b3 /tools/gpu | |
| parent | 1cfb6bc9b63e9840d198a1ea8b1a20da2bfde818 (diff) | |
sk_spification of GrGpu creation.
Make GrContext::MakeGL take interface as sk_sp.
Make GrContext::MakeVulkan take GrVkBackendContext as sk_sp.
Change-Id: I13c22a57bd281c51738f503d9ed3418d35a466df
Reviewed-on: https://skia-review.googlesource.com/81842
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tools/gpu')
| -rw-r--r-- | tools/gpu/gl/GLTestContext.cpp | 2 | ||||
| -rw-r--r-- | tools/gpu/gl/GLTestContext.h | 2 | ||||
| -rw-r--r-- | tools/gpu/vk/VkTestContext.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/gpu/gl/GLTestContext.cpp b/tools/gpu/gl/GLTestContext.cpp index 76e38b71b4..2c1d977b76 100644 --- a/tools/gpu/gl/GLTestContext.cpp +++ b/tools/gpu/gl/GLTestContext.cpp @@ -344,7 +344,7 @@ GrGLint GLTestContext::createTextureRectangle(int width, int height, GrGLenum in } sk_sp<GrContext> GLTestContext::makeGrContext(const GrContextOptions& options) { - return GrContext::MakeGL(fGL.get(), options); + return GrContext::MakeGL(fGL, options); } } // namespace sk_gpu_test diff --git a/tools/gpu/gl/GLTestContext.h b/tools/gpu/gl/GLTestContext.h index b5dd9acf8a..02fe78e33e 100644 --- a/tools/gpu/gl/GLTestContext.h +++ b/tools/gpu/gl/GLTestContext.h @@ -27,7 +27,7 @@ public: bool isValid() const { return SkToBool(this->gl()); } - const GrGLInterface *gl() const { return fGL.get(); } + const GrGLInterface* gl() const { return fGL.get(); } /** Used for testing EGLImage integration. Take a GL_TEXTURE_2D and wraps it in an EGL Image */ virtual GrEGLImage texture2DToEGLImage(GrGLuint /*texID*/) const { return nullptr; } diff --git a/tools/gpu/vk/VkTestContext.cpp b/tools/gpu/vk/VkTestContext.cpp index fa40c7374a..25069fe521 100644 --- a/tools/gpu/vk/VkTestContext.cpp +++ b/tools/gpu/vk/VkTestContext.cpp @@ -137,7 +137,7 @@ public: void finish() override {} sk_sp<GrContext> makeGrContext(const GrContextOptions& options) override { - return GrContext::MakeVulkan(fVk.get(), options); + return GrContext::MakeVulkan(fVk, options); } protected: |