mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d: Fail creation of command signature if DGC is not supported. 

Signed-off-by: Hans-Kristian Arntzen <post@arntzen-software.no>
This commit is contained in:
Hans-Kristian Arntzen 2022-07-12 13:58:07 +02:00
parent 73700f4c3a
commit 5b73139f18
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libs/vkd3d/command.c
View File

@ -9663,12 +9663,6 @@ static void d3d12_command_list_execute_indirect_state_template(
unsigned int i; unsigned int i;
HRESULT hr; HRESULT hr;
if (!list->device->device_info.device_generated_commands_features_nv.deviceGeneratedCommands)
{
WARN("Ignoring unsupported state template execute indirect.\n");
return;
}
/* To build device generated commands, we need to know the pipeline we're going to render with. */ /* To build device generated commands, we need to know the pipeline we're going to render with. */
if (!d3d12_command_list_update_graphics_pipeline(list)) if (!d3d12_command_list_update_graphics_pipeline(list))
return; return;
@ -13368,20 +13362,19 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, struct d3d12
desc->NumArgumentDescs * sizeof(*desc->pArgumentDescs)); desc->NumArgumentDescs * sizeof(*desc->pArgumentDescs));
if (FAILED(hr = vkd3d_private_store_init(&object->private_store))) if (FAILED(hr = vkd3d_private_store_init(&object->private_store)))
{ goto err;
vkd3d_free((void *)object->desc.pArgumentDescs);
vkd3d_free(object);
return hr;
}
if ((object->requires_state_template = requires_state_template)) if ((object->requires_state_template = requires_state_template))
{ {
if (FAILED(hr = d3d12_command_signature_init_state_template(object, desc, root_signature, device))) if (!device->device_info.device_generated_commands_features_nv.deviceGeneratedCommands)
{ {
vkd3d_free((void *)object->desc.pArgumentDescs); FIXME("VK_NV_device_generated_commands is not supported by implementation.\n");
vkd3d_free(object); hr = E_NOTIMPL;
return hr; goto err;
} }
if (FAILED(hr = d3d12_command_signature_init_state_template(object, desc, root_signature, device)))
goto err;
} }
else else
object->argument_buffer_offset = argument_buffer_offset; object->argument_buffer_offset = argument_buffer_offset;
@ -13393,4 +13386,9 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, struct d3d12
*signature = object; *signature = object;
return S_OK; return S_OK;
err:
vkd3d_free((void *)object->desc.pArgumentDescs);
vkd3d_free(object);
return hr;
} }