wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Prefer versioned root signature structures.

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-24 16:05:47 +02:00
committed by Alexandre Julliard
parent 374bcd276e
commit aa2d00929e
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/vkd3d/state.c
View File

@@ -999,8 +999,8 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device,
const struct vkd3d_shader_code dxbc = {bytecode, bytecode_length}; const struct vkd3d_shader_code dxbc = {bytecode, bytecode_length};
union union
{ {
D3D12_ROOT_SIGNATURE_DESC d3d12; D3D12_VERSIONED_ROOT_SIGNATURE_DESC d3d12;
struct vkd3d_root_signature_desc vkd3d; struct vkd3d_versioned_root_signature_desc vkd3d;
} root_signature_desc; } root_signature_desc;
struct d3d12_root_signature *object; struct d3d12_root_signature *object;
HRESULT hr; HRESULT hr;
@@ -1014,12 +1014,12 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device,
if (!(object = vkd3d_malloc(sizeof(*object)))) if (!(object = vkd3d_malloc(sizeof(*object))))
{ {
vkd3d_shader_free_root_signature_v_1_0(&root_signature_desc.vkd3d); vkd3d_shader_free_root_signature(&root_signature_desc.vkd3d);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
hr = d3d12_root_signature_init(object, device, &root_signature_desc.d3d12); hr = d3d12_root_signature_init(object, device, &root_signature_desc.d3d12.u.Desc_1_0);
vkd3d_shader_free_root_signature_v_1_0(&root_signature_desc.vkd3d); vkd3d_shader_free_root_signature(&root_signature_desc.vkd3d);
if (FAILED(hr)) if (FAILED(hr))
{ {
vkd3d_free(object); vkd3d_free(object);

15
libs/vkd3d/vkd3d_main.c
View File

@@ -87,8 +87,8 @@ struct d3d12_root_signature_deserializer
union union
{ {
D3D12_ROOT_SIGNATURE_DESC d3d12; D3D12_VERSIONED_ROOT_SIGNATURE_DESC d3d12;
struct vkd3d_root_signature_desc vkd3d; struct vkd3d_versioned_root_signature_desc vkd3d;
} desc; } desc;
}; };
@@ -140,7 +140,7 @@ static ULONG STDMETHODCALLTYPE d3d12_root_signature_deserializer_Release(ID3D12R
if (!refcount) if (!refcount)
{ {
vkd3d_shader_free_root_signature_v_1_0(&deserializer->desc.vkd3d); vkd3d_shader_free_root_signature(&deserializer->desc.vkd3d);
vkd3d_free(deserializer); vkd3d_free(deserializer);
} }
@@ -154,7 +154,8 @@ static const D3D12_ROOT_SIGNATURE_DESC * STDMETHODCALLTYPE d3d12_root_signature_
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
return &deserializer->desc.d3d12; assert(deserializer->desc.d3d12.Version == D3D_ROOT_SIGNATURE_VERSION_1_0);
return &deserializer->desc.d3d12.u.Desc_1_0;
} }
static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_deserializer_vtbl = static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_deserializer_vtbl =
@@ -168,7 +169,7 @@ static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_des
}; };
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_versioned_root_signature_desc *out_desc)
{ {
struct vkd3d_versioned_root_signature_desc desc, converted_desc; struct vkd3d_versioned_root_signature_desc desc, converted_desc;
int ret; int ret;
@@ -181,7 +182,7 @@ int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc,
if (desc.version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) if (desc.version == VKD3D_ROOT_SIGNATURE_VERSION_1_0)
{ {
*out_desc = desc.u.v_1_0; *out_desc = desc;
} }
else else
{ {
@@ -195,7 +196,7 @@ int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc,
return ret; return ret;
} }
*out_desc = converted_desc.u.v_1_0; *out_desc = converted_desc;
} }
return ret; return ret;

2
libs/vkd3d/vkd3d_private.h
View File

@@ -620,7 +620,7 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, const void *byt
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, int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc,
struct vkd3d_root_signature_desc *desc) DECLSPEC_HIDDEN; struct vkd3d_versioned_root_signature_desc *desc) DECLSPEC_HIDDEN;
struct d3d12_graphics_pipeline_state struct d3d12_graphics_pipeline_state
{ {