commit 7970765f7db5919ef5c6ad04b1a1bfe6505355c6
author Ethan Nicholas <ethannicholas@google.com> Thu Nov 16 11:20:11 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Nov 16 17:52:42 2017 +0000
tree e0cee4fbe8ab0598b24331e12c9cf1d750f4a534
parent b5fb7cf0163ccb939f90ecf53ef70732c01f23ae

Switched SkSL from using raw strings back to STRINGIFY

Stringify was stripping the comments from the strings, whereas raw
strings preserve them, which led to an increase in executable
size. The only effect of this change is to strip the comments back
out.

Bug: 784880
Change-Id: Icf2f9cf522cb890179f2e481a3504e8171732705
Reviewed-on: https://skia-review.googlesource.com/72524
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

gn/create_sksl_enums.py

diff --git a/gn/create_sksl_enums.py b/gn/create_sksl_enums.py
index 9a7f939..e7f0115 100644
--- a/gn/create_sksl_enums.py
+++ b/gn/create_sksl_enums.py
@@ -11,10 +11,10 @@
 
 src = open(sys.argv[1], 'r')
 dst = open(sys.argv[2], 'w')
-dst.write('R"(')
+dst.write('STRINGIFY(')
 for line in src.readlines():
     if not line.startswith("#"):
         dst.write(line)
-dst.write(')"\n')
+dst.write(')\n')
 src.close()
 dst.close()

src/sksl/SkSLCompiler.cpp

diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index 3b91511..a38d280 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -31,6 +31,8 @@
 
 // include the built-in shader symbols as static strings
 
+#define STRINGIFY(x) #x
+
 static const char* SKSL_INCLUDE =
 #include "sksl.include"
 ;

src/sksl/sksl.include

diff --git a/src/sksl/sksl.include b/src/sksl/sksl.include
index 9621f88..2b433eb 100644
--- a/src/sksl/sksl.include
+++ b/src/sksl/sksl.include
@@ -1,4 +1,4 @@
-R"(
+STRINGIFY(
 
 // defines built-in functions supported by SkiaSL
 
@@ -330,11 +330,11 @@
 $gfloat4subpassLoad(gsubpassInput subpass);
 $gfloat4subpassLoad(gsubpassInputMS subpass, int sample);
 */
-)"
+)
 
 // split into multiple chunks, as MSVC++ complains if a single string is too long
 
-R"(
+STRINGIFY(
 
 half4 texture($gsampler1D sampler, float2 P);
 half4 texture($gsampler1D sampler, float2 P, float bias);
@@ -560,4 +560,4 @@
 void groupMemoryBarrier();
 */
 
-)"
+)

src/sksl/sksl_fp.include

diff --git a/src/sksl/sksl_fp.include b/src/sksl/sksl_fp.include
index 9b1eb2a..d407fd0 100644
--- a/src/sksl/sksl_fp.include
+++ b/src/sksl/sksl_fp.include
@@ -1,4 +1,4 @@
-R"(
+STRINGIFY(
 
 // defines built-in interfaces supported by SkiaSL fragment shaders
 
@@ -22,4 +22,4 @@
 layout(builtin=10006) sampler2D[] sk_TextureSamplers;
 
 half4 process(fragmentProcessor fp);
-)"
+)

src/sksl/sksl_frag.include

diff --git a/src/sksl/sksl_frag.include b/src/sksl/sksl_frag.include
index c041dbf..e96165b 100644
--- a/src/sksl/sksl_frag.include
+++ b/src/sksl/sksl_frag.include
@@ -1,4 +1,4 @@
-R"(
+STRINGIFY(
 
 // defines built-in interfaces supported by SkiaSL fragment shaders
 
@@ -18,4 +18,4 @@
 
 layout(location=0,index=0,builtin=10001) out half4 sk_FragColor;
 
-)"
+)

src/sksl/sksl_geom.include

diff --git a/src/sksl/sksl_geom.include b/src/sksl/sksl_geom.include
index fcac8da..3e5ffae 100644
--- a/src/sksl/sksl_geom.include
+++ b/src/sksl/sksl_geom.include
@@ -1,4 +1,4 @@
-R"(
+STRINGIFY(
 
 // defines built-in interfaces supported by SkiaSL geometry shaders
 
@@ -21,4 +21,4 @@
 sk_has_side_effects void EmitVertex();
 sk_has_side_effects void EndPrimitive();
 
-)"
+)

src/sksl/sksl_vert.include

diff --git a/src/sksl/sksl_vert.include b/src/sksl/sksl_vert.include
index 4cc0646..da2a1a2 100644
--- a/src/sksl/sksl_vert.include
+++ b/src/sksl/sksl_vert.include
@@ -1,4 +1,4 @@
-R"(
+STRINGIFY(
 
 // defines built-in interfaces supported by SkiaSL vertex shaders
 
@@ -11,4 +11,4 @@
 layout(builtin=5) in int sk_VertexID;
 layout(builtin=6) in int sk_InstanceID;
 
-)"
+)