wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/spirv: Return void from spirv_compiler_emit_input().

Browse Source
This commit is contained in:
Elizabeth Figura
2025-05-12 14:16:26 -05:00
committed by Henri Verbeet
parent d40422592a
commit 65e1ef047f
Notes: Henri Verbeet 2025-05-14 15:26:55 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1493
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5775,7 +5775,7 @@ static unsigned int shader_signature_next_location(const struct shader_signature
return max_row; return max_row;
} }
static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, static void spirv_compiler_emit_input(struct spirv_compiler *compiler,
enum vkd3d_shader_register_type reg_type, unsigned int element_idx) enum vkd3d_shader_register_type reg_type, unsigned int element_idx)
{ {
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
@@ -5786,12 +5786,10 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler,
const struct vkd3d_spirv_builtin *builtin; const struct vkd3d_spirv_builtin *builtin;
enum vkd3d_shader_sysval_semantic sysval; enum vkd3d_shader_sysval_semantic sysval;
uint32_t write_mask, reg_write_mask; uint32_t write_mask, reg_write_mask;
struct vkd3d_symbol *symbol = NULL;
uint32_t val_id, input_id, var_id; uint32_t val_id, input_id, var_id;
uint32_t type_id, float_type_id; uint32_t type_id, float_type_id;
struct vkd3d_symbol reg_symbol; struct vkd3d_symbol reg_symbol;
SpvStorageClass storage_class; SpvStorageClass storage_class;
struct rb_entry *entry = NULL;
bool use_private_var = false; bool use_private_var = false;
unsigned int array_sizes[2]; unsigned int array_sizes[2];
@@ -5846,7 +5844,7 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler,
vkd3d_symbol_make_io(&reg_symbol, reg_type, element_idx); vkd3d_symbol_make_io(&reg_symbol, reg_type, element_idx);
if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) if (rb_get(&compiler->symbol_table, &reg_symbol))
{ {
/* Except for vicp there should be one declaration per signature element. Sources of /* Except for vicp there should be one declaration per signature element. Sources of
* duplicate declarations are: a single register split into multiple declarations having * duplicate declarations are: a single register split into multiple declarations having
@@ -5854,8 +5852,7 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler,
* being repeated in another (i.e. vcp/vocp), which should have been deleted. */ * being repeated in another (i.e. vcp/vocp), which should have been deleted. */
if (reg_type != VKD3DSPR_INPUT || !is_in_fork_or_join_phase(compiler)) if (reg_type != VKD3DSPR_INPUT || !is_in_fork_or_join_phase(compiler))
FIXME("Duplicate input definition found.\n"); FIXME("Duplicate input definition found.\n");
symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); return;
return symbol->id;
} }
if (builtin) if (builtin)
@@ -5927,8 +5924,6 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler,
spirv_compiler_emit_store_reg(compiler, &dst_reg, signature_element->mask, val_id); spirv_compiler_emit_store_reg(compiler, &dst_reg, signature_element->mask, val_id);
} }
return input_id;
} }
static void spirv_compiler_emit_io_register(struct spirv_compiler *compiler, static void spirv_compiler_emit_io_register(struct spirv_compiler *compiler,