From c1ad3d28c0ed388caa66eee61aed117ccbeef8d8 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sat, 29 Mar 2025 14:18:21 +0100 Subject: [PATCH] radv: Use radv_format_to_pipe_format instead of vk_format_to_pipe_format Fixes: 9af11bf306c ("radv: add initial DCC support on GFX12") Reviewed-by: Samuel Pitoiset Part-of: (cherry picked from commit 3ef0ee2241f0e2e7b570a8271ccbe279be83d60e) --- .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 4abbefa0e64..2613280018b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -11044,7 +11044,7 @@ "description": "radv: Use radv_format_to_pipe_format instead of vk_format_to_pipe_format", "nominated": false, "nomination_type": 2, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": "9af11bf306c4b67c434044a7ba2907a5c6df5542", "notes": null diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index da1b6a6b6e7..19fc48dec27 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -1202,7 +1202,7 @@ radv_image_create_layout(struct radv_device *device, struct radv_image_create_in if (pdev->info.gfx_level >= GFX12 && (!radv_surface_has_scanout(device, &create_info) || pdev->info.gfx12_supports_display_dcc)) { - const enum pipe_format format = vk_format_to_pipe_format(image->vk.format); + const enum pipe_format format = radv_format_to_pipe_format(image->vk.format); /* Set DCC tilings for both color and depth/stencil. */ image->planes[plane].surface.u.gfx9.color.dcc_number_type = ac_get_cb_number_type(format);