wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Prefer vkd3d_shader_parse_versioned_root_signature().

Browse Source 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2019-04-19 11:07:35 +02:00 committed by Alexandre Julliard
parent ac8ffc3cd0
commit f300781c79
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/vkd3d/state.c
View File

@ -1006,7 +1006,7 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device,
HRESULT hr; HRESULT hr;
int ret; int ret;
if ((ret = vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc.vkd3d)) < 0) if ((ret = vkd3d_parse_root_signature_v_1_0(&dxbc, &root_signature_desc.vkd3d)) < 0)
{ {
WARN("Failed to parse root signature, vkd3d result %d.\n", ret); WARN("Failed to parse root signature, vkd3d result %d.\n", ret);
return hresult_from_vkd3d_result(ret); return hresult_from_vkd3d_result(ret);

2
libs/vkd3d/vkd3d_main.c
View File

@ -167,7 +167,7 @@ static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_des
d3d12_root_signature_deserializer_GetRootSignatureDesc, d3d12_root_signature_deserializer_GetRootSignatureDesc,
}; };
static int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc,
struct vkd3d_root_signature_desc *out_desc) struct vkd3d_root_signature_desc *out_desc)
{ {
struct vkd3d_versioned_root_signature_desc desc, converted_desc; struct vkd3d_versioned_root_signature_desc desc, converted_desc;

3
libs/vkd3d/vkd3d_private.h
View File

@ -619,6 +619,9 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, const void *byt
size_t bytecode_length, struct d3d12_root_signature **root_signature) DECLSPEC_HIDDEN; size_t bytecode_length, struct d3d12_root_signature **root_signature) DECLSPEC_HIDDEN;
struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) DECLSPEC_HIDDEN; struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) DECLSPEC_HIDDEN;
int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc,
struct vkd3d_root_signature_desc *desc) DECLSPEC_HIDDEN;
struct d3d12_graphics_pipeline_state struct d3d12_graphics_pipeline_state
{ {
VkPipelineShaderStageCreateInfo stages[VKD3D_MAX_SHADER_STAGES]; VkPipelineShaderStageCreateInfo stages[VKD3D_MAX_SHADER_STAGES];