wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Preserve doubles in intrinsic_float_convert_arg().

Browse Source
This commit is contained in:
Elizabeth Figura 2024-09-04 22:46:53 -05:00 committed by Henri Verbeet
parent 534d546ed9
commit ebaf877b62
Notes: Henri Verbeet 2024-09-12 18:57:51 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1064
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libs/vkd3d-shader/hlsl.y
View File

@ -1673,25 +1673,36 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct hlsl_block *bl
return expr; return expr;
} }
static bool type_is_integer(enum hlsl_base_type type)
{
switch (type)
{
case HLSL_TYPE_BOOL:
case HLSL_TYPE_INT:
case HLSL_TYPE_UINT:
return true;
case HLSL_TYPE_DOUBLE:
case HLSL_TYPE_FLOAT:
case HLSL_TYPE_HALF:
return false;
}
vkd3d_unreachable();
}
static void check_integer_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node *instr) static void check_integer_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node *instr)
{ {
const struct hlsl_type *type = instr->data_type; const struct hlsl_type *type = instr->data_type;
struct vkd3d_string_buffer *string; struct vkd3d_string_buffer *string;
switch (type->e.numeric.type) if (type_is_integer(type->e.numeric.type))
{ return;
case HLSL_TYPE_BOOL:
case HLSL_TYPE_INT:
case HLSL_TYPE_UINT:
break;
default: if ((string = hlsl_type_to_string(ctx, type)))
if ((string = hlsl_type_to_string(ctx, type))) hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE,
hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Expression type '%s' is not integer.", string->buffer);
"Expression type '%s' is not integer.", string->buffer); hlsl_release_string_buffer(ctx, string);
hlsl_release_string_buffer(ctx, string);
break;
}
} }
static struct hlsl_ir_node *add_unary_arithmetic_expr(struct hlsl_ctx *ctx, struct hlsl_block *block, static struct hlsl_ir_node *add_unary_arithmetic_expr(struct hlsl_ctx *ctx, struct hlsl_block *block,
@ -3033,7 +3044,7 @@ static struct hlsl_ir_node *intrinsic_float_convert_arg(struct hlsl_ctx *ctx,
{ {
struct hlsl_type *type = arg->data_type; struct hlsl_type *type = arg->data_type;
if (type->e.numeric.type == HLSL_TYPE_FLOAT || type->e.numeric.type == HLSL_TYPE_HALF) if (!type_is_integer(type->e.numeric.type))
return arg; return arg;
type = hlsl_get_numeric_type(ctx, type->class, HLSL_TYPE_FLOAT, type->dimx, type->dimy); type = hlsl_get_numeric_type(ctx, type->class, HLSL_TYPE_FLOAT, type->dimx, type->dimy);