commit ff6a7cd4d2da9a8c992a20da01cd439bfb008b5c
author Brian Salomon <bsalomon@google.com> Thu May 10 09:42:27 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu May 10 14:15:05 2018 +0000
tree 2efddca95f699efae7fbb3beeafb437737070c42
parent 333031b921264508ca1869769c1021bc08e4e07a

Revert "Revert "Don't use GrRRectBlurEffect for large rects when highp is not full float""

This reverts commit 729715298c8af1d2ecc4cbe887eeeb9a1c17c595.

Changed std::abs() to SkScalarAbs() and #include "SkScalar.h"

Change-Id: I9a02ca1a63eef748f9a11d324e8bb89e14571bc9
Reviewed-on: https://skia-review.googlesource.com/127320
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/effects/GrRectBlurEffect.cpp

diff --git a/src/gpu/effects/GrRectBlurEffect.cpp b/src/gpu/effects/GrRectBlurEffect.cpp
index f537361..219fefa 100644
--- a/src/gpu/effects/GrRectBlurEffect.cpp
+++ b/src/gpu/effects/GrRectBlurEffect.cpp
@@ -160,6 +160,7 @@
     float sigma = data->fRandom->nextRangeF(3, 8);
     float width = data->fRandom->nextRangeF(200, 300);
     float height = data->fRandom->nextRangeF(200, 300);
-    return GrRectBlurEffect::Make(data->proxyProvider(), SkRect::MakeWH(width, height), sigma);
+    return GrRectBlurEffect::Make(data->proxyProvider(), *data->caps()->shaderCaps(),
+                                  SkRect::MakeWH(width, height), sigma);
 }
 #endif

src/gpu/effects/GrRectBlurEffect.fp

diff --git a/src/gpu/effects/GrRectBlurEffect.fp b/src/gpu/effects/GrRectBlurEffect.fp
index ed9a1e7..814dedb 100644
--- a/src/gpu/effects/GrRectBlurEffect.fp
+++ b/src/gpu/effects/GrRectBlurEffect.fp
@@ -8,6 +8,7 @@
 @header {
     #include "GrProxyProvider.h"
     #include "SkBlurMask.h"
+    #include "SkScalar.h"
 }
 
 in uniform float4 rect;
@@ -84,7 +85,17 @@
 
 @make {
      static std::unique_ptr<GrFragmentProcessor> Make(GrProxyProvider* proxyProvider,
+                                                      const GrShaderCaps& caps,
                                                       const SkRect& rect, float sigma) {
+         if (!caps.floatIs32Bits()) {
+             // We promote the rect uniform from half to float when it has large values for
+             // precision. If we don't have full float then fail.
+             if (SkScalarAbs(rect.fLeft) > 16000.f || SkScalarAbs(rect.fTop) > 16000.f ||
+                 SkScalarAbs(rect.fRight) > 16000.f || SkScalarAbs(rect.fBottom) > 16000.f ||
+                 SkScalarAbs(rect.width()) > 16000.f || SkScalarAbs(rect.height()) > 16000.f) {
+                 return nullptr;
+             }
+         }
          int doubleProfileSize = SkScalarCeilToInt(12*sigma);
 
          if (doubleProfileSize >= rect.width() || doubleProfileSize >= rect.height()) {
@@ -142,5 +153,6 @@
     float sigma = data->fRandom->nextRangeF(3,8);
     float width = data->fRandom->nextRangeF(200,300);
     float height = data->fRandom->nextRangeF(200,300);
-    return GrRectBlurEffect::Make(data->proxyProvider(), SkRect::MakeWH(width, height), sigma);
+    return GrRectBlurEffect::Make(data->proxyProvider(), *data->caps()->shaderCaps(),
+                                  SkRect::MakeWH(width, height), sigma);
 }

src/gpu/effects/GrRectBlurEffect.h

diff --git a/src/gpu/effects/GrRectBlurEffect.h b/src/gpu/effects/GrRectBlurEffect.h
index 47e9dc3..8307a49 100644
--- a/src/gpu/effects/GrRectBlurEffect.h
+++ b/src/gpu/effects/GrRectBlurEffect.h
@@ -14,6 +14,7 @@
 
 #include "GrProxyProvider.h"
 #include "SkBlurMask.h"
+#include "SkScalar.h"
 #include "GrFragmentProcessor.h"
 #include "GrCoordTransform.h"
 class GrRectBlurEffect : public GrFragmentProcessor {
@@ -63,7 +64,17 @@
     float sigma() const { return fSigma; }
 
     static std::unique_ptr<GrFragmentProcessor> Make(GrProxyProvider* proxyProvider,
-                                                     const SkRect& rect, float sigma) {
+                                                     const GrShaderCaps& caps, const SkRect& rect,
+                                                     float sigma) {
+        if (!caps.floatIs32Bits()) {
+            // We promote the rect uniform from half to float when it has large values for
+            // precision. If we don't have full float then fail.
+            if (SkScalarAbs(rect.fLeft) > 16000.f || SkScalarAbs(rect.fTop) > 16000.f ||
+                SkScalarAbs(rect.fRight) > 16000.f || SkScalarAbs(rect.fBottom) > 16000.f ||
+                SkScalarAbs(rect.width()) > 16000.f || SkScalarAbs(rect.height()) > 16000.f) {
+                return nullptr;
+            }
+        }
         int doubleProfileSize = SkScalarCeilToInt(12 * sigma);
 
         if (doubleProfileSize >= rect.width() || doubleProfileSize >= rect.height()) {