mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2025-04-13 05:43:18 -07:00
vkd3d-shader/hlsl: Remove hlsl_ir_vsir_instruction_ref, again.
This commit is contained in:
committed by
Henri Verbeet
parent
d6d6f37578
commit
198c3dc7b9
Notes:
Henri Verbeet
2024-11-27 14:11:33 +01:00
Approved-by: Elizabeth Figura (@zfigura) Approved-by: Henri Verbeet (@hverbeet) Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1280
@@ -1721,22 +1721,6 @@ struct hlsl_ir_node *hlsl_new_switch(struct hlsl_ctx *ctx, struct hlsl_ir_node *
|
||||
return &s->node;
|
||||
}
|
||||
|
||||
struct hlsl_ir_node *hlsl_new_vsir_instruction_ref(struct hlsl_ctx *ctx, unsigned int vsir_instr_idx,
|
||||
struct hlsl_type *type, const struct hlsl_reg *reg, const struct vkd3d_shader_location *loc)
|
||||
{
|
||||
struct hlsl_ir_vsir_instruction_ref *vsir_instr;
|
||||
|
||||
if (!(vsir_instr = hlsl_alloc(ctx, sizeof(*vsir_instr))))
|
||||
return NULL;
|
||||
init_node(&vsir_instr->node, HLSL_IR_VSIR_INSTRUCTION_REF, type, loc);
|
||||
vsir_instr->vsir_instr_idx = vsir_instr_idx;
|
||||
|
||||
if (reg)
|
||||
vsir_instr->node.reg = *reg;
|
||||
|
||||
return &vsir_instr->node;
|
||||
}
|
||||
|
||||
struct hlsl_ir_load *hlsl_new_load_index(struct hlsl_ctx *ctx, const struct hlsl_deref *deref,
|
||||
struct hlsl_ir_node *idx, const struct vkd3d_shader_location *loc)
|
||||
{
|
||||
@@ -2559,9 +2543,6 @@ static struct hlsl_ir_node *clone_instr(struct hlsl_ctx *ctx,
|
||||
|
||||
case HLSL_IR_STATEBLOCK_CONSTANT:
|
||||
return clone_stateblock_constant(ctx, map, hlsl_ir_stateblock_constant(instr));
|
||||
|
||||
case HLSL_IR_VSIR_INSTRUCTION_REF:
|
||||
vkd3d_unreachable();
|
||||
}
|
||||
|
||||
vkd3d_unreachable();
|
||||
@@ -3008,7 +2989,6 @@ const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type)
|
||||
[HLSL_IR_COMPILE] = "HLSL_IR_COMPILE",
|
||||
[HLSL_IR_SAMPLER_STATE] = "HLSL_IR_SAMPLER_STATE",
|
||||
[HLSL_IR_STATEBLOCK_CONSTANT] = "HLSL_IR_STATEBLOCK_CONSTANT",
|
||||
[HLSL_IR_VSIR_INSTRUCTION_REF] = "HLSL_IR_VSIR_INSTRUCTION_REF",
|
||||
};
|
||||
|
||||
if (type >= ARRAY_SIZE(names))
|
||||
@@ -3602,11 +3582,6 @@ static void dump_instr(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer,
|
||||
case HLSL_IR_STATEBLOCK_CONSTANT:
|
||||
dump_ir_stateblock_constant(buffer, hlsl_ir_stateblock_constant(instr));
|
||||
break;
|
||||
|
||||
case HLSL_IR_VSIR_INSTRUCTION_REF:
|
||||
vkd3d_string_buffer_printf(buffer, "vsir_program instruction %u",
|
||||
hlsl_ir_vsir_instruction_ref(instr)->vsir_instr_idx);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3915,10 +3890,6 @@ void hlsl_free_instr(struct hlsl_ir_node *node)
|
||||
case HLSL_IR_STATEBLOCK_CONSTANT:
|
||||
free_ir_stateblock_constant(hlsl_ir_stateblock_constant(node));
|
||||
break;
|
||||
|
||||
case HLSL_IR_VSIR_INSTRUCTION_REF:
|
||||
vkd3d_free(hlsl_ir_vsir_instruction_ref(node));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -343,8 +343,6 @@ enum hlsl_ir_node_type
|
||||
HLSL_IR_COMPILE,
|
||||
HLSL_IR_SAMPLER_STATE,
|
||||
HLSL_IR_STATEBLOCK_CONSTANT,
|
||||
|
||||
HLSL_IR_VSIR_INSTRUCTION_REF,
|
||||
};
|
||||
|
||||
/* Common data for every type of IR instruction node. */
|
||||
@@ -947,16 +945,6 @@ struct hlsl_ir_stateblock_constant
|
||||
char *name;
|
||||
};
|
||||
|
||||
/* A vkd3d_shader_instruction that can be inserted in a hlsl_block.
|
||||
* Only used for the HLSL IR to vsir translation, might be removed once this translation is complete. */
|
||||
struct hlsl_ir_vsir_instruction_ref
|
||||
{
|
||||
struct hlsl_ir_node node;
|
||||
|
||||
/* Index to a vkd3d_shader_instruction within a vkd3d_shader_instruction_array in a vsir_program. */
|
||||
unsigned int vsir_instr_idx;
|
||||
};
|
||||
|
||||
struct hlsl_scope
|
||||
{
|
||||
/* Item entry for hlsl_ctx.scopes. */
|
||||
@@ -1272,12 +1260,6 @@ static inline struct hlsl_ir_stateblock_constant *hlsl_ir_stateblock_constant(co
|
||||
return CONTAINING_RECORD(node, struct hlsl_ir_stateblock_constant, node);
|
||||
}
|
||||
|
||||
static inline struct hlsl_ir_vsir_instruction_ref *hlsl_ir_vsir_instruction_ref(const struct hlsl_ir_node *node)
|
||||
{
|
||||
VKD3D_ASSERT(node->type == HLSL_IR_VSIR_INSTRUCTION_REF);
|
||||
return CONTAINING_RECORD(node, struct hlsl_ir_vsir_instruction_ref, node);
|
||||
}
|
||||
|
||||
static inline void hlsl_block_init(struct hlsl_block *block)
|
||||
{
|
||||
list_init(&block->instrs);
|
||||
@@ -1603,9 +1585,6 @@ struct hlsl_ir_switch_case *hlsl_new_switch_case(struct hlsl_ctx *ctx, unsigned
|
||||
struct hlsl_ir_node *hlsl_new_switch(struct hlsl_ctx *ctx, struct hlsl_ir_node *selector,
|
||||
struct list *cases, const struct vkd3d_shader_location *loc);
|
||||
|
||||
struct hlsl_ir_node *hlsl_new_vsir_instruction_ref(struct hlsl_ctx *ctx, unsigned int vsir_instr_idx,
|
||||
struct hlsl_type *type, const struct hlsl_reg *reg, const struct vkd3d_shader_location *loc);
|
||||
|
||||
void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location *loc,
|
||||
enum vkd3d_shader_error error, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5);
|
||||
void hlsl_fixme(struct hlsl_ctx *ctx, const struct vkd3d_shader_location *loc,
|
||||
|
@@ -678,8 +678,6 @@ static struct hlsl_default_value evaluate_static_expression(struct hlsl_ctx *ctx
|
||||
hlsl_error(ctx, &node->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
|
||||
"Expected literal expression.");
|
||||
break;
|
||||
case HLSL_IR_VSIR_INSTRUCTION_REF:
|
||||
vkd3d_unreachable();
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -4164,9 +4164,6 @@ static bool dce(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context)
|
||||
case HLSL_IR_STATEBLOCK_CONSTANT:
|
||||
/* Stateblock constants should not appear in the shader program. */
|
||||
vkd3d_unreachable();
|
||||
case HLSL_IR_VSIR_INSTRUCTION_REF:
|
||||
/* HLSL IR nodes are not translated to hlsl_ir_vsir_instruction_ref at this point. */
|
||||
vkd3d_unreachable();
|
||||
}
|
||||
|
||||
return false;
|
||||
@@ -4306,9 +4303,6 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop
|
||||
case HLSL_IR_STATEBLOCK_CONSTANT:
|
||||
/* Stateblock constants should not appear in the shader program. */
|
||||
vkd3d_unreachable();
|
||||
case HLSL_IR_VSIR_INSTRUCTION_REF:
|
||||
/* HLSL IR nodes are not translated to hlsl_ir_vsir_instruction_ref at this point. */
|
||||
vkd3d_unreachable();
|
||||
|
||||
case HLSL_IR_STORE:
|
||||
{
|
||||
|
Reference in New Issue
Block a user