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: Introduce an IDIV instruction.

Browse Source
This commit is contained in:
Conor McCarthy 2023-05-25 12:07:26 +10:00 committed by Alexandre Julliard
parent c8d3515d8b
commit acbc80cba2
Notes: Alexandre Julliard 2023-11-06 23:18:07 +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/409
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/vkd3d-shader/d3d_asm.c
View File

@ -171,6 +171,7 @@ static const char * const shader_opcode_names[] =
[VKD3DSIH_HS_JOIN_PHASE ] = "hs_join_phase", [VKD3DSIH_HS_JOIN_PHASE ] = "hs_join_phase",
[VKD3DSIH_IADD ] = "iadd", [VKD3DSIH_IADD ] = "iadd",
[VKD3DSIH_IBFE ] = "ibfe", [VKD3DSIH_IBFE ] = "ibfe",
[VKD3DSIH_IDIV ] = "idiv",
[VKD3DSIH_IEQ ] = "ieq", [VKD3DSIH_IEQ ] = "ieq",
[VKD3DSIH_IF ] = "if", [VKD3DSIH_IF ] = "if",
[VKD3DSIH_IFC ] = "ifc", [VKD3DSIH_IFC ] = "ifc",

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

@ -1431,13 +1431,6 @@ static uint32_t vkd3d_spirv_build_op_udiv(struct vkd3d_spirv_builder *builder,
SpvOpUDiv, result_type, operand0, operand1); SpvOpUDiv, result_type, operand0, operand1);
} }
static uint32_t vkd3d_spirv_build_op_umod(struct vkd3d_spirv_builder *builder,
uint32_t result_type, uint32_t operand0, uint32_t operand1)
{
return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream,
SpvOpUMod, result_type, operand0, operand1);
}
static uint32_t vkd3d_spirv_build_op_isub(struct vkd3d_spirv_builder *builder, static uint32_t vkd3d_spirv_build_op_isub(struct vkd3d_spirv_builder *builder,
uint32_t result_type, uint32_t operand0, uint32_t operand1) uint32_t result_type, uint32_t operand0, uint32_t operand1)
{ {
@ -6992,7 +6985,7 @@ static void spirv_compiler_emit_imad(struct spirv_compiler *compiler,
spirv_compiler_emit_store_dst(compiler, dst, val_id); spirv_compiler_emit_store_dst(compiler, dst, val_id);
} }
static void spirv_compiler_emit_udiv(struct spirv_compiler *compiler, static void spirv_compiler_emit_int_div(struct spirv_compiler *compiler,
const struct vkd3d_shader_instruction *instruction) const struct vkd3d_shader_instruction *instruction)
{ {
uint32_t type_id, val_id, src0_id, src1_id, condition_id, uint_max_id; uint32_t type_id, val_id, src0_id, src1_id, condition_id, uint_max_id;
@ -7000,6 +6993,10 @@ static void spirv_compiler_emit_udiv(struct spirv_compiler *compiler,
const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_dst_param *dst = instruction->dst;
const struct vkd3d_shader_src_param *src = instruction->src; const struct vkd3d_shader_src_param *src = instruction->src;
unsigned int component_count = 0; unsigned int component_count = 0;
SpvOp div_op, mod_op;
div_op = instruction->handler_idx == VKD3DSIH_IDIV ? SpvOpSDiv : SpvOpUDiv;
mod_op = instruction->handler_idx == VKD3DSIH_IDIV ? SpvOpSRem : SpvOpUMod;
if (dst[0].reg.type != VKD3DSPR_NULL) if (dst[0].reg.type != VKD3DSPR_NULL)
{ {
@ -7014,7 +7011,7 @@ static void spirv_compiler_emit_udiv(struct spirv_compiler *compiler,
uint_max_id = spirv_compiler_get_constant_uint_vector(compiler, uint_max_id = spirv_compiler_get_constant_uint_vector(compiler,
0xffffffff, component_count); 0xffffffff, component_count);
val_id = vkd3d_spirv_build_op_udiv(builder, type_id, src0_id, src1_id); val_id = vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, div_op, type_id, src0_id, src1_id);
/* The SPIR-V spec says: "The resulting value is undefined if Operand 2 is 0." */ /* The SPIR-V spec says: "The resulting value is undefined if Operand 2 is 0." */
val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, uint_max_id); val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, uint_max_id);
@ -7037,7 +7034,7 @@ static void spirv_compiler_emit_udiv(struct spirv_compiler *compiler,
0xffffffff, component_count); 0xffffffff, component_count);
} }
val_id = vkd3d_spirv_build_op_umod(builder, type_id, src0_id, src1_id); val_id = vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, mod_op, type_id, src0_id, src1_id);
/* The SPIR-V spec says: "The resulting value is undefined if Operand 2 is 0." */ /* The SPIR-V spec says: "The resulting value is undefined if Operand 2 is 0." */
val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, uint_max_id); val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, uint_max_id);
@ -9448,8 +9445,9 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler,
case VKD3DSIH_IMAD: case VKD3DSIH_IMAD:
spirv_compiler_emit_imad(compiler, instruction); spirv_compiler_emit_imad(compiler, instruction);
break; break;
case VKD3DSIH_IDIV:
case VKD3DSIH_UDIV: case VKD3DSIH_UDIV:
spirv_compiler_emit_udiv(compiler, instruction); spirv_compiler_emit_int_div(compiler, instruction);
break; break;
case VKD3DSIH_FTOI: case VKD3DSIH_FTOI:
spirv_compiler_emit_ftoi(compiler, instruction); spirv_compiler_emit_ftoi(compiler, instruction);

1
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@ -355,6 +355,7 @@ enum vkd3d_shader_opcode
VKD3DSIH_HS_JOIN_PHASE, VKD3DSIH_HS_JOIN_PHASE,
VKD3DSIH_IADD, VKD3DSIH_IADD,
VKD3DSIH_IBFE, VKD3DSIH_IBFE,
VKD3DSIH_IDIV,
VKD3DSIH_IEQ, VKD3DSIH_IEQ,
VKD3DSIH_IF, VKD3DSIH_IF,
VKD3DSIH_IFC, VKD3DSIH_IFC,