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/dxil: Rewrite sm6_value_get_constant_uint64() in terms of the SM6 value.

Browse Source 
Instead of using the VSIR register.
This commit is contained in:
Giovanni Mascellani
2025-05-13 11:34:58 +02:00
committed by Henri Verbeet
parent 2e3f99e61e
commit 31e4cbba2e
Notes: Henri Verbeet 2025-06-10 18:06:02 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1546
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2225,17 +2225,6 @@ static const char *sm6_parser_get_global_symbol_name(const struct sm6_parser *sm
return NULL; return NULL;
} }
static uint64_t register_get_uint64_value(const struct vkd3d_shader_register *reg)
{
if (!register_is_constant(reg) || !data_type_is_integer(reg->data_type))
return UINT64_MAX;
if (reg->dimension == VSIR_DIMENSION_VEC4)
WARN("Returning vec4.x.\n");
return (reg->type == VKD3DSPR_IMMCONST64) ? reg->u.immconst_u64[0] : reg->u.immconst_u32[0];
}
static inline bool sm6_value_is_function_dcl(const struct sm6_value *value) static inline bool sm6_value_is_function_dcl(const struct sm6_value *value)
{ {
return value->value_type == VALUE_TYPE_FUNCTION; return value->value_type == VALUE_TYPE_FUNCTION;
@@ -2361,11 +2350,26 @@ static unsigned int sm6_value_get_constant_uint(const struct sm6_value *value, s
return value->u.constant.immconst.immconst_u32[0]; return value->u.constant.immconst.immconst_u32[0];
} }
static uint64_t sm6_value_get_constant_uint64(const struct sm6_value *value) static uint64_t sm6_value_get_constant_uint64(const struct sm6_value *value, struct sm6_parser *sm6)
{ {
if (!sm6_value_is_constant(value)) if (!sm6_value_is_constant(value))
{
vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_CONSTANT,
"Invalid non-constant value.");
return UINT64_MAX; return UINT64_MAX;
return register_get_uint64_value(&value->reg); }
if (value->type->class != TYPE_CLASS_INTEGER)
{
vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_CONSTANT,
"Invalid non-integer constant value.");
return UINT64_MAX;
}
if (value->type->u.width == 64)
return value->u.constant.immconst.immconst_u64[0];
else
return value->u.constant.immconst.immconst_u32[0];
} }
static unsigned int sm6_parser_alloc_ssa_id(struct sm6_parser *sm6) static unsigned int sm6_parser_alloc_ssa_id(struct sm6_parser *sm6)
@@ -7709,7 +7713,7 @@ static void sm6_parser_emit_switch(struct sm6_parser *sm6, const struct dxil_rec
"A switch case value is not a constant."); "A switch case value is not a constant.");
} }
terminator->cases[i / 2u].value = sm6_value_get_constant_uint64(src); terminator->cases[i / 2u].value = sm6_value_get_constant_uint64(src, sm6);
} }
ins->opcode = VKD3DSIH_NOP; ins->opcode = VKD3DSIH_NOP;