Module: vkd3d Branch: master Commit: d2427ea1bd956eba23cc7570d99da4a23310b832 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d2427ea1bd956eba23cc7570d99da4...
Author: Francisco Casas fcasas@codeweavers.com Date: Tue Apr 2 01:24:03 2024 -0300
vkd3d-shader/ir: Lower IFC instructions to IF instructions.
---
libs/vkd3d-shader/ir.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 2 deletions(-)
diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 59b74c06..f313eb65 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -82,6 +82,106 @@ static bool vsir_instruction_init_with_params(struct vsir_program *program, return true; }
+static bool get_opcode_from_rel_op(enum vkd3d_shader_rel_op rel_op, enum vkd3d_data_type data_type, + enum vkd3d_shader_opcode *opcode, bool *requires_swap) +{ + switch (rel_op) + { + case VKD3D_SHADER_REL_OP_LT: + case VKD3D_SHADER_REL_OP_GT: + *requires_swap = (rel_op == VKD3D_SHADER_REL_OP_GT); + if (data_type == VKD3D_DATA_FLOAT) + { + *opcode = VKD3DSIH_LTO; + return true; + } + break; + + case VKD3D_SHADER_REL_OP_GE: + case VKD3D_SHADER_REL_OP_LE: + *requires_swap = (rel_op == VKD3D_SHADER_REL_OP_LE); + if (data_type == VKD3D_DATA_FLOAT) + { + *opcode = VKD3DSIH_GEO; + return true; + } + break; + + case VKD3D_SHADER_REL_OP_EQ: + *requires_swap = false; + if (data_type == VKD3D_DATA_FLOAT) + { + *opcode = VKD3DSIH_EQO; + return true; + } + break; + + case VKD3D_SHADER_REL_OP_NE: + *requires_swap = false; + if (data_type == VKD3D_DATA_FLOAT) + { + *opcode = VKD3DSIH_NEO; + return true; + } + break; + } + return false; +} + +static enum vkd3d_result vsir_program_lower_ifc(struct vsir_program *program, + struct vkd3d_shader_instruction *ifc, unsigned int *tmp_idx, + struct vkd3d_shader_message_context *message_context) +{ + struct vkd3d_shader_instruction_array *instructions = &program->instructions; + size_t pos = ifc - instructions->elements; + struct vkd3d_shader_instruction *ins; + enum vkd3d_shader_opcode opcode; + bool swap; + + if (!shader_instruction_array_insert_at(instructions, pos + 1, 2)) + return VKD3D_ERROR_OUT_OF_MEMORY; + + if (*tmp_idx == ~0u) + *tmp_idx = program->temp_count++; + + /* Replace ifc comparison with actual comparison, saving the result in the tmp register. */ + if (!(get_opcode_from_rel_op(ifc->flags, ifc->src[0].reg.data_type, &opcode, &swap))) + { + vkd3d_shader_error(message_context, &ifc->location, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, + "Aborting due to not yet implemented feature: opcode for rel_op %u and data type %u.", + ifc->flags, ifc->src[0].reg.data_type); + return VKD3D_ERROR_NOT_IMPLEMENTED; + } + + ins = &instructions->elements[pos + 1]; + if (!vsir_instruction_init_with_params(program, ins, &ifc->location, opcode, 1, 2)) + return VKD3D_ERROR_OUT_OF_MEMORY; + + vsir_register_init(&ins->dst[0].reg, VKD3DSPR_TEMP, VKD3D_DATA_UINT, 1); + ins->dst[0].reg.dimension = VSIR_DIMENSION_VEC4; + ins->dst[0].reg.idx[0].offset = *tmp_idx; + ins->dst[0].write_mask = VKD3DSP_WRITEMASK_0; + + ins->src[0] = ifc->src[swap]; + ins->src[1] = ifc->src[!swap]; + + /* Create new if instruction using the previous result. */ + ins = &instructions->elements[pos + 2]; + if (!vsir_instruction_init_with_params(program, ins, &ifc->location, VKD3DSIH_IF, 0, 1)) + return VKD3D_ERROR_OUT_OF_MEMORY; + ins->flags = VKD3D_SHADER_CONDITIONAL_OP_NZ; + + vsir_register_init(&ins->src[0].reg, VKD3DSPR_TEMP, VKD3D_DATA_UINT, 1); + ins->src[0].reg.dimension = VSIR_DIMENSION_VEC4; + ins->src[0].reg.idx[0].offset = *tmp_idx; + ins->src[0].swizzle = VKD3D_SHADER_SWIZZLE(X, X, X, X); + + /* Make the original instruction no-op */ + vkd3d_shader_instruction_make_nop(ifc); + + return VKD3D_OK; +} + static enum vkd3d_result vsir_program_lower_texkill(struct vsir_program *program, struct vkd3d_shader_instruction *texkill, unsigned int *tmp_idx) { @@ -210,7 +310,8 @@ static enum vkd3d_result vsir_program_lower_precise_mad(struct vsir_program *pro return VKD3D_OK; }
-static enum vkd3d_result vsir_program_lower_instructions(struct vsir_program *program) +static enum vkd3d_result vsir_program_lower_instructions(struct vsir_program *program, + struct vkd3d_shader_message_context *message_context) { struct vkd3d_shader_instruction_array *instructions = &program->instructions; unsigned int tmp_idx = ~0u, i; @@ -222,6 +323,11 @@ static enum vkd3d_result vsir_program_lower_instructions(struct vsir_program *pr
switch (ins->handler_idx) { + case VKD3DSIH_IFC: + if ((ret = vsir_program_lower_ifc(program, ins, &tmp_idx, message_context)) < 0) + return ret; + break; + case VKD3DSIH_TEXKILL: if ((ret = vsir_program_lower_texkill(program, ins, &tmp_idx)) < 0) return ret; @@ -6056,7 +6162,7 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t { enum vkd3d_result result = VKD3D_OK;
- if ((result = vsir_program_lower_instructions(program)) < 0) + if ((result = vsir_program_lower_instructions(program, message_context)) < 0) return result;
if (program->shader_version.major >= 6)
-
Alexandre Julliard