wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/tpf: Replace sm4_dst_register with vkd3d_shader_dst_param.

Browse Source
This commit is contained in:
Francisco Casas 2023-07-17 18:08:54 -04:00 committed by Alexandre Julliard
parent d41d8f8771
commit ef9ec28eb0
Notes: Alexandre Julliard 2023-09-28 23:26:16 +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/378
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3610,11 +3610,7 @@ struct sm4_instruction
struct sm4_instruction_modifier modifiers[1]; struct sm4_instruction_modifier modifiers[1];
unsigned int modifier_count; unsigned int modifier_count;
struct sm4_dst_register struct vkd3d_shader_dst_param dsts[2];
{
struct vkd3d_shader_register reg;
unsigned int write_mask;
} dsts[2];
unsigned int dst_count; unsigned int dst_count;
struct sm4_src_register struct sm4_src_register
@ -3794,7 +3790,7 @@ static void sm4_register_from_node(struct vkd3d_shader_register *reg, unsigned i
*writemask = instr->reg.writemask; *writemask = instr->reg.writemask;
} }
static void sm4_dst_from_node(struct sm4_dst_register *dst, const struct hlsl_ir_node *instr) static void sm4_dst_from_node(struct vkd3d_shader_dst_param *dst, const struct hlsl_ir_node *instr)
{ {
unsigned int swizzle_type; unsigned int swizzle_type;
@ -3844,7 +3840,7 @@ static void sm4_src_from_node(struct sm4_src_register *src,
src->swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), map_writemask); src->swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), map_writemask);
} }
static void sm4_write_dst_register(const struct tpf_writer *tpf, const struct sm4_dst_register *dst) static void sm4_write_dst_register(const struct tpf_writer *tpf, const struct vkd3d_shader_dst_param *dst)
{ {
const struct vkd3d_sm4_register_type_info *register_type_info; const struct vkd3d_sm4_register_type_info *register_type_info;
struct vkd3d_bytecode_buffer *buffer = tpf->buffer; struct vkd3d_bytecode_buffer *buffer = tpf->buffer;
@ -3934,7 +3930,7 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct sm
} }
} }
static uint32_t sm4_dst_register_order(const struct sm4_dst_register *dst) static uint32_t vkd3d_shader_dst_param_order(const struct vkd3d_shader_dst_param *dst)
{ {
uint32_t order = 1; uint32_t order = 1;
if (dst->reg.type == VKD3DSPR_IMMCONST) if (dst->reg.type == VKD3DSPR_IMMCONST)
@ -3962,7 +3958,7 @@ static void write_sm4_instruction(const struct tpf_writer *tpf, const struct sm4
size += instr->modifier_count; size += instr->modifier_count;
for (i = 0; i < instr->dst_count; ++i) for (i = 0; i < instr->dst_count; ++i)
size += sm4_dst_register_order(&instr->dsts[i]); size += vkd3d_shader_dst_param_order(&instr->dsts[i]);
for (i = 0; i < instr->src_count; ++i) for (i = 0; i < instr->src_count; ++i)
size += sm4_src_register_order(&instr->srcs[i]); size += sm4_src_register_order(&instr->srcs[i]);
size += instr->idx_count; size += instr->idx_count;