Fix tile drop-out on S4 for texture decal mode.

src/gpu/effects/GrTextureDomain.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrTextureDomain.h"
 #include "GrInvariantOutput.h"
 #include "GrSimpleTextureEffect.h"
@@ skipping 46 matching lines @@
             uniName.appendS32(textureDomain.fIndex);
         }
         fDomainUni = program->addUniform(GrGLProgramBuilder::kFragment_Visibility,
                                          kVec4f_GrSLType, kDefault_GrSLPrecision,
                                          uniName.c_str(), &name);
         fDomainName = name;
     }
 
     switch (textureDomain.mode()) {
         case kIgnore_Mode: {
-            builder->codeAppendf("\t%s = ", outColor);
+            builder->codeAppendf("%s = ", outColor);
             builder->appendTextureLookupAndModulate(inModulateColor, sampler,
                                                       inCoords.c_str());
-            builder->codeAppend(";\n");
+            builder->codeAppend(";");
             break;
         }
         case kClamp_Mode: {
             SkString clampedCoords;
-            clampedCoords.appendf("\tclamp(%s, %s.xy, %s.zw)",
+            clampedCoords.appendf("clamp(%s, %s.xy, %s.zw)",
                                   inCoords.c_str(), fDomainName.c_str(), fDomainName.c_str());
 
-            builder->codeAppendf("\t%s = ", outColor);
+            builder->codeAppendf("%s = ", outColor);
             builder->appendTextureLookupAndModulate(inModulateColor, sampler,
                                                       clampedCoords.c_str());
-            builder->codeAppend(";\n");
+            builder->codeAppend(";");
             break;
         }
         case kDecal_Mode: {
             // Add a block since we're going to declare variables.
             GrGLShaderBuilder::ShaderBlock block(builder);
 
             const char* domain = fDomainName.c_str();
             if (kImagination_GrGLVendor == program->ctxInfo().vendor()) {
                 // On the NexusS and GalaxyNexus, the other path (with the 'any'
                 // call) causes the compilation error "Calls to any function that
                 // may require a gradient calculation inside a conditional block
                 // may return undefined results". This appears to be an issue with
                 // the 'any' call since even the simple "result=black; if (any())
                 // result=white;" code fails to compile.
-                builder->codeAppend("\tvec4 outside = vec4(0.0, 0.0, 0.0, 0.0);\n");
-                builder->codeAppend("\tvec4 inside = ");
+                builder->codeAppend("vec4 outside = vec4(0.0, 0.0, 0.0, 0.0);");
+                builder->codeAppend("vec4 inside = ");
                 builder->appendTextureLookupAndModulate(inModulateColor, sampler,
                                                           inCoords.c_str());
-                builder->codeAppend(";\n");
-                builder->codeAppendf("\tfloat x = (%s).x;\n", inCoords.c_str());
-                builder->codeAppendf("\tfloat y = (%s).y;\n", inCoords.c_str());
+                builder->codeAppend(";");
+                
+                builder->codeAppend(GrGLShaderVar::PrecisionString(kHigh_GrSLPrecision,
+                                                                   program->ctxInfo().standard()));
+                builder->codeAppendf("float x = (%s).x;", inCoords.c_str());
+                builder->codeAppend(GrGLShaderVar::PrecisionString(kHigh_GrSLPrecision,
+                                                                   program->ctxInfo().standard()));
+                builder->codeAppendf("float y = (%s).y;", inCoords.c_str());
 
-                builder->codeAppendf("\tx = abs(2.0*(x - %s.x)/(%s.z - %s.x) - 1.0);\n",
-                                       domain, domain, domain);
-                builder->codeAppendf("\ty = abs(2.0*(y - %s.y)/(%s.w - %s.y) - 1.0);\n",
-                                       domain, domain, domain);
-                builder->codeAppend("\tfloat blend = step(1.0, max(x, y));\n");
-                builder->codeAppendf("\t%s = mix(inside, outside, blend);\n", outColor);
+                builder->codeAppendf("x = abs(2.0*(x - %s.x)/(%s.z - %s.x) - 1.0);",
+                                     domain, domain, domain);
+                builder->codeAppendf("y = abs(2.0*(y - %s.y)/(%s.w - %s.y) - 1.0);",
+                                     domain, domain, domain);
+                builder->codeAppend("float blend = step(1.0, max(x, y));");
+                builder->codeAppendf("%s = mix(inside, outside, blend);", outColor);
             } else {
-                builder->codeAppend("\tbvec4 outside;\n");
-                builder->codeAppendf("\toutside.xy = lessThan(%s, %s.xy);\n", inCoords.c_str(),
+                builder->codeAppend("bvec4 outside;\n");
+                builder->codeAppendf("outside.xy = lessThan(%s, %s.xy);", inCoords.c_str(),
                                        domain);
-                builder->codeAppendf("\toutside.zw = greaterThan(%s, %s.zw);\n", inCoords.c_str(),
+                builder->codeAppendf("outside.zw = greaterThan(%s, %s.zw);", inCoords.c_str(),
                                        domain);
-                builder->codeAppendf("\t%s = any(outside) ? vec4(0.0, 0.0, 0.0, 0.0) : ",
+                builder->codeAppendf("%s = any(outside) ? vec4(0.0, 0.0, 0.0, 0.0) : ",
                                        outColor);
                 builder->appendTextureLookupAndModulate(inModulateColor, sampler,
                                                           inCoords.c_str());
-                builder->codeAppend(";\n");
+                builder->codeAppend(";");
             }
             break;
         }
         case kRepeat_Mode: {
             SkString clampedCoords;
-            clampedCoords.printf("\tmod(%s - %s.xy, %s.zw - %s.xy) + %s.xy",
+            clampedCoords.printf("mod(%s - %s.xy, %s.zw - %s.xy) + %s.xy",
                                  inCoords.c_str(), fDomainName.c_str(), fDomainName.c_str(),
                                  fDomainName.c_str(), fDomainName.c_str());
 
-            builder->codeAppendf("\t%s = ", outColor);
+            builder->codeAppendf("%s = ", outColor);
             builder->appendTextureLookupAndModulate(inModulateColor, sampler,
                                                       clampedCoords.c_str());
-            builder->codeAppend(";\n");
+            builder->codeAppend(";");
             break;
         }
     }
 }
 
 void GrTextureDomain::GLDomain::setData(const GrGLProgramDataManager& pdman,
                                         const GrTextureDomain& textureDomain,
                                         GrSurfaceOrigin textureOrigin) {
     SkASSERT(textureDomain.mode() == fMode);
     if (kIgnore_Mode != textureDomain.mode()) {
@@ skipping 159 matching lines @@
     bool bilerp = mode != GrTextureDomain::kRepeat_Mode ? d->fRandom->nextBool() : false;
     GrCoordSet coords = d->fRandom->nextBool() ? kLocal_GrCoordSet : kDevice_GrCoordSet;
     return GrTextureDomainEffect::Create(d->fProcDataManager,
                                          d->fTextures[texIdx],
                                          matrix,
                                          domain,
                                          mode,
                                          bilerp ? GrTextureParams::kBilerp_FilterMode : GrTextureParams::kNone_FilterMode,
                                          coords);
 }