From e8f1936ee2411d5531e8adffef194577fc9a059a Mon Sep 17 00:00:00 2001 From: Hans-Kristian Arntzen Date: Wed, 1 Jun 2022 12:16:09 +0200 Subject: [PATCH] vkd3d: Convert VKD3D_CONFIG flags to 64-bit constants. We're soon running out of 32-bit space. Signed-off-by: Hans-Kristian Arntzen --- include/vkd3d.h | 59 +++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index b6e71b67..a2bcd097 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -59,37 +59,34 @@ extern "C" { #endif /* __cplusplus */ -enum vkd3d_config_flags -{ - VKD3D_CONFIG_FLAG_VULKAN_DEBUG = 0x00000001, - VKD3D_CONFIG_FLAG_SKIP_APPLICATION_WORKAROUNDS = 0x00000002, - VKD3D_CONFIG_FLAG_DEBUG_UTILS = 0x00000004, - VKD3D_CONFIG_FLAG_FORCE_STATIC_CBV = 0x00000008, - VKD3D_CONFIG_FLAG_DXR = 0x00000010, - VKD3D_CONFIG_FLAG_SINGLE_QUEUE = 0x00000020, - VKD3D_CONFIG_FLAG_DESCRIPTOR_QA_CHECKS = 0x00000040, - VKD3D_CONFIG_FLAG_FORCE_RTV_EXCLUSIVE_QUEUE = 0x00000080, - VKD3D_CONFIG_FLAG_FORCE_DSV_EXCLUSIVE_QUEUE = 0x00000100, - VKD3D_CONFIG_FLAG_FORCE_MINIMUM_SUBGROUP_SIZE = 0x00000200, - VKD3D_CONFIG_FLAG_NO_UPLOAD_HVV = 0x00000400, - VKD3D_CONFIG_FLAG_LOG_MEMORY_BUDGET = 0x00000800, - VKD3D_CONFIG_FLAG_IGNORE_RTV_HOST_VISIBLE = 0x00001000, - VKD3D_CONFIG_FLAG_FORCE_HOST_CACHED = 0x00002000, - VKD3D_CONFIG_FLAG_DXR11 = 0x00004000, - VKD3D_CONFIG_FLAG_FORCE_NO_INVARIANT_POSITION = 0x00008000, - VKD3D_CONFIG_FLAG_GLOBAL_PIPELINE_CACHE = 0x00020000, - VKD3D_CONFIG_FLAG_PIPELINE_LIBRARY_NO_SERIALIZE_SPIRV = 0x00040000, - VKD3D_CONFIG_FLAG_PIPELINE_LIBRARY_SANITIZE_SPIRV = 0x00080000, - VKD3D_CONFIG_FLAG_PIPELINE_LIBRARY_LOG = 0x00100000, - VKD3D_CONFIG_FLAG_PIPELINE_LIBRARY_IGNORE_SPIRV = 0x00200000, - VKD3D_CONFIG_FLAG_MUTABLE_SINGLE_SET = 0x00400000, - VKD3D_CONFIG_FLAG_MEMORY_ALLOCATOR_SKIP_CLEAR = 0x00800000, - VKD3D_CONFIG_FLAG_RECYCLE_COMMAND_POOLS = 0x01000000, - VKD3D_CONFIG_FLAG_PIPELINE_LIBRARY_IGNORE_MISMATCH_DRIVER = 0x02000000, - VKD3D_CONFIG_FLAG_BREADCRUMBS = 0x04000000, - VKD3D_CONFIG_FLAG_PIPELINE_LIBRARY_APP_CACHE_ONLY = 0x08000000, - VKD3D_CONFIG_FLAG_SHADER_CACHE_SYNC = 0x10000000, -}; +#define VKD3D_CONFIG_FLAG_VULKAN_DEBUG (1ull << 0) +#define VKD3D_CONFIG_FLAG_SKIP_APPLICATION_WORKAROUNDS (1ull << 1) +#define VKD3D_CONFIG_FLAG_DEBUG_UTILS (1ull << 2) +#define VKD3D_CONFIG_FLAG_FORCE_STATIC_CBV (1ull << 3) +#define VKD3D_CONFIG_FLAG_DXR (1ull << 4) +#define VKD3D_CONFIG_FLAG_SINGLE_QUEUE (1ull << 5) +#define VKD3D_CONFIG_FLAG_DESCRIPTOR_QA_CHECKS (1ull << 6) +#define VKD3D_CONFIG_FLAG_FORCE_RTV_EXCLUSIVE_QUEUE (1ull << 7) +#define VKD3D_CONFIG_FLAG_FORCE_DSV_EXCLUSIVE_QUEUE (1ull << 8) +#define VKD3D_CONFIG_FLAG_FORCE_MINIMUM_SUBGROUP_SIZE (1ull << 9) +#define VKD3D_CONFIG_FLAG_NO_UPLOAD_HVV (1ull << 10) +#define VKD3D_CONFIG_FLAG_LOG_MEMORY_BUDGET (1ull << 11) +#define VKD3D_CONFIG_FLAG_IGNORE_RTV_HOST_VISIBLE (1ull << 12) +#define VKD3D_CONFIG_FLAG_FORCE_HOST_CACHED (1ull << 13) +#define VKD3D_CONFIG_FLAG_DXR11 (1ull << 14) +#define VKD3D_CONFIG_FLAG_FORCE_NO_INVARIANT_POSITION (1ull << 15) +#define VKD3D_CONFIG_FLAG_GLOBAL_PIPELINE_CACHE (1ull << 16) +#define VKD3D_CONFIG_FLAG_PIPELINE_LIBRARY_NO_SERIALIZE_SPIRV (1ull << 17) +#define VKD3D_CONFIG_FLAG_PIPELINE_LIBRARY_SANITIZE_SPIRV (1ull << 18) +#define VKD3D_CONFIG_FLAG_PIPELINE_LIBRARY_LOG (1ull << 19) +#define VKD3D_CONFIG_FLAG_PIPELINE_LIBRARY_IGNORE_SPIRV (1ull << 20) +#define VKD3D_CONFIG_FLAG_MUTABLE_SINGLE_SET (1ull << 21) +#define VKD3D_CONFIG_FLAG_MEMORY_ALLOCATOR_SKIP_CLEAR (1ull << 22) +#define VKD3D_CONFIG_FLAG_RECYCLE_COMMAND_POOLS (1ull << 23) +#define VKD3D_CONFIG_FLAG_PIPELINE_LIBRARY_IGNORE_MISMATCH_DRIVER (1ull << 24) +#define VKD3D_CONFIG_FLAG_BREADCRUMBS (1ull << 25) +#define VKD3D_CONFIG_FLAG_PIPELINE_LIBRARY_APP_CACHE_ONLY (1ull << 26) +#define VKD3D_CONFIG_FLAG_SHADER_CACHE_SYNC (1ull << 27) typedef HRESULT (*PFN_vkd3d_signal_event)(HANDLE event);