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

vkd3d: Record root signature compatibility hashes. 

For pipeline libraries and DXR to some extent later, we'll need an easy
way to compare root signature objects.

Signed-off-by: Hans-Kristian Arntzen <post@arntzen-software.no>
This commit is contained in:
Hans-Kristian Arntzen 2022-02-01 15:28:03 +01:00
parent bc3b25fb0e
commit e5e662ce22
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/vkd3d/state.c
View File

@ -1472,6 +1472,11 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device,
}
hr = d3d12_root_signature_init(object, device, &root_signature_desc.d3d12.Desc_1_1);
/* For pipeline libraries, (and later DXR to some degree), we need a way to
* compare root signature objects. */
object->compatibility_hash = vkd3d_shader_hash(&dxbc);
vkd3d_shader_free_root_signature(&root_signature_desc.vkd3d);
if (FAILED(hr))
{
@ -3794,6 +3799,7 @@ HRESULT d3d12_pipeline_state_create(struct d3d12_device *device, VkPipelineBindP
const struct d3d12_pipeline_state_desc *desc, struct d3d12_pipeline_state **state)
{
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
struct d3d12_root_signature *root_signature;
struct d3d12_pipeline_state *object;
HRESULT hr;
@ -3811,7 +3817,13 @@ HRESULT d3d12_pipeline_state_create(struct d3d12_device *device, VkPipelineBindP
vkd3d_free(object);
return hr;
}
root_signature = impl_from_ID3D12RootSignature(object->private_root_signature);
}
else
root_signature = impl_from_ID3D12RootSignature(desc->root_signature);
if (root_signature)
object->root_signature_compat_hash = root_signature->compatibility_hash;
switch (bind_point)
{

3
libs/vkd3d/vkd3d_private.h
View File

@ -1308,6 +1308,8 @@ struct d3d12_root_signature
ID3D12RootSignature ID3D12RootSignature_iface;
LONG refcount;
vkd3d_shader_hash_t compatibility_hash;
struct d3d12_bind_point_layout graphics, compute, raygen;
VkDescriptorSetLayout vk_sampler_descriptor_layout;
VkDescriptorSetLayout vk_root_descriptor_layout;
@ -1521,6 +1523,7 @@ struct d3d12_pipeline_state
VkPipelineCache vk_pso_cache;
spinlock_t lock;
vkd3d_shader_hash_t root_signature_compat_hash;
ID3D12RootSignature *private_root_signature;
struct d3d12_device *device;