Revert of Turned on SkSL->GLSL compiler

bench/GLBench.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GLBench.h"
 
 #if SK_SUPPORT_GPU
 #include "GrGpu.h"
 #include "GrTest.h"
 #include "gl/GrGLContext.h"
-#include "gl/builders/GrGLShaderStringBuilder.h"
-#include "SkSLCompiler.h"
 #include <stdio.h>
-#include <string>
 
 const GrGLContext* GLBench::getGLContext(SkCanvas* canvas) {
     // This bench exclusively tests GL calls directly
     if (nullptr == canvas->getGrContext()) {
         return nullptr;
     }
     GrContext* context = canvas->getGrContext();
     GrGpu* gpu = context->getGpu();
     if (!gpu) {
         SkDebugf("Couldn't get Gr gpu.");
@@ skipping 29 matching lines @@
 
 void GLBench::onDraw(int loops, SkCanvas* canvas) {
     const GrGLContext* ctx = this->getGLContext(canvas);
     if (!ctx) {
         return;
     }
     this->glDraw(loops, ctx);
     canvas->getGrContext()->resetContext();
 }
 
-GrGLuint GLBench::CompileShader(const GrGLContext* context, const char* sksl, GrGLenum type) {
-    const GrGLInterface* gl = context->interface();
-    std::string glsl;
-    bool result = context->compiler()->toGLSL(type == GR_GL_VERTEX_SHADER 
-                                                                    ? SkSL::Program::kVertex_Kind
-                                                                    : SkSL::Program::kFragment_Kind,
-                                              std::string(sksl),
-                                              GrGLSkSLCapsForContext(*context),
-                                              &glsl);
-    if (!result) {
-        SkDebugf("SkSL compilation failed:\n%s\n%s\n", sksl, 
-                 context->compiler()->errorText().c_str());
-    }
+GrGLuint GLBench::CompileShader(const GrGLInterface* gl, const char* shaderSrc, GrGLenum type) {
     GrGLuint shader;
     // Create the shader object
     GR_GL_CALL_RET(gl, shader, CreateShader(type));
 
     // Load the shader source
-    const char* glslPtr = glsl.c_str();
-    GR_GL_CALL(gl, ShaderSource(shader, 1, (const char**) &glslPtr, nullptr));
+    GR_GL_CALL(gl, ShaderSource(shader, 1, &shaderSrc, nullptr));
 
     // Compile the shader
     GR_GL_CALL(gl, CompileShader(shader));
 
     // Check for compile time errors
     GrGLint success = GR_GL_INIT_ZERO;
     GrGLchar infoLog[512];
     GR_GL_CALL(gl, GetShaderiv(shader, GR_GL_COMPILE_STATUS, &success));
     if (!success) {
         GR_GL_CALL(gl, GetShaderInfoLog(shader, 512, nullptr, infoLog));
         SkDebugf("ERROR::SHADER::COMPLIATION_FAILED: %s\n", infoLog);
     }
 
     return shader;
 }
 
-GrGLuint GLBench::CreateProgram(const GrGLContext* context, const char* vshader, 
-                                const char* fshader) {
-    const GrGLInterface* gl = context->interface();
-    GrGLuint vertexShader = CompileShader(context, vshader, GR_GL_VERTEX_SHADER);
-    GrGLuint fragmentShader = CompileShader(context, fshader, GR_GL_FRAGMENT_SHADER);
+GrGLuint GLBench::CreateProgram(const GrGLInterface* gl, const char* vshader, const char* fshader) {
+
+    GrGLuint vertexShader = CompileShader(gl, vshader, GR_GL_VERTEX_SHADER);
+    GrGLuint fragmentShader = CompileShader(gl, fshader, GR_GL_FRAGMENT_SHADER);
 
     GrGLuint shaderProgram;
     GR_GL_CALL_RET(gl, shaderProgram, CreateProgram());
     GR_GL_CALL(gl, AttachShader(shaderProgram, vertexShader));
     GR_GL_CALL(gl, AttachShader(shaderProgram, fragmentShader));
     GR_GL_CALL(gl, LinkProgram(shaderProgram));
 
     // Check for linking errors
     GrGLint success = GR_GL_INIT_ZERO;
     GrGLchar infoLog[512];
@@ skipping 65 matching lines @@
     bm.setPixels(readback.get());
 
     if (!SkImageEncoder::EncodeFile(filename, bm, SkImageEncoder::kPNG_Type, 100)) {
         SkDebugf("------ failed to encode %s\n", filename);
         remove(filename);   // remove any partial file
         return;
     }
 }
 
 #endif