fix 10.6 shader tests

src/effects/SkBlurMaskFilter.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBlurMaskFilter.h"
 #include "SkBlurMask.h"
@@ skipping 612 matching lines @@
 GrGLRectBlurEffect::GrGLRectBlurEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
     : INHERITED(factory) {
 }
 
 void OutputRectBlurProfileLookup(GrGLShaderBuilder* builder,
                                  const GrGLShaderBuilder::TextureSampler& sampler,
                                  const char *output,
                                  const char *profileSize, const char *loc,
                                  const char *blurred_width,
                                  const char *sharp_width) {
-    builder->fsCodeAppendf("\t\tfloat coord = (0.5 * (abs(2*%s - %s) - %s))/%s;\n",
+    builder->fsCodeAppendf("\t\tfloat coord = (0.5 * (abs(2.0*%s - %s) - %s))/%s;\n",
                            loc, blurred_width, sharp_width, profileSize);
     builder->fsCodeAppendf("\t\t%s = ", output);
     builder->fsAppendTextureLookup(sampler, "vec2(coord,0.5)");
     builder->fsCodeAppend(".a;\n");
 }
 
 void GrGLRectBlurEffect::emitCode(GrGLShaderBuilder* builder,
                                  const GrDrawEffect&,
                                  EffectKey key,
                                  const char* outputColor,
@@ skipping 19 matching lines @@
         builder->fsCodeAppendf("\tvec4 src=%s;\n", inputColor);
     } else {
         builder->fsCodeAppendf("\tvec4 src=vec4(1)\n;");
     }
 
     builder->fsCodeAppendf("\tvec2 translatedPos = %s.xy - %s.xy;\n", fragmentPos, rectName );
     builder->fsCodeAppendf("\tfloat width = %s.z - %s.x;\n", rectName, rectName);
     builder->fsCodeAppendf("\tfloat height = %s.w - %s.y;\n", rectName, rectName);
 
     builder->fsCodeAppendf("\tvec2 smallDims = vec2(width - %s, height-%s);\n", profileSizeName, profileSizeName);
-    builder->fsCodeAppendf("\tfloat center = 2.0 * floor(%s/2 + .25) - 1;\n", profileSizeName);
+    builder->fsCodeAppendf("\tfloat center = 2.0 * floor(%s/2.0 + .25) - 1.0;\n", profileSizeName);
     builder->fsCodeAppendf("\tvec2 wh = smallDims - vec2(center,center);\n");
 
     builder->fsCodeAppendf("\tfloat horiz_lookup;\n");
     builder->fsCodeAppendf("\tif (%s <= smallDims.x) {\n", profileSizeName);
     OutputRectBlurProfileLookup(builder, samplers[0], "horiz_lookup", profileSizeName, "translatedPos.x", "width", "wh.x");
     builder->fsCodeAppendf("\t}\n");
 
     builder->fsCodeAppendf("\tfloat vert_lookup;\n");
     builder->fsCodeAppendf("\tif (%s <= smallDims.y) {\n", profileSizeName);
     OutputRectBlurProfileLookup(builder, samplers[0], "vert_lookup", profileSizeName, "translatedPos.y", "height", "wh.y");
     builder->fsCodeAppendf("\t}\n");
 
     builder->fsCodeAppendf("\tfloat final = 1.0 - horiz_lookup * vert_lookup;\n");
 
-    builder->fsCodeAppendf("\t%s = vec4(final, final, final, 1);\n", outputColor );
+    builder->fsCodeAppendf("\t%s = vec4(final, final, final, 1.0);\n", outputColor );
 }
 
 void GrGLRectBlurEffect::setData(const GrGLUniformManager& uman,
                                  const GrDrawEffect& drawEffect) {
     const GrRectBlurEffect& rbe = drawEffect.castEffect<GrRectBlurEffect>();
     SkRect rect = rbe.getRect();
 
     uman.set4f(fProxyRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
     uman.set1f(fProfileSizeUniform, SkScalarCeilToScalar(6*rbe.getSigma()));
 }
@@ skipping 513 matching lines @@
     } else {
         str->append("None");
     }
     str->append("))");
 }
 #endif
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkBlurMaskFilter)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurMaskFilterImpl)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END