Enabling Perlin Noise on Android

src/effects/SkPerlinNoiseShader.cpp

Index: src/effects/SkPerlinNoiseShader.cpp
diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp
index bbd550a6a3cdc9588691b0ae47b81caa42a7f2a9..5c6aa86f292771f75daadfa07b96486b8c3658ec 100644
--- a/src/effects/SkPerlinNoiseShader.cpp
+++ b/src/effects/SkPerlinNoiseShader.cpp
@@ -494,8 +494,7 @@ void SkPerlinNoiseShader::shadeSpan16(int x, int y, uint16_t result[], int count
 
 /////////////////////////////////////////////////////////////////////
 
-#if SK_SUPPORT_GPU && !defined(SK_BUILD_FOR_ANDROID)
-// CPU noise is faster on Android, so the GPU implementation is only for desktop
+#if SK_SUPPORT_GPU
 
 #include "GrTBackendEffectFactory.h"
 
@@ -1008,23 +1007,32 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
     // [-1,1] vector and perform a dot product between that vector and the provided vector.
     const char* dotLattice  = "dot(((%s.ga + %s.rb * vec2(%s)) * vec2(2.0) - vec2(1.0)), %s);";
 
+    GrGLShaderVar::Precision precision = GrGLShaderVar::kDefault_Precision;
+    const char* precisionString = "";
+#if defined(SK_BUILD_FOR_ANDROID)

[bsalomon, 2013/06/13 16:11:31]

Do we really need this to be an android-only flag?  Can we do it all the time,
or if on ES2?

[sugoi, 2013/06/13 16:57:13]

I can remove it if you want. Note that GrGLShaderVar::PrecisionString() will
only return a non empty precision string if the binding is ES2. Is Angle also
using ES2 binding ? If so, I'll have to double check that Angle handles these
keywords well.

[sugoi, 2013/06/13 18:04:42]

Done.

+        // Android precision for NON Tegra devices, like, for example: Nexus 10 (ARM's Mali-T604)
+        // The value of perlinNoise is 4096.0, so we need a high precision float to store this
+        precision = GrGLShaderVar::kHigh_Precision;
+        precisionString = GrGLShaderVar::PrecisionString(precision, builder->ctxInfo().binding());
+#endif
+
     // Add noise function
     static const GrGLShaderVar gPerlinNoiseArgs[] =  {
         GrGLShaderVar(chanCoord, kFloat_GrSLType),
-        GrGLShaderVar(noiseVec, kVec2f_GrSLType)
+        GrGLShaderVar(noiseVec, kVec2f_GrSLType, GrGLShaderVar::kNonArray, precision)
     };
 
     static const GrGLShaderVar gPerlinNoiseStitchArgs[] =  {
         GrGLShaderVar(chanCoord, kFloat_GrSLType),
-        GrGLShaderVar(noiseVec, kVec2f_GrSLType),
-        GrGLShaderVar(stitchData, kVec4f_GrSLType)
+        GrGLShaderVar(noiseVec, kVec2f_GrSLType, GrGLShaderVar::kNonArray, precision),
+        GrGLShaderVar(stitchData, kVec4f_GrSLType, GrGLShaderVar::kNonArray, precision)
     };
 
     SkString noiseCode;
 
     noiseCode.appendf(
-        "\tvec4 %s = vec4(floor(%s) + vec2(%s), fract(%s));",
-        noiseXY, noiseVec, perlinNoise, noiseVec);
+        "\t%svec4 %s = vec4(floor(%s) + vec2(%s), fract(%s));",
+        precisionString, noiseXY, noiseVec, perlinNoise, noiseVec);
 
     // smooth curve : t * t * (3 - 2 * t)
     noiseCode.appendf("\n\tvec2 %s = %s.zw * %s.zw * (vec2(3.0) - vec2(2.0) * %s.zw);",
@@ -1066,6 +1074,12 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
         noiseCode.append(".r;");

[Stephen White, 2013/06/13 16:05:15]

As mentioned, If you want to move to Ganesh's single-channel texture support at
some point, you'll need to change this swizzle to a function call, rather than
hard-coded. NBD for now, though.

     }
 
+#if defined(SK_BUILD_FOR_ANDROID)
+    // Android rounding for Tegra devices, like, for example: Xoom (Tegra 2), Nexus 7 (Tegra 3)
+    noiseCode.appendf("\n\t%s = floor(%s * vec2(255.0) + vec2(0.5)) * vec2(0.003921569);",

[sugoi, 2013/06/13 15:34:15]

1 / 255 = 0.003921569

[Stephen White, 2013/06/13 16:05:15]

This ^^ should probably be in a comment in the code. Also, a clearer explanation
of the Tegra problem would be helpful.

[sugoi, 2013/06/13 18:04:42]

Done.

+                      latticeIdx, latticeIdx);
+#endif
+
     // Get (x,y) coordinates with the permutated x
     noiseCode.appendf("\n\t%s = fract(%s + %s.yy);", latticeIdx, latticeIdx, noiseXY);
 
@@ -1088,7 +1102,7 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
     {
         SkString latticeCoords("");
         latticeCoords.appendf("vec2(%s.y, %s)", latticeIdx, chanCoord);
-        noiseCode.append("lattice = ");
+        noiseCode.append("\n\tlattice = ");
         builder->appendTextureLookup(&noiseCode, samplers[1], latticeCoords.c_str(),
             kVec2f_GrSLType);
         noiseCode.appendf(".bgra;\n\t%s.y = ", uv);
@@ -1104,7 +1118,7 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
     {
         SkString latticeCoords("");
         latticeCoords.appendf("vec2(fract(%s.y + %s), %s)", latticeIdx, inc8bit, chanCoord);
-        noiseCode.append("lattice = ");
+        noiseCode.append("\n\tlattice = ");
         builder->appendTextureLookup(&noiseCode, samplers[1], latticeCoords.c_str(),
             kVec2f_GrSLType);
         noiseCode.appendf(".bgra;\n\t%s.y = ", uv);
@@ -1116,7 +1130,7 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
     {
         SkString latticeCoords("");
         latticeCoords.appendf("vec2(fract(%s.x + %s), %s)", latticeIdx, inc8bit, chanCoord);
-        noiseCode.append("lattice = ");
+        noiseCode.append("\n\tlattice = ");
         builder->appendTextureLookup(&noiseCode, samplers[1], latticeCoords.c_str(),
             kVec2f_GrSLType);
         noiseCode.appendf(".bgra;\n\t%s.x = ", uv);
@@ -1130,13 +1144,13 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
 
     SkString noiseFuncName;
     if (fStitchTiles) {
-        builder->emitFunction(GrGLShaderBuilder::kFragment_ShaderType, kFloat_GrSLType, "perlinnoise",
-                              SK_ARRAY_COUNT(gPerlinNoiseStitchArgs), gPerlinNoiseStitchArgs,
-                              noiseCode.c_str(), &noiseFuncName);
+        builder->emitFunction(GrGLShaderBuilder::kFragment_ShaderType, kFloat_GrSLType,
+                              "perlinnoise", SK_ARRAY_COUNT(gPerlinNoiseStitchArgs),
+                              gPerlinNoiseStitchArgs, noiseCode.c_str(), &noiseFuncName);
     } else {
-        builder->emitFunction(GrGLShaderBuilder::kFragment_ShaderType, kFloat_GrSLType, "perlinnoise",
-                              SK_ARRAY_COUNT(gPerlinNoiseArgs), gPerlinNoiseArgs,
-                              noiseCode.c_str(), &noiseFuncName);
+        builder->emitFunction(GrGLShaderBuilder::kFragment_ShaderType, kFloat_GrSLType,
+                              "perlinnoise", SK_ARRAY_COUNT(gPerlinNoiseArgs),
+                              gPerlinNoiseArgs, noiseCode.c_str(), &noiseFuncName);
     }
 
     // There are rounding errors if the floor operation is not performed here
@@ -1148,7 +1162,7 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
 
     if (fStitchTiles) {
         // Set up TurbulenceInitial stitch values.
-        builder->fsCodeAppendf("\n\t\tvec4 %s = %s;", stitchData, stitchDataUni);
+        builder->fsCodeAppendf("\n\t\t%s vec4 %s = %s;", precisionString, stitchData, stitchDataUni);
     }
 
     builder->fsCodeAppendf("\n\t\tfloat %s = 1.0;", ratio);
@@ -1187,7 +1201,8 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
 
     if (fStitchTiles) {
         builder->fsCodeAppendf("\n\t\t\t%s.xz *= vec2(2.0);", stitchData);
-        builder->fsCodeAppendf("\n\t\t\t%s.yw = %s.xz + vec2(%s);", stitchData, stitchData, perlinNoise);
+        builder->fsCodeAppendf("\n\t\t\t%s.yw = %s.xz + vec2(%s);",
+                               stitchData, stitchData, perlinNoise);
     }
     builder->fsCodeAppend("\n\t\t}"); // end of the for loop on octaves
 
@@ -1334,9 +1349,7 @@ GrEffectRef* SkPerlinNoiseShader::asNewEffect(GrContext* context, const SkPaint&
 #else
 
 GrEffectRef* SkPerlinNoiseShader::asNewEffect(GrContext*, const SkPaint&) const {
-#if !defined(SK_BUILD_FOR_ANDROID)
     SkDEBUGFAIL("Should not call in GPU-less build");
-#endif
     return NULL;
 }