wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/tpf: Replace sm4_register with vkd3d_shader_register.

Browse Source
This commit is contained in:
Francisco Casas 2023-08-31 16:28:13 -04:00 committed by Alexandre Julliard
parent 10bbc7eda5
commit 8e0fe29bfc
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 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3603,18 +3603,6 @@ static uint32_t sm4_encode_instruction_modifier(const struct sm4_instruction_mod
return word; return word;
} }
struct sm4_register
{
enum vkd3d_shader_register_type type;
struct vkd3d_shader_register_index idx[2];
unsigned int idx_count;
enum vsir_dimension dimension;
union
{
uint32_t immconst_uint[4];
} u;
};
struct sm4_instruction struct sm4_instruction
{ {
enum vkd3d_sm4_opcode opcode; enum vkd3d_sm4_opcode opcode;
@ -3624,14 +3612,14 @@ struct sm4_instruction
struct sm4_dst_register struct sm4_dst_register
{ {
struct sm4_register reg; struct vkd3d_shader_register reg;
unsigned int writemask; unsigned int writemask;
} dsts[2]; } dsts[2];
unsigned int dst_count; unsigned int dst_count;
struct sm4_src_register struct sm4_src_register
{ {
struct sm4_register reg; struct vkd3d_shader_register reg;
enum vkd3d_sm4_swizzle_type swizzle_type; enum vkd3d_sm4_swizzle_type swizzle_type;
unsigned int swizzle; unsigned int swizzle;
unsigned int mod; unsigned int mod;
@ -3644,7 +3632,7 @@ struct sm4_instruction
unsigned int idx_count; unsigned int idx_count;
}; };
static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *reg, static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct vkd3d_shader_register *reg,
unsigned int *writemask, enum vkd3d_sm4_swizzle_type *swizzle_type, unsigned int *writemask, enum vkd3d_sm4_swizzle_type *swizzle_type,
const struct hlsl_deref *deref) const struct hlsl_deref *deref)
{ {
@ -3794,7 +3782,7 @@ static void sm4_src_from_deref(struct hlsl_ctx *ctx, struct sm4_src_register *sr
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_register_from_node(struct sm4_register *reg, unsigned int *writemask, static void sm4_register_from_node(struct vkd3d_shader_register *reg, unsigned int *writemask,
enum vkd3d_sm4_swizzle_type *swizzle_type, const struct hlsl_ir_node *instr) enum vkd3d_sm4_swizzle_type *swizzle_type, const struct hlsl_ir_node *instr)
{ {
assert(instr->reg.allocated); assert(instr->reg.allocated);
@ -4452,7 +4440,7 @@ static void write_sm4_ld(const struct tpf_writer *tpf, const struct hlsl_ir_node
{ {
if (sample_index->type == HLSL_IR_CONSTANT) if (sample_index->type == HLSL_IR_CONSTANT)
{ {
struct sm4_register *reg = &instr.srcs[2].reg; struct vkd3d_shader_register *reg = &instr.srcs[2].reg;
struct hlsl_ir_constant *index; struct hlsl_ir_constant *index;
index = hlsl_ir_constant(sample_index); index = hlsl_ir_constant(sample_index);