Clip scissor to RT bounds

Clip scissor to RT bounds

R=joshualitt@google.com

NOTREECHECKS=true

Committed: https://skia.googlesource.com/skia/+/9ce30e1cd19ad813091aa9876fceb416fb781352

[bsalomon, 2015-03-06 16:09:01]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2015-03-06 16:10:29]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/985783002/1

[commit-bot: I haz the power, 2015-03-06 16:10:30]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2015-03-06 22:10 UTC

[commit-bot: I haz the power, 2015-03-06 16:10:32]

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

[commit-bot: I haz the power, 2015-03-06 16:10:33]

Failed to apply patch for src/gpu/GrClipMaskManager.cpp:
While running git apply --index -3 -p1;
  error: patch failed: src/gpu/GrClipMaskManager.cpp:240
  Falling back to three-way merge...
  Applied patch to 'src/gpu/GrClipMaskManager.cpp' with conflicts.
  U src/gpu/GrClipMaskManager.cpp

Patch:       src/gpu/GrClipMaskManager.cpp
Index: src/gpu/GrClipMaskManager.cpp
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index
b58c56566eda169770e467d4bd018f49ad34c786..90feb1c0c2a7b4d41b1febe4eaf46f47bdf3f6e9
100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -240,10 +240,15 @@ bool GrClipMaskManager::setupClipping(GrPipelineBuilder*
pipelineBuilder,
         case GrClip::kWideOpen_ClipType:
             SkFAIL("Should have caught this with clip.isWideOpen()");
             return true;
-        case GrClip::kIRect_ClipType:
-            scissorState->set(clip.irect());
-            this->setPipelineBuilderStencil(pipelineBuilder, ars);
-            return true;
+        case GrClip::kIRect_ClipType: {
+            SkIRect scissor = clip.irect();
+            if (scissor.intersect(clipSpaceIBounds)) {
+                scissorState->set(scissor);
+                this->setPipelineBuilderStencil(pipelineBuilder, ars);
+                return true;
+            }
+            return false;
+        }
         case GrClip::kClipStack_ClipType: {
             clipSpaceRTIBounds.offset(clip.origin());
             GrReducedClip::ReduceClipStack(*clip.clipStack(),

[joshualitt, 2015-03-06 16:17:45]

On 2015/03/06 16:10:33, I haz the power (commit-bot) wrote:
> Failed to apply patch for src/gpu/GrClipMaskManager.cpp:
> While running git apply --index -3 -p1;
>   error: patch failed: src/gpu/GrClipMaskManager.cpp:240
>   Falling back to three-way merge...
>   Applied patch to 'src/gpu/GrClipMaskManager.cpp' with conflicts.
>   U src/gpu/GrClipMaskManager.cpp
> 
> Patch:       src/gpu/GrClipMaskManager.cpp
> Index: src/gpu/GrClipMaskManager.cpp
> diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
> index
>
b58c56566eda169770e467d4bd018f49ad34c786..90feb1c0c2a7b4d41b1febe4eaf46f47bdf3f6e9
> 100644
> --- a/src/gpu/GrClipMaskManager.cpp
> +++ b/src/gpu/GrClipMaskManager.cpp
> @@ -240,10 +240,15 @@ bool GrClipMaskManager::setupClipping(GrPipelineBuilder*
> pipelineBuilder,
>          case GrClip::kWideOpen_ClipType:
>              SkFAIL("Should have caught this with clip.isWideOpen()");
>              return true;
> -        case GrClip::kIRect_ClipType:
> -            scissorState->set(clip.irect());
> -            this->setPipelineBuilderStencil(pipelineBuilder, ars);
> -            return true;
> +        case GrClip::kIRect_ClipType: {
> +            SkIRect scissor = clip.irect();
> +            if (scissor.intersect(clipSpaceIBounds)) {
> +                scissorState->set(scissor);
> +                this->setPipelineBuilderStencil(pipelineBuilder, ars);
> +                return true;
> +            }
> +            return false;
> +        }
>          case GrClip::kClipStack_ClipType: {
>              clipSpaceRTIBounds.offset(clip.origin());
>              GrReducedClip::ReduceClipStack(*clip.clipStack(),

lgtm

[bsalomon, 2015-03-06 16:22:35]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2015-03-06 16:23:09]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/985783002/20001

[commit-bot: I haz the power, 2015-03-06 16:42:37]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/9ce30e1cd19ad813091aa9876fceb416fb781352