diff options
| author |  ethannicholas <ethannicholas@google.com> | 2016-10-10 06:40:23 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-10-10 06:40:24 -0700 |
| commit | 08b2ccf398e2b81bc05d2c105837e5419899469b (patch) | |
| tree | f9338540266391ee920965581d44541b398487aa /bench/GLVertexAttributesBench.cpp | |
| parent | 3f748606d8dcac21c7fcdd07c2083f611c633ad5 (diff) | |
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
Review-Url: https://codereview.chromium.org/2288033003
Diffstat (limited to 'bench/GLVertexAttributesBench.cpp')
| -rw-r--r-- | bench/GLVertexAttributesBench.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bench/GLVertexAttributesBench.cpp b/bench/GLVertexAttributesBench.cpp index 040ca18300..f579a3ea39 100644 --- a/bench/GLVertexAttributesBench.cpp +++ b/bench/GLVertexAttributesBench.cpp @@ -114,8 +114,6 @@ GrGLuint GLVertexAttributesBench::setupShader(const GrGLContext* ctx, uint32_t a vshaderTxt.append("}\n"); - const GrGLInterface* gl = ctx->interface(); - // setup fragment shader GrGLSLShaderVar oFragColor("o_FragColor", kVec4f_GrSLType, GrShaderVar::kOut_TypeModifier); SkString fshaderTxt(version); @@ -127,7 +125,7 @@ GrGLuint GLVertexAttributesBench::setupShader(const GrGLContext* ctx, uint32_t a fshaderTxt.append(";\n"); fsOutName = oFragColor.c_str(); } else { - fsOutName = "gl_FragColor"; + fsOutName = "sk_FragColor"; } for (uint32_t i = 0; i < maxAttribs; i++) { @@ -149,7 +147,7 @@ GrGLuint GLVertexAttributesBench::setupShader(const GrGLContext* ctx, uint32_t a fshaderTxt.append(";\n" "}\n"); - return CreateProgram(gl, vshaderTxt.c_str(), fshaderTxt.c_str()); + return CreateProgram(ctx, vshaderTxt.c_str(), fshaderTxt.c_str()); } /////////////////////////////////////////////////////////////////////////////////////////////////// |