[PATCH vkd3d 6/6] vkd3d-shader/hlsl: Write SM4 addition instructions.
Zebediah Figura
zfigura at codeweavers.com
Tue Aug 24 01:18:12 CDT 2021
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
Makefile.am | 1 -
libs/vkd3d-shader/hlsl_sm4.c | 62 ++++++++++++++++++++++++++++++++++++
2 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 9d0410ab..c66f7b50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -273,7 +273,6 @@ XFAIL_TESTS = \
tests/hlsl-return-void.shader_test \
tests/hlsl-static-initializer.shader_test \
tests/hlsl-storage-qualifiers.shader_test \
- tests/hlsl-struct-assignment.shader_test \
tests/hlsl-vector-indexing.shader_test \
tests/hlsl-vector-indexing-uniform.shader_test \
tests/math.shader_test \
diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c
index 27058fef..32a4eda1 100644
--- a/libs/vkd3d-shader/hlsl_sm4.c
+++ b/libs/vkd3d-shader/hlsl_sm4.c
@@ -894,6 +894,27 @@ static void write_sm4_ret(struct vkd3d_bytecode_buffer *buffer)
write_sm4_instruction(buffer, &instr);
}
+static void write_sm4_binary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d_sm4_opcode opcode,
+ const struct hlsl_ir_node *dst, const struct hlsl_ir_node *src1, const struct hlsl_ir_node *src2)
+{
+ struct sm4_instruction instr;
+ unsigned int writemask;
+
+ memset(&instr, 0, sizeof(instr));
+ instr.opcode = opcode;
+
+ sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, dst);
+ instr.has_dst = 1;
+
+ sm4_register_from_node(&instr.srcs[0].reg, &writemask, src1);
+ instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask);
+ sm4_register_from_node(&instr.srcs[1].reg, &writemask, src2);
+ instr.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask);
+ instr.src_count = 2;
+
+ write_sm4_instruction(buffer, &instr);
+}
+
static void write_sm4_constant(struct hlsl_ctx *ctx,
struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_constant *constant)
{
@@ -918,6 +939,43 @@ static void write_sm4_constant(struct hlsl_ctx *ctx,
write_sm4_instruction(buffer, &instr);
}
+static void write_sm4_expr(struct hlsl_ctx *ctx,
+ struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_expr *expr)
+{
+ const struct hlsl_ir_node *arg1 = expr->operands[0].node;
+ const struct hlsl_ir_node *arg2 = expr->operands[1].node;
+
+ assert(expr->node.reg.allocated);
+
+ switch (expr->node.data_type->base_type)
+ {
+ case HLSL_TYPE_FLOAT:
+ {
+ switch (expr->op)
+ {
+ case HLSL_OP2_ADD:
+ write_sm4_binary_op(buffer, VKD3D_SM4_OP_ADD, &expr->node, arg1, arg2);
+ break;
+
+ default:
+ hlsl_fixme(ctx, expr->node.loc, "SM4 float \"%s\" expression.", debug_hlsl_expr_op(expr->op));
+ break;
+ }
+ break;
+ }
+
+ default:
+ {
+ struct vkd3d_string_buffer *string;
+
+ if ((string = hlsl_type_to_string(ctx, expr->node.data_type)))
+ hlsl_fixme(ctx, expr->node.loc, "SM4 %s expression.", string->buffer);
+ hlsl_release_string_buffer(ctx, string);
+ break;
+ }
+ }
+}
+
static void write_sm4_load(struct hlsl_ctx *ctx,
struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_load *load)
{
@@ -1044,6 +1102,10 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx,
write_sm4_constant(ctx, &buffer, hlsl_ir_constant(instr));
break;
+ case HLSL_IR_EXPR:
+ write_sm4_expr(ctx, &buffer, hlsl_ir_expr(instr));
+ break;
+
case HLSL_IR_LOAD:
write_sm4_load(ctx, &buffer, hlsl_ir_load(instr));
break;
--
2.32.0
More information about the wine-devel
mailing list