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: Introduce sm6_value_get_constant_float().

Browse Source 
Similarly to sm6_value_get_constant_uint() and
sm6_value_get_constant_uint64().
This commit is contained in:
Giovanni Mascellani
2025-05-13 11:51:36 +02:00
committed by Henri Verbeet
parent 873043226c
commit 20d8ba7f8d
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 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2377,6 +2377,33 @@ static uint64_t sm6_value_get_constant_uint64(const struct sm6_value *value, str
return value->u.constant.immconst.immconst_u32[0];
}
static float sm6_value_get_constant_float(const struct sm6_value *value, struct sm6_parser *sm6)
{
if (!sm6_value_is_constant(value))
{
vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_CONSTANT,
"Invalid non-constant value.");
return 0.0f;
}
if (value->type->class != TYPE_CLASS_FLOAT)
{
vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_CONSTANT,
"Invalid non-floating-point constant value.");
return 0.0f;
}
if (value->type->u.width == 64)
{
double val = value->u.constant.immconst.immconst_f64[0];
vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_CONSTANT,
"Invalid double constant %lf will be truncated do float %f.", val, (float)val);
return val;
}
return value->u.constant.immconst.immconst_f32[0];
}
static unsigned int sm6_parser_alloc_ssa_id(struct sm6_parser *sm6)
{
return sm6->ssa_next_id++;
@@ -3075,23 +3102,6 @@ static inline uint64_t decode_rotated_signed_value(uint64_t value)
return value << 63;
}
static float register_get_float_value(const struct vkd3d_shader_register *reg)
{
if (!register_is_constant(reg) || !data_type_is_floating_point(reg->data_type))
return 0.0;
if (reg->dimension == VSIR_DIMENSION_VEC4)
WARN("Returning vec4.x.\n");
if (reg->type == VKD3DSPR_IMMCONST64)
{
WARN("Truncating double to float.\n");
return reg->u.immconst_f64[0];
}
return reg->u.immconst_f32[0];
}
static enum vkd3d_result value_allocate_constant_array(struct sm6_value *dst, const struct sm6_type *type,
const uint64_t *operands, struct sm6_parser *sm6)
{
@@ -7819,7 +7829,7 @@ static bool sm6_metadata_get_uint64_value(struct sm6_parser *sm6,
return true;
}
static bool sm6_metadata_get_float_value(const struct sm6_parser *sm6,
static bool sm6_metadata_get_float_value(struct sm6_parser *sm6,
const struct sm6_metadata_value *m, float *f)
{
const struct sm6_value *value;
@@ -7833,7 +7843,7 @@ static bool sm6_metadata_get_float_value(const struct sm6_parser *sm6,
if (!sm6_type_is_floating_point(value->type))
return false;
*f = register_get_float_value(&value->reg);
*f = sm6_value_get_constant_float(value, sm6);
return true;
}