diff options
| author |  jvanverth <jvanverth@google.com> | 2016-10-10 09:18:23 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-10-10 09:18:23 -0700 |
| commit | 15341a284e78651d2b47b89753044f8d6e7eda0a (patch) | |
| tree | 80e2eecf6c4d11f4aa078afcb2181af156934b6f /bench/GLVertexAttributesBench.cpp | |
| parent | e75c19f6380dd07a19faa39edcdbd75c79c7414d (diff) | |
Revert of Turned on SkSL->GLSL compiler (patchset #47 id:1200001 of https://codereview.chromium.org/2288033003/ )
Reason for revert:
Looks like it introduces new static initializers, and it's failing the Chrome roll.
Original issue's description:
> 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
> Committed: https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
TBR=benjaminwagner@google.com,bsalomon@google.com,egdaniel@google.com,ethannicholas@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2403083002
Diffstat (limited to 'bench/GLVertexAttributesBench.cpp')
| -rw-r--r-- | bench/GLVertexAttributesBench.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bench/GLVertexAttributesBench.cpp b/bench/GLVertexAttributesBench.cpp index f579a3ea39..040ca18300 100644 --- a/bench/GLVertexAttributesBench.cpp +++ b/bench/GLVertexAttributesBench.cpp @@ -114,6 +114,8 @@ 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); @@ -125,7 +127,7 @@ GrGLuint GLVertexAttributesBench::setupShader(const GrGLContext* ctx, uint32_t a fshaderTxt.append(";\n"); fsOutName = oFragColor.c_str(); } else { - fsOutName = "sk_FragColor"; + fsOutName = "gl_FragColor"; } for (uint32_t i = 0; i < maxAttribs; i++) { @@ -147,7 +149,7 @@ GrGLuint GLVertexAttributesBench::setupShader(const GrGLContext* ctx, uint32_t a fshaderTxt.append(";\n" "}\n"); - return CreateProgram(ctx, vshaderTxt.c_str(), fshaderTxt.c_str()); + return CreateProgram(gl, vshaderTxt.c_str(), fshaderTxt.c_str()); } /////////////////////////////////////////////////////////////////////////////////////////////////// |