commit d263d752ac356f610e59dc453f5607fbd887fbfa
author Li Hao <hao.x.li@intel.com> Fri Mar 15 01:37:21 2019 +0000
committer Commit Bot service account <commit-bot@chromium.org> Fri Mar 15 01:37:21 2019 +0000
tree 8b60b244023dad6934242b27deef3217c9c83db3
parent 5625b63202797c54ff1f5a40d9ee664ca23cfce8

Fix scissor rect larger than render pass width/height in Metal backend

BUG=dawn:116
TEST=dawn_end2end_tests

Change-Id: I3e36e19d20b271ba58652bcaea973f3999e9e7ac
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/5560
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Hao Li <hao.x.li@intel.com>

src/dawn_native/metal/CommandBufferMTL.mm

diff --git a/src/dawn_native/metal/CommandBufferMTL.mm b/src/dawn_native/metal/CommandBufferMTL.mm
index bb76ca2..a15adcb 100644
--- a/src/dawn_native/metal/CommandBufferMTL.mm
+++ b/src/dawn_native/metal/CommandBufferMTL.mm
@@ -667,6 +667,15 @@
                     rect.width = cmd->width;
                     rect.height = cmd->height;
 
+                    // The scissor rect x + width must be <= render pass width
+                    if ((rect.x + rect.width) > renderPassCmd->width) {
+                        rect.width = renderPassCmd->width - rect.x;
+                    }
+                    // The scissor rect y + height must be <= render pass height
+                    if ((rect.y + rect.height > renderPassCmd->height)) {
+                        rect.height = renderPassCmd->height - rect.y;
+                    }
+
                     [encoder setScissorRect:rect];
                 } break;