Turned on SkSL->GLSL compiler

src/gpu/gl/GrGLContext.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrGLContext_DEFINED
 #define GrGLContext_DEFINED
 
 #include "gl/GrGLExtensions.h"
 #include "gl/GrGLInterface.h"
 #include "GrGLCaps.h"
 #include "GrGLUtil.h"
 
 struct GrContextOptions;
+namespace SkSL {
+    class Compiler;
+}
 
 /**
  * Encapsulates information about an OpenGL context including the OpenGL
  * version, the GrGLStandard type of the context, and GLSL version.
  */
 class GrGLContextInfo : public SkRefCnt {
 public:
     GrGLStandard standard() const { return fInterface->fStandard; }
     GrGLVersion version() const { return fGLVersion; }
     GrGLSLGeneration glslGeneration() const { return fGLSLGeneration; }
@@ skipping 29 matching lines @@
     GrGLVersion                         fGLVersion;
     GrGLSLGeneration                    fGLSLGeneration;
     GrGLVendor                          fVendor;
     GrGLRenderer                        fRenderer;
     GrGLDriver                          fDriver;
     GrGLDriverVersion                   fDriverVersion;
     SkAutoTUnref<GrGLCaps>              fGLCaps;
 };
 
 /**
- * Extension of GrGLContextInfo that also provides access to GrGLInterface.
+ * Extension of GrGLContextInfo that also provides access to GrGLInterface and SkSL::Compiler.
  */
 class GrGLContext : public GrGLContextInfo {
 public:
     /**
      * Creates a GrGLContext from a GrGLInterface and the currently
      * bound OpenGL context accessible by the GrGLInterface.
      */
     static GrGLContext* Create(const GrGLInterface* interface, const GrContextOptions& options);
 
     const GrGLInterface* interface() const { return fInterface; }
 
+    SkSL::Compiler* compiler();
+
 private:
-    GrGLContext(const ConstructorArgs& args) : INHERITED(args) {}
+    GrGLContext(const ConstructorArgs& args) 
+    : INHERITED(args)
+    , fCompiler(nullptr) {}
+
+    ~GrGLContext();

[bsalomon, 2016/09/12 13:48:57]

Should we declare virtual ~GrGLContextInfo()?

[ethannicholas, 2016/09/12 14:53:26]

Good catch, done.

+
+    SkSL::Compiler* fCompiler;

[bsalomon, 2016/09/12 13:48:57]

std::unique_ptr?

 
     typedef GrGLContextInfo INHERITED;
 };
 
 #endif