dzn: Missed ABI fixes for GetCustomHeapProperties
Reviewed-by: Bill Kristiansen <billkris@microsoft.com> Reviewed-by: Sil Vilerino <sivileri@microsoft.com> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17548>
This commit is contained in:
parent
8317de8ed3
commit
b9fb14da06
|
@ -1063,8 +1063,7 @@ dzn_cmd_buffer_alloc_internal_buf(struct dzn_cmd_buffer *cmdbuf,
|
|||
/* Align size on 64k (the default alignment) */
|
||||
size = ALIGN_POT(size, 64 * 1024);
|
||||
|
||||
D3D12_HEAP_PROPERTIES hprops;
|
||||
ID3D12Device1_GetCustomHeapProperties(device->dev, &hprops, 0, heap_type);
|
||||
D3D12_HEAP_PROPERTIES hprops = dzn_ID3D12Device2_GetCustomHeapProperties(device->dev, 0, heap_type);
|
||||
D3D12_RESOURCE_DESC rdesc = {
|
||||
.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER,
|
||||
.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT,
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
*/
|
||||
|
||||
#include "dzn_private.h"
|
||||
#include "dzn_abi_helper.h"
|
||||
|
||||
#include "vk_alloc.h"
|
||||
#include "vk_debug_report.h"
|
||||
|
@ -131,9 +132,8 @@ dzn_query_pool_create(struct dzn_device *device,
|
|||
default: unreachable("Unsupported query type");
|
||||
}
|
||||
|
||||
D3D12_HEAP_PROPERTIES hprops;
|
||||
ID3D12Device1_GetCustomHeapProperties(device->dev, &hprops, 0,
|
||||
D3D12_HEAP_TYPE_DEFAULT);
|
||||
D3D12_HEAP_PROPERTIES hprops =
|
||||
dzn_ID3D12Device2_GetCustomHeapProperties(device->dev, 0, D3D12_HEAP_TYPE_DEFAULT);
|
||||
D3D12_RESOURCE_DESC rdesc = {
|
||||
.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER,
|
||||
.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT,
|
||||
|
@ -159,8 +159,8 @@ dzn_query_pool_create(struct dzn_device *device,
|
|||
return vk_error(device, VK_ERROR_OUT_OF_DEVICE_MEMORY);
|
||||
}
|
||||
|
||||
ID3D12Device1_GetCustomHeapProperties(device->dev, &hprops, 0,
|
||||
D3D12_HEAP_TYPE_READBACK);
|
||||
hprops = dzn_ID3D12Device2_GetCustomHeapProperties(device->dev, 0,
|
||||
D3D12_HEAP_TYPE_READBACK);
|
||||
rdesc.Width = info->queryCount * (qpool->query_size + sizeof(uint64_t));
|
||||
hres = ID3D12Device1_CreateCommittedResource(device->dev, &hprops,
|
||||
D3D12_HEAP_FLAG_NONE,
|
||||
|
|
Loading…
Reference in New Issue