gallium/auxiliary: Fix coordinates clamp in util_compute_blit

Fixes: 7c8e1596d6e ("gallium/auxiliary: Fix util_compute_blit half texel offset with scaling")

Acked-by: Thong Thai <thong.thai@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26123>
(cherry picked from commit e9091b1f5c2ef50aba36f5e71fb6cf88ffc31cbb)

diff --git a/.pick_status.json b/.pick_status.json
index c7bd492..69ce723 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -414,7 +414,7 @@
         "description": "gallium/auxiliary: Fix coordinates clamp in util_compute_blit",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "7c8e1596d6ef12c27ffe713b173023b1e38e52cb",
         "notes": null

diff --git a/src/gallium/auxiliary/util/u_compute.c b/src/gallium/auxiliary/util/u_compute.c
index df00df5..518f628 100644 (file)
--- a/src/gallium/auxiliary/util/u_compute.c
+++ b/src/gallium/auxiliary/util/u_compute.c
@@ -106,8 +106,10 @@ void util_compute_blit(struct pipe_context *ctx, struct pipe_blit_info *blit_inf
                       blit_info->dst.box.y,
                       blit_info->dst.box.z,
                       0,
-                      u_bitcast_f2u((blit_info->src.box.width - 0.5) / (float)src->width0),
-                      u_bitcast_f2u((blit_info->src.box.height - 0.5) / (float)src->height0),
+                      u_bitcast_f2u((blit_info->src.box.x + blit_info->src.box.width - 0.5) /
+                                    (float)src->width0),
+                      u_bitcast_f2u((blit_info->src.box.y + blit_info->src.box.height - 0.5) /
+                                    (float)src->height0),
                       0,
                       0};