Module: Mesa Branch: main Commit: 1e6fcd6a611574241b1cde306afcc416a03ac76b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1e6fcd6a611574241b1cde306afcc416a03ac76b
Author: Yonggang Luo <[email protected]> Date: Fri Dec 22 05:15:22 2023 +0800 dzn: Remove #if D3D12_SDK_VERSION blocks now that 611 is required Signed-off-by: Yonggang Luo <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26794> --- src/microsoft/vulkan/dzn_device.c | 20 ++++++-------------- src/microsoft/vulkan/dzn_private.h | 4 ---- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/microsoft/vulkan/dzn_device.c b/src/microsoft/vulkan/dzn_device.c index cca7423c750..be9b0ee7014 100644 --- a/src/microsoft/vulkan/dzn_device.c +++ b/src/microsoft/vulkan/dzn_device.c @@ -147,7 +147,7 @@ dzn_physical_device_get_extensions(struct dzn_physical_device *pdev) .KHR_timeline_semaphore = true, .KHR_uniform_buffer_standard_layout = true, .EXT_descriptor_indexing = pdev->shader_model >= D3D_SHADER_MODEL_6_6, -#if defined(_WIN32) && D3D12_SDK_VERSION >= 611 +#if defined(_WIN32) .EXT_external_memory_host = pdev->dev13, #endif .EXT_scalar_block_layout = true, @@ -207,10 +207,8 @@ dzn_physical_device_destroy(struct vk_physical_device *physical) if (pdev->dev12) ID3D12Device1_Release(pdev->dev12); -#if D3D12_SDK_VERSION >= 611 if (pdev->dev13) ID3D12Device1_Release(pdev->dev13); -#endif if (pdev->adapter) IUnknown_Release(pdev->adapter); @@ -1133,10 +1131,8 @@ dzn_physical_device_create(struct vk_instance *instance, pdev->dev11 = NULL; if (FAILED(ID3D12Device1_QueryInterface(pdev->dev, &IID_ID3D12Device12, (void **)&pdev->dev12))) pdev->dev12 = NULL; -#if D3D12_SDK_VERSION >= 611 if (FAILED(ID3D12Device1_QueryInterface(pdev->dev, &IID_ID3D12Device13, (void **)&pdev->dev13))) pdev->dev13 = NULL; -#endif dzn_physical_device_cache_caps(pdev); dzn_physical_device_init_memory(pdev); dzn_physical_device_init_uuids(pdev); @@ -1441,7 +1437,7 @@ dzn_physical_device_get_image_format_properties(struct dzn_physical_device *pdev external_props->externalMemoryProperties.exportFromImportedHandleTypes = d3d11_texture_handle_types; external_props->externalMemoryProperties.externalMemoryFeatures = import_export_feature_flags; break; -#if defined(_WIN32) && D3D12_SDK_VERSION >= 611 +#if defined(_WIN32) case VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT: if (pdev->dev13) { external_props->externalMemoryProperties.compatibleHandleTypes = @@ -1664,7 +1660,7 @@ dzn_GetPhysicalDeviceExternalBufferProperties(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo, VkExternalBufferProperties *pExternalBufferProperties) { -#if defined(_WIN32) && D3D12_SDK_VERSION >= 611 +#if defined(_WIN32) VK_FROM_HANDLE(dzn_physical_device, pdev, physicalDevice); #endif @@ -1696,7 +1692,7 @@ dzn_GetPhysicalDeviceExternalBufferProperties(VkPhysicalDevice physicalDevice, VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT | d3d12_resource_handle_types; pExternalBufferProperties->externalMemoryProperties.externalMemoryFeatures = import_export_feature_flags; break; -#if defined(_WIN32) && D3D12_SDK_VERSION >= 611 +#if defined(_WIN32) case VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT: if (pdev->dev13) { pExternalBufferProperties->externalMemoryProperties.compatibleHandleTypes = @@ -2196,10 +2192,8 @@ dzn_device_destroy(struct dzn_device *device, const VkAllocationCallbacks *pAllo if (device->dev12) ID3D12Device1_Release(device->dev12); -#if D3D12_SDK_VERSION >= 611 if (device->dev13) ID3D12Device1_Release(device->dev13); -#endif vk_device_finish(&device->vk); vk_free2(&instance->vk.alloc, pAllocator, device); @@ -2302,12 +2296,10 @@ dzn_device_create(struct dzn_physical_device *pdev, ID3D12Device1_AddRef(device->dev12); } -#if D3D12_SDK_VERSION >= 611 if (pdev->dev13) { device->dev13 = pdev->dev13; ID3D12Device1_AddRef(device->dev13); } -#endif ID3D12InfoQueue *info_queue; if (SUCCEEDED(ID3D12Device1_QueryInterface(device->dev, @@ -2719,7 +2711,7 @@ dzn_device_memory_create(struct dzn_device *device, if (host_pointer) { error = VK_ERROR_INVALID_EXTERNAL_HANDLE; -#if defined(_WIN32) && D3D12_SDK_VERSION >= 611 +#if defined(_WIN32) if (!device->dev13) goto cleanup; @@ -3824,7 +3816,7 @@ cleanup: return result; } -#if defined(_WIN32) && D3D12_SDK_VERSION >= 611 +#if defined(_WIN32) VKAPI_ATTR VkResult VKAPI_CALL dzn_GetMemoryHostPointerPropertiesEXT(VkDevice _device, VkExternalMemoryHandleTypeFlagBits handleType, diff --git a/src/microsoft/vulkan/dzn_private.h b/src/microsoft/vulkan/dzn_private.h index e879699b47a..893851ce556 100644 --- a/src/microsoft/vulkan/dzn_private.h +++ b/src/microsoft/vulkan/dzn_private.h @@ -202,9 +202,7 @@ struct dzn_physical_device { ID3D12Device10 *dev10; ID3D12Device11 *dev11; ID3D12Device12 *dev12; -#if D3D12_SDK_VERSION >= 611 ID3D12Device13 *dev13; -#endif D3D_FEATURE_LEVEL feature_level; D3D_SHADER_MODEL shader_model; D3D_ROOT_SIGNATURE_VERSION root_sig_version; @@ -290,9 +288,7 @@ struct dzn_device { ID3D12Device10 *dev10; ID3D12Device11 *dev11; ID3D12Device12 *dev12; -#if D3D12_SDK_VERSION >= 611 ID3D12Device13 *dev13; -#endif ID3D12DeviceConfiguration *dev_config; struct dzn_meta_indirect_draw indirect_draws[DZN_NUM_INDIRECT_DRAW_TYPES];
