Module: Mesa Branch: staging/23.0 Commit: 99a1c04fba87e8808a2f6768b5542540601daedc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=99a1c04fba87e8808a2f6768b5542540601daedc
Author: Jesse Natalie <[email protected]> Date: Mon Jan 9 12:41:46 2023 -0800 dzn: Define a symbol that was present in older D3D headers D3D12_BARRIER_SYNC_INPUT_ASSEMBLER was renamed to D3D12_BARRIER_SYNC_INDEX_INPUT, so conditionally define the old name based on the version of the headers that are being used. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20617> (cherry picked from commit 1e0adac84a17d43721a5249d82c9959880115c92) --- .pick_status.json | 2 +- src/microsoft/vulkan/dzn_cmd_buffer.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 698eb8f9cab..b7ac7dfab2d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -8203,7 +8203,7 @@ "description": "dzn: Define a symbol that was present in older D3D headers", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/microsoft/vulkan/dzn_cmd_buffer.c b/src/microsoft/vulkan/dzn_cmd_buffer.c index 48bef1e10f3..5ef276dc9c4 100644 --- a/src/microsoft/vulkan/dzn_cmd_buffer.c +++ b/src/microsoft/vulkan/dzn_cmd_buffer.c @@ -28,6 +28,9 @@ #include "vk_format.h" #include "vk_util.h" +#if D3D12_SDK_VERSION >= 608 +static const D3D12_BARRIER_SYNC D3D12_BARRIER_SYNC_INPUT_ASSEMBLER = D3D12_BARRIER_SYNC_INDEX_INPUT; +#endif static void dzn_cmd_buffer_exec_transition_barriers(struct dzn_cmd_buffer *cmdbuf,
