Mesa (main): dzn: always use ID3D12Device1

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 411dfc574cf1351a8af44e2bf6faa9aae6881b3e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=411dfc574cf1351a8af44e2bf6faa9aae6881b3e

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Fri Mar 25 15:59:23 2022 +0100

dzn: always use ID3D12Device1

In the C-interface, ID3D12Device1 and ID3D12Device are unrelated types.
So let's make sure we consistenly use the most up-to-date version.

Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15816>

---

 src/microsoft/vulkan/dzn_cmd_buffer.cpp | 10 +++++-----
 src/microsoft/vulkan/dzn_device.cpp     |  6 +++---
 src/microsoft/vulkan/dzn_private.h      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/microsoft/vulkan/dzn_cmd_buffer.cpp b/src/microsoft/vulkan/dzn_cmd_buffer.cpp
index c5a7bdcf0a8..9961eb7b738 100644
--- a/src/microsoft/vulkan/dzn_cmd_buffer.cpp
+++ b/src/microsoft/vulkan/dzn_cmd_buffer.cpp
@@ -1420,7 +1420,7 @@ dzn_cmd_buffer_copy_buf2img_region(dzn_cmd_buffer *cmdbuf,
    VK_FROM_HANDLE(dzn_buffer, src_buffer, info->srcBuffer);
    VK_FROM_HANDLE(dzn_image, dst_image, info->dstImage);
 
-   ID3D12Device *dev = device->dev;
+   ID3D12Device1 *dev = device->dev;
    ID3D12GraphicsCommandList *cmdlist = cmdbuf->cmdlist;
 
    const VkBufferImageCopy2 *region = &info->pRegions[r];
@@ -1491,7 +1491,7 @@ dzn_cmd_buffer_copy_img2buf_region(dzn_cmd_buffer *cmdbuf,
    VK_FROM_HANDLE(dzn_image, src_image, info->srcImage);
    VK_FROM_HANDLE(dzn_buffer, dst_buffer, info->dstBuffer);
 
-   ID3D12Device *dev = device->dev;
+   ID3D12Device1 *dev = device->dev;
    ID3D12GraphicsCommandList *cmdlist = cmdbuf->cmdlist;
 
    const VkBufferImageCopy2 *region = &info->pRegions[r];
@@ -1562,7 +1562,7 @@ dzn_cmd_buffer_copy_img_chunk(dzn_cmd_buffer *cmdbuf,
    VK_FROM_HANDLE(dzn_image, src, info->srcImage);
    VK_FROM_HANDLE(dzn_image, dst, info->dstImage);
 
-   ID3D12Device *dev = device->dev;
+   ID3D12Device1 *dev = device->dev;
    ID3D12GraphicsCommandList *cmdlist = cmdbuf->cmdlist;
 
    const VkImageCopy2 *region = &info->pRegions[r];
@@ -2020,7 +2020,7 @@ dzn_cmd_buffer_resolve_region(dzn_cmd_buffer *cmdbuf,
    VK_FROM_HANDLE(dzn_image, src, info->srcImage);
    VK_FROM_HANDLE(dzn_image, dst, info->dstImage);
 
-   ID3D12Device *dev = device->dev;
+   ID3D12Device1 *dev = device->dev;
    const VkImageResolve2 *region = &info->pRegions[r];
 
    dzn_foreach_aspect(aspect, region->srcSubresource.aspectMask) {
@@ -3115,7 +3115,7 @@ dzn_CmdCopyImage2(VkCommandBuffer commandBuffer,
    };
 
    if (requires_temp_res) {
-      ID3D12Device *dev = device->dev;
+      ID3D12Device1 *dev = device->dev;
       VkImageAspectFlags aspect = 0;
       uint64_t max_size = 0;
 
diff --git a/src/microsoft/vulkan/dzn_device.cpp b/src/microsoft/vulkan/dzn_device.cpp
index f84926b03d8..a5caf6571e8 100644
--- a/src/microsoft/vulkan/dzn_device.cpp
+++ b/src/microsoft/vulkan/dzn_device.cpp
@@ -500,7 +500,7 @@ dzn_physical_device_get_format_support(dzn_physical_device *pdev,
      .Format = dzn_image_get_dxgi_format(format, usage, aspects),
    };
 
-   ID3D12Device *dev = dzn_physical_device_get_d3d12_dev(pdev);
+   ID3D12Device1 *dev = dzn_physical_device_get_d3d12_dev(pdev);
    HRESULT hres =
       dev->CheckFeatureSupport(D3D12_FEATURE_FORMAT_SUPPORT,
                                &dfmt_info, sizeof(dfmt_info));
@@ -557,7 +557,7 @@ dzn_physical_device_get_format_properties(dzn_physical_device *pdev,
       return;
    }
 
-   ID3D12Device *dev = dzn_physical_device_get_d3d12_dev(pdev);
+   ID3D12Device1 *dev = dzn_physical_device_get_d3d12_dev(pdev);
 
    *base_props = VkFormatProperties {
       .linearTilingFeatures = VK_FORMAT_FEATURE_TRANSFER_SRC_BIT | VK_FORMAT_FEATURE_TRANSFER_DST_BIT,
@@ -701,7 +701,7 @@ dzn_physical_device_get_image_format_properties(dzn_physical_device *pdev,
       return VK_ERROR_FORMAT_NOT_SUPPORTED;
 
    bool is_bgra4 = info->format == VK_FORMAT_B4G4R4A4_UNORM_PACK16;
-   ID3D12Device *dev = dzn_physical_device_get_d3d12_dev(pdev);
+   ID3D12Device1 *dev = dzn_physical_device_get_d3d12_dev(pdev);
 
    if ((info->type == VK_IMAGE_TYPE_1D && !(dfmt_info.Support1 & D3D12_FORMAT_SUPPORT1_TEXTURE1D)) ||
        (info->type == VK_IMAGE_TYPE_2D && !(dfmt_info.Support1 & D3D12_FORMAT_SUPPORT1_TEXTURE2D)) ||
diff --git a/src/microsoft/vulkan/dzn_private.h b/src/microsoft/vulkan/dzn_private.h
index adb32295845..1c9ad862899 100644
--- a/src/microsoft/vulkan/dzn_private.h
+++ b/src/microsoft/vulkan/dzn_private.h
@@ -361,7 +361,7 @@ struct dzn_buffer_desc {
 };
 
 struct dzn_descriptor_heap {
-   ID3D12Device *dev;
+   ID3D12Device1 *dev;
    ID3D12DescriptorHeap *heap;
    D3D12_DESCRIPTOR_HEAP_TYPE type;
    SIZE_T cpu_base;