wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/spirv: Declare indexable temps as Private unless function scope is specified.

Browse Source
This commit is contained in:
Conor McCarthy 2024-01-12 12:47:19 +10:00 committed by Alexandre Julliard
parent 37d9dba512
commit b4b2b0d3ac
Notes: Alexandre Julliard 2024-01-17 22:42:55 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/450
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/vkd3d-shader/dxil.c
View File

@ -2691,8 +2691,8 @@ static void sm6_parser_declare_icb(struct sm6_parser *sm6, const struct sm6_type
} }
static void sm6_parser_declare_indexable_temp(struct sm6_parser *sm6, const struct sm6_type *elem_type, static void sm6_parser_declare_indexable_temp(struct sm6_parser *sm6, const struct sm6_type *elem_type,
unsigned int count, unsigned int alignment, unsigned int init, struct vkd3d_shader_instruction *ins, unsigned int count, unsigned int alignment, bool has_function_scope, unsigned int init,
struct sm6_value *dst) struct vkd3d_shader_instruction *ins, struct sm6_value *dst)
{ {
enum vkd3d_data_type data_type = vkd3d_data_type_from_sm6_type(elem_type); enum vkd3d_data_type data_type = vkd3d_data_type_from_sm6_type(elem_type);
@ -2705,6 +2705,7 @@ static void sm6_parser_declare_indexable_temp(struct sm6_parser *sm6, const stru
ins->declaration.indexable_temp.alignment = alignment; ins->declaration.indexable_temp.alignment = alignment;
ins->declaration.indexable_temp.data_type = data_type; ins->declaration.indexable_temp.data_type = data_type;
ins->declaration.indexable_temp.component_count = 1; ins->declaration.indexable_temp.component_count = 1;
ins->declaration.indexable_temp.has_function_scope = has_function_scope;
/* The initialiser value index will be resolved later so forward references can be handled. */ /* The initialiser value index will be resolved later so forward references can be handled. */
ins->declaration.indexable_temp.initialiser = (void *)(uintptr_t)init; ins->declaration.indexable_temp.initialiser = (void *)(uintptr_t)init;
@ -2832,7 +2833,7 @@ static bool sm6_parser_declare_global(struct sm6_parser *sm6, const struct dxil_
if (is_constant) if (is_constant)
sm6_parser_declare_icb(sm6, scalar_type, count, alignment, init, dst); sm6_parser_declare_icb(sm6, scalar_type, count, alignment, init, dst);
else else
sm6_parser_declare_indexable_temp(sm6, scalar_type, count, alignment, init, NULL, dst); sm6_parser_declare_indexable_temp(sm6, scalar_type, count, alignment, false, init, NULL, dst);
} }
else if (address_space == ADDRESS_SPACE_GROUPSHARED) else if (address_space == ADDRESS_SPACE_GROUPSHARED)
{ {
@ -3103,7 +3104,7 @@ static void sm6_parser_emit_alloca(struct sm6_parser *sm6, const struct dxil_rec
if (packed_operands) if (packed_operands)
WARN("Ignoring flags %#"PRIx64".\n", packed_operands); WARN("Ignoring flags %#"PRIx64".\n", packed_operands);
sm6_parser_declare_indexable_temp(sm6, elem_type, type[0]->u.array.count, alignment, 0, ins, dst); sm6_parser_declare_indexable_temp(sm6, elem_type, type[0]->u.array.count, alignment, true, 0, ins, dst);
} }
static enum vkd3d_shader_opcode map_binary_op(uint64_t code, const struct sm6_type *type_a, static enum vkd3d_shader_opcode map_binary_op(uint64_t code, const struct sm6_type *type_a,

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

@ -5597,7 +5597,10 @@ static void spirv_compiler_emit_dcl_indexable_temp(struct spirv_compiler *compil
SpvStorageClass storage_class; SpvStorageClass storage_class;
size_t function_location; size_t function_location;
storage_class = SpvStorageClassFunction; /* Indexable temps may be used by more than one function in hull shaders, and
* declarations generally should not occur within VSIR code blocks unless function
* scope is specified, e.g. DXIL alloca. */
storage_class = temp->has_function_scope ? SpvStorageClassFunction : SpvStorageClassPrivate;
vsir_register_init(&reg, VKD3DSPR_IDXTEMP, VKD3D_DATA_FLOAT, 1); vsir_register_init(&reg, VKD3DSPR_IDXTEMP, VKD3D_DATA_FLOAT, 1);
reg.idx[0].offset = temp->register_idx; reg.idx[0].offset = temp->register_idx;

2
libs/vkd3d-shader/tpf.c
View File

@ -1117,6 +1117,8 @@ static void shader_sm4_read_dcl_indexable_temp(struct vkd3d_shader_instruction *
ins->declaration.indexable_temp.alignment = 0; ins->declaration.indexable_temp.alignment = 0;
ins->declaration.indexable_temp.data_type = VKD3D_DATA_FLOAT; ins->declaration.indexable_temp.data_type = VKD3D_DATA_FLOAT;
ins->declaration.indexable_temp.component_count = *tokens; ins->declaration.indexable_temp.component_count = *tokens;
/* Indexable temp declarations are global, but except for hull shaders the backend currently emits them within a function. */
ins->declaration.indexable_temp.has_function_scope = priv->p.shader_version.type != VKD3D_SHADER_TYPE_HULL;
} }
static void shader_sm4_read_dcl_global_flags(struct vkd3d_shader_instruction *ins, uint32_t opcode, static void shader_sm4_read_dcl_global_flags(struct vkd3d_shader_instruction *ins, uint32_t opcode,

1
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@ -820,6 +820,7 @@ struct vkd3d_shader_indexable_temp
unsigned int alignment; unsigned int alignment;
enum vkd3d_data_type data_type; enum vkd3d_data_type data_type;
unsigned int component_count; unsigned int component_count;
bool has_function_scope;
const struct vkd3d_shader_immediate_constant_buffer *initialiser; const struct vkd3d_shader_immediate_constant_buffer *initialiser;
}; };