mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2024-11-21 16:46:41 -08:00
vkd3d-shader/dxil: Handle missing flags as zero for CMP2.
The flag operand is omitted if IEEE strictness is specified.
This commit is contained in:
parent
f1e9f40061
commit
408f67c69c
Notes:
Alexandre Julliard
2023-11-14 23:09:40 +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/469
@ -3494,11 +3494,11 @@ static void sm6_parser_emit_cmp2(struct sm6_parser *sm6, const struct dxil_recor
|
|||||||
{
|
{
|
||||||
struct vkd3d_shader_src_param *src_params;
|
struct vkd3d_shader_src_param *src_params;
|
||||||
const struct sm6_type *type_a, *type_b;
|
const struct sm6_type *type_a, *type_b;
|
||||||
|
bool is_int, is_fp, silence_warning;
|
||||||
const struct sm6_cmp_info *cmp;
|
const struct sm6_cmp_info *cmp;
|
||||||
const struct sm6_value *a, *b;
|
const struct sm6_value *a, *b;
|
||||||
|
uint64_t code, flags;
|
||||||
unsigned int i = 0;
|
unsigned int i = 0;
|
||||||
bool is_int, is_fp;
|
|
||||||
uint64_t code;
|
|
||||||
|
|
||||||
if (!(dst->type = sm6->bool_type))
|
if (!(dst->type = sm6->bool_type))
|
||||||
{
|
{
|
||||||
@ -3549,29 +3549,26 @@ static void sm6_parser_emit_cmp2(struct sm6_parser *sm6, const struct dxil_recor
|
|||||||
|
|
||||||
vsir_instruction_init(ins, &sm6->p.location, cmp->handler_idx);
|
vsir_instruction_init(ins, &sm6->p.location, cmp->handler_idx);
|
||||||
|
|
||||||
if (record->operand_count > i)
|
flags = (record->operand_count > i) ? record->operands[i] : 0;
|
||||||
{
|
silence_warning = false;
|
||||||
uint64_t flags = record->operands[i];
|
|
||||||
bool silence_warning = false;
|
|
||||||
|
|
||||||
if (is_fp)
|
if (is_fp)
|
||||||
{
|
{
|
||||||
if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA))
|
if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA))
|
||||||
ins->flags |= VKD3DSI_PRECISE_X;
|
ins->flags |= VKD3DSI_PRECISE_X;
|
||||||
flags &= ~FP_ALLOW_UNSAFE_ALGEBRA;
|
flags &= ~FP_ALLOW_UNSAFE_ALGEBRA;
|
||||||
/* SPIR-V FPFastMathMode is only available in the Kernel execution model. */
|
/* SPIR-V FPFastMathMode is only available in the Kernel execution model. */
|
||||||
silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL));
|
silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL));
|
||||||
}
|
}
|
||||||
if (flags && silence_warning)
|
if (flags && silence_warning)
|
||||||
{
|
{
|
||||||
TRACE("Ignoring fast FP modifier %#"PRIx64".\n", flags);
|
TRACE("Ignoring fast FP modifier %#"PRIx64".\n", flags);
|
||||||
}
|
}
|
||||||
else if (flags)
|
else if (flags)
|
||||||
{
|
{
|
||||||
WARN("Ignoring flags %#"PRIx64".\n", flags);
|
WARN("Ignoring flags %#"PRIx64".\n", flags);
|
||||||
vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS,
|
vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS,
|
||||||
"Ignoring flags %#"PRIx64" for a comparison operation.", flags);
|
"Ignoring flags %#"PRIx64" for a comparison operation.", flags);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
src_params = instruction_src_params_alloc(ins, 2, sm6);
|
src_params = instruction_src_params_alloc(ins, 2, sm6);
|
||||||
|
Loading…
Reference in New Issue
Block a user