OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dzn: always use ID3D12Device1

Browse Source 
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@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15816>
This commit is contained in:
Erik Faye-Lund
2022-03-25 15:59:23 +01:00
committed by Marge Bot
parent 5f17d070a9
commit 411dfc574c
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/microsoft/vulkan/dzn_cmd_buffer.cpp
View File

@@ -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;

6
src/microsoft/vulkan/dzn_device.cpp
View File

@@ -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)) ||

2
src/microsoft/vulkan/dzn_private.h
View File

@@ -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;