wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Specify the destination register in struct sm4_instruction as an array.

Browse Source 
Some instructions (e.g. umul) have multiple destination registers.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Giovanni Mascellani
2021-09-27 20:51:43 -05:00
committed by Alexandre Julliard
parent efab7c82a5
commit 897ba6a3c7
1 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
libs/vkd3d-shader/hlsl_sm4.c
View File

@@ -572,7 +572,8 @@ struct sm4_instruction
{ {
struct sm4_register reg; struct sm4_register reg;
unsigned int writemask; unsigned int writemask;
} dst; } dsts[1];
unsigned int dst_count;
struct struct
{ {
@@ -583,8 +584,6 @@ struct sm4_instruction
uint32_t idx[2]; uint32_t idx[2];
unsigned int idx_count; unsigned int idx_count;
unsigned int has_dst;
}; };
static unsigned int sm4_swizzle_type(enum vkd3d_sm4_register_type type) static unsigned int sm4_swizzle_type(enum vkd3d_sm4_register_type type)
@@ -724,8 +723,8 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st
uint32_t token = instr->opcode; uint32_t token = instr->opcode;
unsigned int size = 1, i, j; unsigned int size = 1, i, j;
if (instr->has_dst) for (i = 0; i < instr->dst_count; ++i)
size += sm4_register_order(&instr->dst.reg); size += sm4_register_order(&instr->dsts[i].reg);
for (i = 0; i < instr->src_count; ++i) for (i = 0; i < instr->src_count; ++i)
size += sm4_register_order(&instr->srcs[i].reg); size += sm4_register_order(&instr->srcs[i].reg);
size += instr->idx_count; size += instr->idx_count;
@@ -733,15 +732,15 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st
token |= (size << VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT); token |= (size << VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT);
put_u32(buffer, token); put_u32(buffer, token);
if (instr->has_dst) for (i = 0; i < instr->dst_count; ++i)
{ {
token = sm4_encode_register(&instr->dst.reg); token = sm4_encode_register(&instr->dsts[i].reg);
if (instr->dst.reg.dim == VKD3D_SM4_DIMENSION_VEC4) if (instr->dsts[i].reg.dim == VKD3D_SM4_DIMENSION_VEC4)
token |= instr->dst.writemask << VKD3D_SM4_WRITEMASK_SHIFT; token |= instr->dsts[i].writemask << VKD3D_SM4_WRITEMASK_SHIFT;
put_u32(buffer, token); put_u32(buffer, token);
for (j = 0; j < instr->dst.reg.idx_count; ++j) for (j = 0; j < instr->dsts[i].reg.idx_count; ++j)
put_u32(buffer, instr->dst.reg.idx[j]); put_u32(buffer, instr->dsts[i].reg.idx[j]);
} }
for (i = 0; i < instr->src_count; ++i) for (i = 0; i < instr->src_count; ++i)
@@ -801,33 +800,33 @@ static void write_sm4_dcl_semantic(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b
struct sm4_instruction instr = struct sm4_instruction instr =
{ {
.dst.reg.dim = VKD3D_SM4_DIMENSION_VEC4, .dsts[0].reg.dim = VKD3D_SM4_DIMENSION_VEC4,
.has_dst = 1, .dst_count = 1,
}; };
if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &instr.dst.reg.type, &has_idx)) if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &instr.dsts[0].reg.type, &has_idx))
{ {
if (has_idx) if (has_idx)
{ {
instr.dst.reg.idx[0] = var->semantic.index; instr.dsts[0].reg.idx[0] = var->semantic.index;
instr.dst.reg.idx_count = 1; instr.dsts[0].reg.idx_count = 1;
} }
else else
{ {
instr.dst.reg.idx_count = 0; instr.dsts[0].reg.idx_count = 0;
} }
instr.dst.writemask = (1 << var->data_type->dimx) - 1; instr.dsts[0].writemask = (1 << var->data_type->dimx) - 1;
} }
else else
{ {
instr.dst.reg.type = output ? VKD3D_SM4_RT_OUTPUT : VKD3D_SM4_RT_INPUT; instr.dsts[0].reg.type = output ? VKD3D_SM4_RT_OUTPUT : VKD3D_SM4_RT_INPUT;
instr.dst.reg.idx[0] = var->reg.id; instr.dsts[0].reg.idx[0] = var->reg.id;
instr.dst.reg.idx_count = 1; instr.dsts[0].reg.idx_count = 1;
instr.dst.writemask = var->reg.writemask; instr.dsts[0].writemask = var->reg.writemask;
} }
if (instr.dst.reg.type == VKD3D_SM4_RT_DEPTHOUT) if (instr.dsts[0].reg.type == VKD3D_SM4_RT_DEPTHOUT)
instr.dst.reg.dim = VKD3D_SM4_DIMENSION_SCALAR; instr.dsts[0].reg.dim = VKD3D_SM4_DIMENSION_SCALAR;
hlsl_sm4_usage_from_semantic(ctx, &var->semantic, output, &usage); hlsl_sm4_usage_from_semantic(ctx, &var->semantic, output, &usage);
@@ -915,11 +914,11 @@ static void write_sm4_unary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d_
memset(&instr, 0, sizeof(instr)); memset(&instr, 0, sizeof(instr));
instr.opcode = opcode; instr.opcode = opcode;
sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, dst); sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, dst);
instr.has_dst = 1; instr.dst_count = 1;
sm4_register_from_node(&instr.srcs[0].reg, &writemask, src); sm4_register_from_node(&instr.srcs[0].reg, &writemask, src);
instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask); instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask);
instr.srcs[0].reg.mod = src_mod; instr.srcs[0].reg.mod = src_mod;
instr.src_count = 1; instr.src_count = 1;
@@ -935,13 +934,13 @@ static void write_sm4_binary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d
memset(&instr, 0, sizeof(instr)); memset(&instr, 0, sizeof(instr));
instr.opcode = opcode; instr.opcode = opcode;
sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, dst); sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, dst);
instr.has_dst = 1; instr.dst_count = 1;
sm4_register_from_node(&instr.srcs[0].reg, &writemask, src1); 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); instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask);
sm4_register_from_node(&instr.srcs[1].reg, &writemask, src2); 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.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask);
instr.src_count = 2; instr.src_count = 2;
write_sm4_instruction(buffer, &instr); write_sm4_instruction(buffer, &instr);
@@ -957,8 +956,8 @@ static void write_sm4_constant(struct hlsl_ctx *ctx,
memset(&instr, 0, sizeof(instr)); memset(&instr, 0, sizeof(instr));
instr.opcode = VKD3D_SM4_OP_MOV; instr.opcode = VKD3D_SM4_OP_MOV;
sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, &constant->node); sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, &constant->node);
instr.has_dst = 1; instr.dst_count = 1;
instr.srcs[0].reg.dim = (dimx > 1) ? VKD3D_SM4_DIMENSION_VEC4 : VKD3D_SM4_DIMENSION_SCALAR; instr.srcs[0].reg.dim = (dimx > 1) ? VKD3D_SM4_DIMENSION_VEC4 : VKD3D_SM4_DIMENSION_SCALAR;
instr.srcs[0].reg.type = VKD3D_SM4_RT_IMMCONST; instr.srcs[0].reg.type = VKD3D_SM4_RT_IMMCONST;
@@ -1182,11 +1181,11 @@ static void write_sm4_load(struct hlsl_ctx *ctx,
memset(&instr, 0, sizeof(instr)); memset(&instr, 0, sizeof(instr));
instr.opcode = VKD3D_SM4_OP_MOV; instr.opcode = VKD3D_SM4_OP_MOV;
sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, &load->node); sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, &load->node);
instr.has_dst = 1; instr.dst_count = 1;
sm4_register_from_deref(ctx, &instr.srcs[0].reg, &writemask, &load->src, load->node.data_type); sm4_register_from_deref(ctx, &instr.srcs[0].reg, &writemask, &load->src, load->node.data_type);
instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask); instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask);
instr.src_count = 1; instr.src_count = 1;
write_sm4_instruction(buffer, &instr); write_sm4_instruction(buffer, &instr);
@@ -1208,12 +1207,12 @@ static void write_sm4_store(struct hlsl_ctx *ctx,
memset(&instr, 0, sizeof(instr)); memset(&instr, 0, sizeof(instr));
instr.opcode = VKD3D_SM4_OP_MOV; instr.opcode = VKD3D_SM4_OP_MOV;
sm4_register_from_deref(ctx, &instr.dst.reg, &writemask, &store->lhs, rhs->data_type); sm4_register_from_deref(ctx, &instr.dsts[0].reg, &writemask, &store->lhs, rhs->data_type);
instr.dst.writemask = hlsl_combine_writemasks(writemask, store->writemask); instr.dsts[0].writemask = hlsl_combine_writemasks(writemask, store->writemask);
instr.has_dst = 1; instr.dst_count = 1;
sm4_register_from_node(&instr.srcs[0].reg, &writemask, rhs); sm4_register_from_node(&instr.srcs[0].reg, &writemask, rhs);
instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask); instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask);
instr.src_count = 1; instr.src_count = 1;
write_sm4_instruction(buffer, &instr); write_sm4_instruction(buffer, &instr);
@@ -1228,12 +1227,12 @@ static void write_sm4_swizzle(struct hlsl_ctx *ctx,
memset(&instr, 0, sizeof(instr)); memset(&instr, 0, sizeof(instr));
instr.opcode = VKD3D_SM4_OP_MOV; instr.opcode = VKD3D_SM4_OP_MOV;
sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, &swizzle->node); sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, &swizzle->node);
instr.has_dst = 1; instr.dst_count = 1;
sm4_register_from_node(&instr.srcs[0].reg, &writemask, swizzle->val.node); sm4_register_from_node(&instr.srcs[0].reg, &writemask, swizzle->val.node);
instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_combine_swizzles(hlsl_swizzle_from_writemask(writemask), instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_combine_swizzles(hlsl_swizzle_from_writemask(writemask),
swizzle->swizzle, swizzle->node.data_type->dimx), instr.dst.writemask); swizzle->swizzle, swizzle->node.data_type->dimx), instr.dsts[0].writemask);
instr.src_count = 1; instr.src_count = 1;
write_sm4_instruction(buffer, &instr); write_sm4_instruction(buffer, &instr);