wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/tpf: Put sm4_register.immconst_uint inside a union.

Browse Source
This commit is contained in:
Francisco Casas 2023-08-30 21:46:24 -04:00 committed by Alexandre Julliard
parent 0c8b74cb39
commit 8124ba3a54
Notes: Alexandre Julliard 2023-09-27 22:59:39 +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/370
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libs/vkd3d-shader/tpf.c
View File

@ -3609,7 +3609,10 @@ struct sm4_register
struct vkd3d_shader_register_index idx[2]; struct vkd3d_shader_register_index idx[2];
unsigned int idx_count; unsigned int idx_count;
enum vsir_dimension dimension; enum vsir_dimension dimension;
uint32_t immconst_uint[4]; union
{
uint32_t immconst_uint[4];
} u;
unsigned int mod; unsigned int mod;
}; };
@ -3818,7 +3821,7 @@ static void sm4_src_from_constant_value(struct sm4_src_register *src,
if (width == 1) if (width == 1)
{ {
src->reg.dimension = VSIR_DIMENSION_SCALAR; src->reg.dimension = VSIR_DIMENSION_SCALAR;
src->reg.immconst_uint[0] = value->u[0].u; src->reg.u.immconst_uint[0] = value->u[0].u;
} }
else else
{ {
@ -3828,9 +3831,9 @@ static void sm4_src_from_constant_value(struct sm4_src_register *src,
for (i = 0; i < 4; ++i) for (i = 0; i < 4; ++i)
{ {
if ((map_writemask & (1u << i)) && (j < width)) if ((map_writemask & (1u << i)) && (j < width))
src->reg.immconst_uint[i] = value->u[j++].u; src->reg.u.immconst_uint[i] = value->u[j++].u;
else else
src->reg.immconst_uint[i] = 0; src->reg.u.immconst_uint[i] = 0;
} }
} }
} }
@ -3933,12 +3936,12 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct sm
if (src->reg.type == VKD3DSPR_IMMCONST) if (src->reg.type == VKD3DSPR_IMMCONST)
{ {
put_u32(buffer, src->reg.immconst_uint[0]); put_u32(buffer, src->reg.u.immconst_uint[0]);
if (reg_dim == VKD3D_SM4_DIMENSION_VEC4) if (reg_dim == VKD3D_SM4_DIMENSION_VEC4)
{ {
put_u32(buffer, src->reg.immconst_uint[1]); put_u32(buffer, src->reg.u.immconst_uint[1]);
put_u32(buffer, src->reg.immconst_uint[2]); put_u32(buffer, src->reg.u.immconst_uint[2]);
put_u32(buffer, src->reg.immconst_uint[3]); put_u32(buffer, src->reg.u.immconst_uint[3]);
} }
} }
} }
@ -4449,7 +4452,7 @@ static void write_sm4_ld(const struct tpf_writer *tpf, const struct hlsl_ir_node
instr.srcs[2].swizzle_type = VKD3D_SM4_SWIZZLE_NONE; instr.srcs[2].swizzle_type = VKD3D_SM4_SWIZZLE_NONE;
reg->type = VKD3DSPR_IMMCONST; reg->type = VKD3DSPR_IMMCONST;
reg->dimension = VSIR_DIMENSION_SCALAR; reg->dimension = VSIR_DIMENSION_SCALAR;
reg->immconst_uint[0] = index->value.u[0].u; reg->u.immconst_uint[0] = index->value.u[0].u;
} }
else if (tpf->ctx->profile->major_version == 4 && tpf->ctx->profile->minor_version == 0) else if (tpf->ctx->profile->major_version == 4 && tpf->ctx->profile->minor_version == 0)
{ {
@ -4611,7 +4614,7 @@ static void write_sm4_cast_from_bool(const struct tpf_writer *tpf, const struct
instr.srcs[1].swizzle_type = VKD3D_SM4_SWIZZLE_NONE; instr.srcs[1].swizzle_type = VKD3D_SM4_SWIZZLE_NONE;
instr.srcs[1].reg.type = VKD3DSPR_IMMCONST; instr.srcs[1].reg.type = VKD3DSPR_IMMCONST;
instr.srcs[1].reg.dimension = VSIR_DIMENSION_SCALAR; instr.srcs[1].reg.dimension = VSIR_DIMENSION_SCALAR;
instr.srcs[1].reg.immconst_uint[0] = mask; instr.srcs[1].reg.u.immconst_uint[0] = mask;
instr.src_count = 2; instr.src_count = 2;
write_sm4_instruction(tpf, &instr); write_sm4_instruction(tpf, &instr);