From c0d4d3e576995eddfeb89b43937d6b09d968e70a Mon Sep 17 00:00:00 2001 From: Patrick Lerda Date: Mon, 6 May 2024 11:09:02 +0200 Subject: [PATCH] clover: fix pipe_box update regression Indeed, clover was processing the pipe_box elements with a hardcoded order. The update of the pipe_box object broke clover. Fixes: 651191801a8 ("gallium: increase the size of pipe_box y, height fields to allow bigger textures") Signed-off-by: Patrick Lerda Reviewed-by: Karol Herbst Part-of: (cherry picked from commit f8489211480a4789533b6c117dbcd9f6cb6cf71e) --- .pick_status.json | 2 +- src/gallium/frontends/clover/core/resource.cpp | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 9c20c4c7697..bdeed4a564c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -24,7 +24,7 @@ "description": "clover: fix pipe_box update regression", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "651191801a8751c9ac1bc09327a50c19a9927392", "notes": null diff --git a/src/gallium/frontends/clover/core/resource.cpp b/src/gallium/frontends/clover/core/resource.cpp index f3f429f1979..59f570e7456 100644 --- a/src/gallium/frontends/clover/core/resource.cpp +++ b/src/gallium/frontends/clover/core/resource.cpp @@ -34,10 +34,8 @@ using namespace clover; namespace { class box { public: - box(const resource::vector &origin, const resource::vector &size) : - pipe({ (int)origin[0], (int16_t)origin[1], - (int16_t)origin[2], (int)size[0], - (int16_t)size[1], (int16_t)size[2] }) { + box(const resource::vector &origin, const resource::vector &size) { + u_box_3d(origin[0], origin[1], origin[2], size[0], size[1], size[2], &pipe); } operator const pipe_box *() {