From 1b08bbe2db778fd753e5ba2d76fa9765a112d44e Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Mon, 21 Nov 2022 23:33:31 +0100 Subject: [PATCH] radv: Use correct init order for ETC2 image views Fixes: d9048e31a0d ("radv: Use vk_image_view as the base for radv_image_view") Part-of: (cherry picked from commit c6ec4925c0688cef557beb65c280b28ef3185132) --- .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 902cf3e5bb4..e0d01d12e48 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1336,7 +1336,7 @@ "description": "radv: Use correct init order for ETC2 image views", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d9048e31a0d7b08b23363c1e31d509b635d5383b" }, diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 5cf9c6befcd..3f2fba0a406 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -2144,8 +2144,8 @@ radv_image_view_init(struct radv_image_view *iview, struct radv_device *device, const struct util_format_description *desc = vk_format_description(iview->vk.format); if (desc->layout == UTIL_FORMAT_LAYOUT_ETC) { iview->plane_id = 1; - iview->vk.format = etc2_emulation_format(iview->vk.format); iview->vk.view_format = etc2_emulation_format(iview->vk.format); + iview->vk.format = etc2_emulation_format(iview->vk.format); } plane_count = 1;