Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1118)

Unified Diff: bench/GLVertexAttributesBench.cpp

Issue 2408053002: Revert of Turned on SkSL->GLSL compiler (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « bench/GLVec4ScalarBench.cpp ('k') | gyp/sksl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bench/GLVertexAttributesBench.cpp
diff --git a/bench/GLVertexAttributesBench.cpp b/bench/GLVertexAttributesBench.cpp
index f579a3ea39dc6867b38d011eb4e1a378d4d72e83..040ca183004a1fce15fe094d5ebf6f793777a12b 100644
--- a/bench/GLVertexAttributesBench.cpp
+++ b/bench/GLVertexAttributesBench.cpp
@@ -114,6 +114,8 @@
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 @@
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 @@
fshaderTxt.append(";\n"
"}\n");
- return CreateProgram(ctx, vshaderTxt.c_str(), fshaderTxt.c_str());
+ return CreateProgram(gl, vshaderTxt.c_str(), fshaderTxt.c_str());
}
///////////////////////////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « bench/GLVec4ScalarBench.cpp ('k') | gyp/sksl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698