diff options
| author | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2022-11-21 23:33:31 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-11-28 13:01:16 -0800 |
| commit | db92251976d98452ae05f83c44e800f16a075a7f (patch) | |
| tree | 6933b0de069fe7776af9411a7af2abcc94e232fb | |
| parent | 8fe5aa95cb5572a28c4794e45164abd0fa29706c (diff) | |
| download | mesa-db92251976d98452ae05f83c44e800f16a075a7f.tar.gz | |
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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19914>
(cherry picked from commit c6ec4925c0688cef557beb65c280b28ef3185132)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | 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 2b751c0c97a..1746e1da2bf 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -688,7 +688,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 107572019e2..afae1331281 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -2110,8 +2110,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; |