diff options
author | Greg Daniel <egdaniel@google.com> | 2016-12-12 17:20:42 +0000 |
---|---|---|
committer | Greg Daniel <egdaniel@google.com> | 2016-12-12 17:22:28 +0000 |
commit | e8e4a3e6782586680086a0279eafb89969c29f3d (patch) | |
tree | 93e27a37cd75c69fe85fab990f6daf17c80ed794 /bench | |
parent | d737bee1470bbba8af5c9d74cbec2d731da33804 (diff) |
Revert "added sk_FragCoord support to skslc"
This reverts commit ce33f10677630e34187b661a02161378d8304d68.
Reason for revert: Breaking many gpu bots
Change-Id: I94c813ed6a9311458c872f74bb1b0792f46ff414
Reviewed-on: https://skia-review.googlesource.com/5737
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'bench')
-rw-r--r-- | bench/GLBench.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/bench/GLBench.cpp b/bench/GLBench.cpp index 0fcd56f2a9..38205e29f0 100644 --- a/bench/GLBench.cpp +++ b/bench/GLBench.cpp @@ -68,15 +68,14 @@ void GLBench::onDraw(int loops, SkCanvas* canvas) { GrGLuint GLBench::CompileShader(const GrGLContext* context, const char* sksl, GrGLenum type) { const GrGLInterface* gl = context->interface(); SkString glsl; - SkSL::Program::Settings settings; - settings.fCaps = context->caps()->shaderCaps(); - std::unique_ptr<SkSL::Program> program = context->compiler()->convertProgram( - type == GR_GL_VERTEX_SHADER ? SkSL::Program::kVertex_Kind + bool result = context->compiler()->toGLSL(type == GR_GL_VERTEX_SHADER + ? SkSL::Program::kVertex_Kind : SkSL::Program::kFragment_Kind, - SkString(sksl), - settings); - if (!program || !context->compiler()->toGLSL(*program, &glsl)) { - SkDebugf("SkSL compilation failed:\n%s\n%s\n", sksl, + SkString(sksl), + *context->caps()->shaderCaps(), + &glsl); + if (!result) { + SkDebugf("SkSL compilation failed:\n%s\n%s\n", sksl, context->compiler()->errorText().c_str()); } GrGLuint shader; |