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

vkd3d: Fix descriptor table mask when populating inline uniform block data. 

This logic has to be the same as in d3d12_command_list_update_descriptor_table_offsets,
since not all active descriptor tables are necessarily used by the root signature.

Fixes an assert in the StarsX IrradianceMap demo (Github issue #347).

Signed-off-by: Philip Rebohle <philip.rebohle@tu-dortmund.de>
This commit is contained in:
Philip Rebohle 2020-10-30 01:46:01 +01:00 committed by Hans-Kristian Arntzen
parent 3f0d2f3362
commit c50e529be0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/vkd3d/command.c
View File

@ -3242,13 +3242,13 @@ static void d3d12_command_list_fetch_inline_uniform_block_data(struct d3d12_comm
{
struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
const struct d3d12_root_signature *root_signature = bindings->root_signature;
uint64_t descriptor_table_mask = bindings->descriptor_table_active_mask;
uint64_t root_constant_mask = root_signature->root_constant_mask;
const uint32_t *src_data = bindings->root_constants;
const struct d3d12_root_descriptor_table *table;
const struct d3d12_root_constant *root_constant;
const struct d3d12_desc *base_descriptor;
unsigned int root_parameter_index;
uint64_t descriptor_table_mask;
uint32_t first_table_offset;
while (root_constant_mask)
@ -3262,6 +3262,7 @@ static void d3d12_command_list_fetch_inline_uniform_block_data(struct d3d12_comm
}
first_table_offset = root_signature->descriptor_table_offset / sizeof(uint32_t);
descriptor_table_mask = root_signature->descriptor_table_mask & bindings->descriptor_table_active_mask;
while (descriptor_table_mask)
{