diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2016-12-09 17:22:59 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-12 16:42:34 +0000 |
| commit | ce33f10677630e34187b661a02161378d8304d68 (patch) | |
| tree | 570afa6dc9fc971ab1b886563a04b48cfd41156b /bench | |
| parent | f44703a87f532b3f593d91605d66d52c6bbc45c9 (diff) | |
added sk_FragCoord support to skslc
BUG=skia:
Change-Id: If78a4d08121699f87659f0d2e35f3edbf1867401
Reviewed-on: https://skia-review.googlesource.com/5408
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/GLBench.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/bench/GLBench.cpp b/bench/GLBench.cpp index 38205e29f0..0fcd56f2a9 100644 --- a/bench/GLBench.cpp +++ b/bench/GLBench.cpp @@ -68,14 +68,15 @@ 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; - bool result = context->compiler()->toGLSL(type == GR_GL_VERTEX_SHADER - ? SkSL::Program::kVertex_Kind + 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 : SkSL::Program::kFragment_Kind, - SkString(sksl), - *context->caps()->shaderCaps(), - &glsl); - if (!result) { - SkDebugf("SkSL compilation failed:\n%s\n%s\n", sksl, + SkString(sksl), + settings); + if (!program || !context->compiler()->toGLSL(*program, &glsl)) { + SkDebugf("SkSL compilation failed:\n%s\n%s\n", sksl, context->compiler()->errorText().c_str()); } GrGLuint shader; |