From 40c225095f64dacfe8b88780a5d43ecdeafe4d2a Mon Sep 17 00:00:00 2001 From: Elizabeth Figura Date: Thu, 23 Jan 2025 23:41:02 -0600 Subject: [PATCH] vkd3d-utils: Fix matrix packing precedence in D3DCompile2VKD3D(). D3DCOMPILE_PACK_MATRIX_ROW_MAJOR takes precedence over D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR. --- libs/vkd3d-utils/vkd3d_utils_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 738799c9..7ced0671 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -318,7 +318,7 @@ HRESULT WINAPI D3DCompile2VKD3D(const void *data, SIZE_T data_size, const char * option->value = 0; if (flags & D3DCOMPILE_PACK_MATRIX_ROW_MAJOR) option->value |= VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_ROW_MAJOR; - if (flags & D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR) + else if (flags & D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR) option->value |= VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_COLUMN_MAJOR; }