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

vkd3d-shader: Introduce vkd3d_dxbc_compiler_find_register_info. 

Does not generate logs when not finding a register, which reduces
some misleading spam in Anno 1800 tessellation shaders.

Signed-off-by: Philip Rebohle <philip.rebohle@tu-dortmund.de>
This commit is contained in:
Philip Rebohle 2020-06-15 12:10:49 +02:00 committed by Hans-Kristian Arntzen
parent 9defd87f95
commit 4cf8467b9d
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libs/vkd3d-shader/spirv.c
View File

@ -2951,7 +2951,7 @@ struct vkd3d_shader_register_info
const struct vkd3d_shader_resource_binding *cbv_binding;
};
static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compiler *compiler,
static bool vkd3d_dxbc_compiler_find_register_info(const struct vkd3d_dxbc_compiler *compiler,
const struct vkd3d_shader_register *reg, struct vkd3d_shader_register_info *register_info)
{
struct vkd3d_symbol reg_symbol, *symbol;
@ -2977,7 +2977,6 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil
vkd3d_symbol_make_register(&reg_symbol, reg);
if (!(entry = rb_get(&compiler->symbol_table, &reg_symbol)))
{
FIXME("Unrecognized register (%s).\n", debug_vkd3d_symbol(&reg_symbol));
memset(register_info, 0, sizeof(*register_info));
return false;
}
@ -2996,6 +2995,21 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil
return true;
}
static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compiler *compiler,
const struct vkd3d_shader_register *reg, struct vkd3d_shader_register_info *register_info)
{
struct vkd3d_symbol reg_symbol;
bool result;
if (!(result = vkd3d_dxbc_compiler_find_register_info(compiler, reg, register_info)))
{
vkd3d_symbol_make_register(&reg_symbol, reg);
FIXME("Unrecognized register (%s).\n", debug_vkd3d_symbol(&reg_symbol));
}
return result;
}
static uint32_t vkd3d_dxbc_compiler_get_resource_index(struct vkd3d_dxbc_compiler *compiler,
const struct vkd3d_shader_register *reg, const struct vkd3d_shader_resource_binding *binding);
@ -6448,14 +6462,15 @@ static void vkd3d_dxbc_compiler_emit_default_control_point_phase(struct vkd3d_dx
input_id = 0;
if (vkd3d_dxbc_compiler_get_register_info(compiler, &input_reg, &input_info))
if (vkd3d_dxbc_compiler_find_register_info(compiler, &input_reg, &input_info))
{
input_id = input_info.id;
component_type = input_info.component_type;
component_count = vkd3d_write_mask_component_count(input_info.write_mask);
}
else {
else
{
if ((input_builtin = get_spirv_builtin_for_sysval(compiler, vkd3d_siv_from_sysval(input->sysval_semantic))))
{
component_type = input_builtin->component_type;