Fourth attempt to land faster rect blur. Remove unnecessary conditionals

Fourth attempt to land faster rect blur.  Remove unnecessary conditionals from the shader

BUG=skia:2095

[humper, 2014-06-17 13:53:28]

ptal -- I believe all layout tests should be rebaselineable.  I also removed the
unnecessary conditionals from the shader.

[bsalomon, 2014-06-17 14:25:59]

On 2014/06/17 13:53:28, humper wrote:
> ptal -- I believe all layout tests should be rebaselineable.  I also removed
the
> unnecessary conditionals from the shader.

Is it possible to upload this to the codereview for attempt 3 so that I can just
see the diff between 3 and 4?

[humper, 2014-06-17 14:53:30]

On 2014/06/17 14:25:59, bsalomon wrote:
> On 2014/06/17 13:53:28, humper wrote:
> > ptal -- I believe all layout tests should be rebaselineable.  I also removed
> the
> > unnecessary conditionals from the shader.
> 
> Is it possible to upload this to the codereview for attempt 3 so that I can
just
> see the diff between 3 and 4?

Possibly; the diff is here.  I will try to cherry pick the change into my old
branch for attempt 3.

diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
index fca38a1..43324f2 100644
--- a/src/effects/SkBlurMaskFilter.cpp
+++ b/src/effects/SkBlurMaskFilter.cpp
@@ -630,14 +630,11 @@ void OutputRectBlurProfileLookup(GrGLShaderBuilder*
builder,
                                  const char *profileSize, const char *loc,
                                  const char *blurred_width,
                                  const char *sharp_width) {
-    builder->fsCodeAppendf("\tfloat %s;\n", output);
-    builder->fsCodeAppendf("\t\t{\n");
-    builder->fsCodeAppendf("\t\t\tfloat coord = (0.5 * (abs(2.0*%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\t%s = ", output);
+    builder->fsCodeAppendf("\t\t%s = ", output);
     builder->fsAppendTextureLookup(sampler, "vec2(coord,0.5)");
     builder->fsCodeAppend(".a;\n");
-    builder->fsCodeAppendf("\t\t}\n");
 }
 
 void GrGLRectBlurEffect::emitCode(GrGLShaderBuilder* builder,
@@ -676,10 +673,18 @@ void GrGLRectBlurEffect::emitCode(GrGLShaderBuilder*
builder,
     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 = horiz_lookup * vert_lookup;\n");
+
     builder->fsCodeAppendf("\t%s = src * vec4(final);\n", outputColor );
 }

[humper, 2014-06-17 14:58:39]

On 2014/06/17 14:53:30, humper wrote:
> On 2014/06/17 14:25:59, bsalomon wrote:
> > On 2014/06/17 13:53:28, humper wrote:
> > > ptal -- I believe all layout tests should be rebaselineable.  I also
removed
> > the
> > > unnecessary conditionals from the shader.
> > 
> > Is it possible to upload this to the codereview for attempt 3 so that I can
> just
> > see the diff between 3 and 4?

https://codereview.chromium.org/331443003

[bsalomon, 2014-06-17 16:11:12]

On 2014/06/17 14:58:39, humper wrote:
> On 2014/06/17 14:53:30, humper wrote:
> > On 2014/06/17 14:25:59, bsalomon wrote:
> > > On 2014/06/17 13:53:28, humper wrote:
> > > > ptal -- I believe all layout tests should be rebaselineable.  I also
> removed
> > > the
> > > > unnecessary conditionals from the shader.
> > > 
> > > Is it possible to upload this to the codereview for attempt 3 so that I
can
> > just
> > > see the diff between 3 and 4?
> 
> https://codereview.chromium.org/331443003

lgtm

[humper, 2014-06-17 19:01:52]

The CQ bit was checked by humper@google.com

[commit-bot: I haz the power, 2014-06-17 19:03:57]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-17 19:03:58]

Commit queue rejected this change because it did not recognize the base URL.
Please commit your change manually.