Module: Mesa Branch: staging/23.3 Commit: f32b1b8d3e237160002547ee9a7c51bceb39ae14 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f32b1b8d3e237160002547ee9a7c51bceb39ae14
Author: Yonggang Luo <[email protected]> Date: Tue Dec 5 01:53:09 2023 +0800 dzn: Fixes -Werror=incompatible-pointer-type Error message: ../../src/microsoft/vulkan/dzn_device.c:3840:108: error: passing argument 5 of 'device->dev13->lpVtbl->OpenExistingHeapFromAddress1' from incompatible pointer type [-Werror=incompatible-pointer-types] (cherry picked from commit 767aa002304e4b53df51570d5deec2a063593ec8) Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26717> --- src/microsoft/vulkan/dzn_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/microsoft/vulkan/dzn_device.c b/src/microsoft/vulkan/dzn_device.c index a11a482e1e1..c95742fbde3 100644 --- a/src/microsoft/vulkan/dzn_device.c +++ b/src/microsoft/vulkan/dzn_device.c @@ -2806,7 +2806,7 @@ dzn_device_memory_create(struct dzn_device *device, if (!device->dev13) goto cleanup; - if (FAILED(ID3D12Device13_OpenExistingHeapFromAddress1(device->dev13, host_pointer, heap_desc.SizeInBytes, &IID_ID3D12Heap, &mem->heap))) + if (FAILED(ID3D12Device13_OpenExistingHeapFromAddress1(device->dev13, host_pointer, heap_desc.SizeInBytes, &IID_ID3D12Heap, (void**)&mem->heap))) goto cleanup; D3D12_HEAP_DESC desc = dzn_ID3D12Heap_GetDesc(mem->heap); @@ -3920,7 +3920,7 @@ dzn_GetMemoryHostPointerPropertiesEXT(VkDevice _device, return VK_ERROR_FEATURE_NOT_PRESENT; ID3D12Heap *heap; - if (FAILED(ID3D12Device13_OpenExistingHeapFromAddress1(device->dev13, pHostPointer, 1, &IID_ID3D12Heap, &heap))) + if (FAILED(ID3D12Device13_OpenExistingHeapFromAddress1(device->dev13, pHostPointer, 1, &IID_ID3D12Heap, (void **)&heap))) return VK_ERROR_INVALID_EXTERNAL_HANDLE; struct dzn_physical_device *pdev = container_of(device->vk.physical, struct dzn_physical_device, vk);
