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 --- bench/nanobench.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'bench/nanobench.cpp') diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index c097a4d14e..99bea4f60f 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -58,18 +58,22 @@ extern bool gSkForceRasterPipelineBlitter; #ifndef SK_BUILD_FOR_WIN #include + #endif #if SK_SUPPORT_GPU - #include "gl/GrGLDefines.h" #include "GrCaps.h" - #include "GrContextPriv.h" #include "GrContextFactory.h" - #include "gl/GrGLUtil.h" + #include "GrContextPriv.h" #include "SkGr.h" + #include "gl/GrGLDefines.h" + #include "gl/GrGLGpu.h" + #include "gl/GrGLUtil.h" + using sk_gpu_test::ContextInfo; using sk_gpu_test::GrContextFactory; using sk_gpu_test::TestContext; + GrContextOptions grContextOpts; #endif @@ -217,8 +221,9 @@ struct GPUTarget : public Target { void fillOptions(ResultsWriter* log) override { const GrGLubyte* version; if (this->contextInfo.backend() == kOpenGL_GrBackend) { - const GrGLInterface* gl = reinterpret_cast( - this->contextInfo.testContext()->backendContext()); + const GrGLInterface* gl = + static_cast(this->contextInfo.grContext()->contextPriv().getGpu()) + ->glInterface(); GR_GL_CALL_RET(gl, version, GetString(GR_GL_VERSION)); log->configOption("GL_VERSION", (const char*)(version)); -- cgit v1.2.3