diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2021-10-01 13:15:10 -0700 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2021-11-17 20:06:22 +0000 |
| commit | ca307d8cbf43d91775c9a9b17d769f827ea43963 (patch) | |
| tree | c1cb297e8d82a1dd40c38be0c6589e9e5e909f0d | |
| parent | 6e1de95860531f1bd1fa76eefdb2438a01460dfd (diff) | |
iris: Fix parameters to iris_copy_region in reallocate_resource_inplace
We had accidentally passed <x, y, z, l> instead of <l, x, y, z>.
Fixes: b8ef3271c870 ("iris: Move suballocated resources to a dedicated allocation on export")
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13815>
(cherry picked from commit f4004fde262964351f72656f396e1cca491ee955)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/iris/iris_resource.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index cc12f1a7535..2d41ee01518 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -409,7 +409,7 @@ "description": "iris: Fix parameters to iris_copy_region in reallocate_resource_inplace", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "b8ef3271c870a4e8c0d641cbe4114f827015b75b" }, diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index 4a126fb43d1..7eef060a4ed 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -1446,7 +1446,7 @@ iris_reallocate_resource_inplace(struct iris_context *ice, .depth = util_num_layers(&templ, l), }; - iris_copy_region(&ice->blorp, batch, &new_res->base.b, 0, 0, 0, l, + iris_copy_region(&ice->blorp, batch, &new_res->base.b, l, 0, 0, 0, &old_res->base.b, l, &box); } } |