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

Unified Diff: src/sksl/sksl_frag.include

Issue 2288033003: Turned on SkSL->GLSL compiler (Closed)
Patch Set: fixed broken test Created 4 years, 3 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
Index: src/sksl/sksl_frag.include
diff --git a/src/sksl/sksl_frag.include b/src/sksl/sksl_frag.include
index 123c3393a20c5a3573e8239ab7336cc841cfb29c..ed63d4af1631d3e742123b0bf95e85a9e7589c73 100644
--- a/src/sksl/sksl_frag.include
+++ b/src/sksl/sksl_frag.include
@@ -4,5 +4,16 @@ STRINGIFY(
layout(builtin=15) in vec4 gl_FragCoord;
-)
+// 9999 is a temporary value that causes us to ignore these declarations beyond
+// adding them to the symbol table. This works fine in GLSL (where they do not
+// require any further handling) but will fail in SPIR-V. We'll have a better
+// solution for this soon.
+layout(builtin=9999) vec4 gl_LastFragData[1];
+layout(builtin=9999) vec4 gl_LastFragColor;
+layout(builtin=9999) vec4 gl_LastFragColorARM;
+layout(builtin=9999) int gl_SampleMaskIn[];
+layout(builtin=9999) out int gl_SampleMask[];
+
+layout(location=0,index=0,builtin=10001) out vec4 sk_FragColor;
+)
« src/sksl/sksl.flex ('K') | « src/sksl/sksl.include ('k') | tests/SkSLErrorTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698