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/spirv: Clamp ftoi lower bound to INT_MIN.

Browse Source
This commit is contained in:
Zebediah Figura 2023-08-03 19:50:03 -05:00 committed by Alexandre Julliard
parent cc893a3368
commit 9dee15da5b
Notes: Alexandre Julliard 2023-09-25 22:27:00 +02: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/289
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6530,7 +6530,6 @@ static SpvOp spirv_compiler_map_alu_instruction(const struct vkd3d_shader_instru
{VKD3DSIH_DTOI, SpvOpConvertFToS}, {VKD3DSIH_DTOI, SpvOpConvertFToS},
{VKD3DSIH_DTOU, SpvOpConvertFToU}, {VKD3DSIH_DTOU, SpvOpConvertFToU},
{VKD3DSIH_FTOD, SpvOpFConvert}, {VKD3DSIH_FTOD, SpvOpFConvert},
{VKD3DSIH_FTOI, SpvOpConvertFToS},
{VKD3DSIH_IADD, SpvOpIAdd}, {VKD3DSIH_IADD, SpvOpIAdd},
{VKD3DSIH_INEG, SpvOpSNegate}, {VKD3DSIH_INEG, SpvOpSNegate},
{VKD3DSIH_ISHL, SpvOpShiftLeftLogical}, {VKD3DSIH_ISHL, SpvOpShiftLeftLogical},
@ -6996,6 +6995,33 @@ static void spirv_compiler_emit_udiv(struct spirv_compiler *compiler,
} }
} }
static void spirv_compiler_emit_ftoi(struct spirv_compiler *compiler,
const struct vkd3d_shader_instruction *instruction)
{
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
const struct vkd3d_shader_dst_param *dst = instruction->dst;
const struct vkd3d_shader_src_param *src = instruction->src;
uint32_t src_type_id, type_id, src_id, int_min_id, val_id;
assert(instruction->dst_count == 1);
assert(instruction->src_count == 1);
/* OpConvertFToI has undefined results if the result cannot be represented
* as a signed integer, but Direct3D expects the result to saturate,
* and for NaN to yield zero. */
src_type_id = spirv_compiler_get_type_id_for_reg(compiler, &src->reg, dst->write_mask);
type_id = spirv_compiler_get_type_id_for_dst(compiler, dst);
src_id = spirv_compiler_emit_load_src(compiler, src, dst->write_mask);
int_min_id = spirv_compiler_get_constant_float_vector(compiler, -2147483648.0f,
vkd3d_write_mask_component_count(dst->write_mask));
val_id = vkd3d_spirv_build_op_glsl_std450_max(builder, src_type_id, src_id, int_min_id);
val_id = vkd3d_spirv_build_op_tr1(builder, &builder->function_stream, SpvOpConvertFToS, type_id, val_id);
spirv_compiler_emit_store_dst(compiler, dst, val_id);
}
static void spirv_compiler_emit_ftou(struct spirv_compiler *compiler, static void spirv_compiler_emit_ftou(struct spirv_compiler *compiler,
const struct vkd3d_shader_instruction *instruction) const struct vkd3d_shader_instruction *instruction)
{ {
@ -9304,7 +9330,6 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler,
case VKD3DSIH_DTOI: case VKD3DSIH_DTOI:
case VKD3DSIH_DTOU: case VKD3DSIH_DTOU:
case VKD3DSIH_FTOD: case VKD3DSIH_FTOD:
case VKD3DSIH_FTOI:
case VKD3DSIH_IADD: case VKD3DSIH_IADD:
case VKD3DSIH_INEG: case VKD3DSIH_INEG:
case VKD3DSIH_ISHL: case VKD3DSIH_ISHL:
@ -9365,6 +9390,9 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler,
case VKD3DSIH_UDIV: case VKD3DSIH_UDIV:
spirv_compiler_emit_udiv(compiler, instruction); spirv_compiler_emit_udiv(compiler, instruction);
break; break;
case VKD3DSIH_FTOI:
spirv_compiler_emit_ftoi(compiler, instruction);
break;
case VKD3DSIH_FTOU: case VKD3DSIH_FTOU:
spirv_compiler_emit_ftou(compiler, instruction); spirv_compiler_emit_ftou(compiler, instruction);
break; break;