wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

tests/shader_runner_d3d12: Always create a descriptor heap.

Browse Source 
So it's also available when resources are not used, which
simplifies later commits.
This commit is contained in:
Giovanni Mascellani
2025-11-06 22:33:27 +01:00
committed by Henri Verbeet
parent fb985f496d
commit a30c07f510
Notes: Henri Verbeet 2025-11-12 15:30:40 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1811
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/shader_runner_d3d12.c
View File

@@ -143,10 +143,6 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co
break; break;
case RESOURCE_TYPE_TEXTURE: case RESOURCE_TYPE_TEXTURE:
if (!runner->heap)
runner->heap = create_gpu_descriptor_heap(device,
D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, MAX_RESOURCE_DESCRIPTORS);
if (params->desc.dimension == RESOURCE_DIMENSION_BUFFER) if (params->desc.dimension == RESOURCE_DIMENSION_BUFFER)
{ {
D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc = { 0 }; D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc = { 0 };
@@ -227,10 +223,6 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co
break; break;
case RESOURCE_TYPE_UAV: case RESOURCE_TYPE_UAV:
if (!runner->heap)
runner->heap = create_gpu_descriptor_heap(device,
D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, MAX_RESOURCE_DESCRIPTORS);
if (params->desc.dimension == RESOURCE_DIMENSION_BUFFER) if (params->desc.dimension == RESOURCE_DIMENSION_BUFFER)
{ {
D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc = { 0 }; D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc = { 0 };
@@ -935,8 +927,7 @@ static bool d3d12_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY pr
if (runner->r.uniform_count) if (runner->r.uniform_count)
ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, uniform_index, ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, uniform_index,
runner->r.uniform_count, runner->r.uniforms, 0); runner->r.uniform_count, runner->r.uniforms, 0);
if (runner->heap) ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &runner->heap);
ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &runner->heap);
for (i = 0; i < runner->r.resource_count; ++i) for (i = 0; i < runner->r.resource_count; ++i)
{ {
struct d3d12_resource *resource = d3d12_resource(runner->r.resources[i]); struct d3d12_resource *resource = d3d12_resource(runner->r.resources[i]);
@@ -1200,6 +1191,9 @@ static void d3d12_runner_init_caps(struct d3d12_shader_runner *runner,
{ {
runner->caps.format_caps[formats[i]] = get_format_support(device, formats[i]); runner->caps.format_caps[formats[i]] = get_format_support(device, formats[i]);
} }
runner->heap = create_gpu_descriptor_heap(device,
D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, MAX_RESOURCE_DESCRIPTORS);
} }
static bool device_supports_shader_model_6_0(ID3D12Device *device) static bool device_supports_shader_model_6_0(ID3D12Device *device)