Mesa (staging/21.1): zink: fix typo that's definitely not at all embarrassing or anything like that

[GitLab Mirror]

Module: Mesa
Branch: staging/21.1
Commit: 869a31931330c1149b6bc2463b909a30faf1ee19
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=869a31931330c1149b6bc2463b909a30faf1ee19

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Jun  9 17:28:30 2021 -0400

zink: fix typo that's definitely not at all embarrassing or anything like that

and also adjust some formatting to pad out the diff and really make sure nobody
notices that anything was ever amiss here

Fixes: 787412b7eb8 ("zink: break out region overlap testing function into helper")

Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Reviewed-by: Joshua Ashton <joshua at froggi.es>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11279>
(cherry picked from commit 2428786d64c3bf3a352f7e304b66e052bea114e4)

---

 .pick_status.json                    |  2 +-
 src/gallium/drivers/zink/zink_blit.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index a186a77f011..b556d655286 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1939,7 +1939,7 @@
         "description": "zink: fix typo that's definitely not at all embarrassing or anything like that",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "787412b7eb8a25f92b62fbd9e04d48b1c5fb0023"
     },
diff --git a/src/gallium/drivers/zink/zink_blit.c b/src/gallium/drivers/zink/zink_blit.c
index 9f9de99f0f8..faadb9ec927 100644
--- a/src/gallium/drivers/zink/zink_blit.c
+++ b/src/gallium/drivers/zink/zink_blit.c
@@ -344,12 +344,12 @@ zink_blit_region_fills(struct u_rect region, unsigned width, unsigned height)
       /* is this even a thing? */
       return false;
 
-    u_rect_find_intersection(&region, &intersect);
-    if (intersect.x0 != 0 || intersect.y0 != 0 ||
-        intersect.x1 != width || intersect.y1 != height)
-       return false;
+   u_rect_find_intersection(&region, &intersect);
+   if (intersect.x0 != 0 || intersect.y0 != 0 ||
+       intersect.x1 != width || intersect.y1 != height)
+      return false;
 
-   return false;
+   return true;
 }
 
 bool