From 15341a284e78651d2b47b89753044f8d6e7eda0a Mon Sep 17 00:00:00 2001 From: jvanverth Date: Mon, 10 Oct 2016 09:18:23 -0700 Subject: Revert of Turned on SkSL->GLSL compiler (patchset #47 id:1200001 of https://codereview.chromium.org/2288033003/ ) Reason for revert: Looks like it introduces new static initializers, and it's failing the Chrome roll. Original issue's description: > Turned on SkSL->GLSL compiler > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003 > > Committed: https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3 > Committed: https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310 > Committed: https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89 > Committed: https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b TBR=benjaminwagner@google.com,bsalomon@google.com,egdaniel@google.com,ethannicholas@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.chromium.org/2403083002 --- src/gpu/gl/GrGLContext.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'src/gpu/gl/GrGLContext.h') diff --git a/src/gpu/gl/GrGLContext.h b/src/gpu/gl/GrGLContext.h index 8207ac89b0..6016f6859a 100644 --- a/src/gpu/gl/GrGLContext.h +++ b/src/gpu/gl/GrGLContext.h @@ -15,9 +15,6 @@ #include "GrGLUtil.h" struct GrContextOptions; -namespace SkSL { - class Compiler; -} /** * Encapsulates information about an OpenGL context including the OpenGL @@ -42,8 +39,6 @@ public: const GrGLExtensions& extensions() const { return fInterface->fExtensions; } - virtual ~GrGLContextInfo() {} - protected: struct ConstructorArgs { const GrGLInterface* fInterface; @@ -69,7 +64,7 @@ protected: }; /** - * Extension of GrGLContextInfo that also provides access to GrGLInterface and SkSL::Compiler. + * Extension of GrGLContextInfo that also provides access to GrGLInterface. */ class GrGLContext : public GrGLContextInfo { public: @@ -81,16 +76,8 @@ public: const GrGLInterface* interface() const { return fInterface; } - SkSL::Compiler* compiler() const; - - ~GrGLContext() override; - private: - GrGLContext(const ConstructorArgs& args) - : INHERITED(args) - , fCompiler(nullptr) {} - - mutable SkSL::Compiler* fCompiler; + GrGLContext(const ConstructorArgs& args) : INHERITED(args) {} typedef GrGLContextInfo INHERITED; }; -- cgit v1.2.3