From d51b411f56a4469502d4fac8f10f3a6f77128410 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 22 Jul 2025 17:09:51 -0400 Subject: [PATCH] dzn: use common SWAP Signed-off-by: Alyssa Rosenzweig Reviewed-by: Faith Ekstrand Part-of: --- src/microsoft/vulkan/dzn_cmd_buffer.c | 6 +++--- src/microsoft/vulkan/dzn_private.h | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/microsoft/vulkan/dzn_cmd_buffer.c b/src/microsoft/vulkan/dzn_cmd_buffer.c index 902e72fcebb..9ac0382cb52 100644 --- a/src/microsoft/vulkan/dzn_cmd_buffer.c +++ b/src/microsoft/vulkan/dzn_cmd_buffer.c @@ -1965,10 +1965,10 @@ adjust_clear_color(struct dzn_physical_device *pdev, // manually where it matters, like here, in the clear path. if (format == VK_FORMAT_B4G4R4A4_UNORM_PACK16) { if (pdev->support_a4b4g4r4) { - DZN_SWAP(float, out.float32[0], out.float32[2]); + SWAP(out.float32[0], out.float32[2]); } else { - DZN_SWAP(float, out.float32[0], out.float32[1]); - DZN_SWAP(float, out.float32[2], out.float32[3]); + SWAP(out.float32[0], out.float32[1]); + SWAP(out.float32[2], out.float32[3]); } } diff --git a/src/microsoft/vulkan/dzn_private.h b/src/microsoft/vulkan/dzn_private.h index e70b2019d7a..06f4b236a74 100644 --- a/src/microsoft/vulkan/dzn_private.h +++ b/src/microsoft/vulkan/dzn_private.h @@ -66,13 +66,6 @@ #include "spirv_to_dxil.h" #include "dzn_abi_helper.h" -#define DZN_SWAP(t, a, b) \ - do { \ - t __tmp = a; \ - a = b; \ - b = __tmp; \ - } while (0) - #define dzn_stub() unreachable("Unsupported feature") #if defined(VK_USE_PLATFORM_WIN32_KHR) || \