Module: Mesa Branch: staging/20.1 Commit: affb22b71cfb54dd56934fd198fa0928d1371194 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=affb22b71cfb54dd56934fd198fa0928d1371194
Author: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Date: Sun Aug 16 22:38:22 2020 +0200 radv: Use getter instead of setter to extract value. Oops ... Fixes: 64768111c30 "radv: Handle slightly different image dimensions." Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3417 Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6337> (cherry picked from commit 50b039590e19d07607ae0714ebffeed6d4f182d5) --- .pick_status.json | 2 +- src/amd/vulkan/radv_image.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1633613c768..c79c14315be 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -94,7 +94,7 @@ "description": "radv: Use getter instead of setter to extract value.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "64768111c302014a6ae8db6122dedf0d5e5168cc" }, diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 2ccb72f562c..440fe4939a8 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -324,7 +324,7 @@ radv_patch_image_dimensions(struct radv_device *device, if (device->physical_device->rad_info.chip_class >= GFX10) { width = G_00A004_WIDTH_LO(md->metadata[3]) + (G_00A008_WIDTH_HI(md->metadata[4]) << 2) + 1; - height = S_00A008_HEIGHT(md->metadata[4]) + 1; + height = G_00A008_HEIGHT(md->metadata[4]) + 1; } else { width = G_008F18_WIDTH(md->metadata[4]) + 1; height = G_008F18_HEIGHT(md->metadata[4]) + 1; _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit