From: Zebediah Figura zfigura@codeweavers.com
Synthesize the internal name from the template inside of this function. --- libs/vkd3d-shader/hlsl.c | 19 +++++++++++--- libs/vkd3d-shader/hlsl.h | 4 +-- libs/vkd3d-shader/hlsl.y | 57 +++++++--------------------------------- 3 files changed, 27 insertions(+), 53 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 3ff8566a..da6d81b8 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -770,11 +770,24 @@ struct hlsl_ir_var *hlsl_new_var(struct hlsl_ctx *ctx, const char *name, struct return var; }
-struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, - const struct vkd3d_shader_location loc) +struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *template, + struct hlsl_type *type, const struct vkd3d_shader_location *loc) { - struct hlsl_ir_var *var = hlsl_new_var(ctx, hlsl_strdup(ctx, name), type, loc, NULL, 0, NULL); + struct vkd3d_string_buffer *string; + struct hlsl_ir_var *var; + static LONG counter; + const char *name;
+ if (!(string = hlsl_get_string_buffer(ctx))) + return NULL; + vkd3d_string_buffer_printf(string, "<%s-%u>", template, InterlockedIncrement(&counter)); + if (!(name = hlsl_strdup(ctx, string->buffer))) + { + hlsl_release_string_buffer(ctx, string); + return NULL; + } + var = hlsl_new_var(ctx, name, type, *loc, NULL, 0, NULL); + hlsl_release_string_buffer(ctx, string); if (var) list_add_tail(&ctx->globals->vars, &var->scope_entry); return var; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 794749aa..141b26ca 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -785,8 +785,8 @@ struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct hlsl_struct_field *fields, size_t field_count); struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned int components, struct hlsl_ir_node *val, const struct vkd3d_shader_location *loc); -struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, - const struct vkd3d_shader_location loc); +struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *template, + struct hlsl_type *type, const struct vkd3d_shader_location *loc); struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, struct hlsl_type *format); struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct vkd3d_shader_location *loc); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 624481d8..d6cd57a3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -287,8 +287,6 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, if ((src_type->type == HLSL_CLASS_MATRIX || dst_type->type == HLSL_CLASS_MATRIX) && src_type->type <= HLSL_CLASS_LAST_NUMERIC && dst_type->type <= HLSL_CLASS_LAST_NUMERIC) { - struct vkd3d_string_buffer *name; - static unsigned int counter = 0; struct hlsl_deref var_deref; struct hlsl_ir_load *load; struct hlsl_ir_var *var; @@ -303,11 +301,7 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, assert(dst_type->dimy <= src_type->dimy); }
- name = vkd3d_string_buffer_get(&ctx->string_buffers); - vkd3d_string_buffer_printf(name, "<cast-%u>", counter++); - var = hlsl_new_synthetic_var(ctx, name->buffer, dst_type, *loc); - vkd3d_string_buffer_release(&ctx->string_buffers, name); - if (!var) + if (!(var = hlsl_new_synthetic_var(ctx, "cast", dst_type, loc))) return NULL; hlsl_init_simple_deref_from_var(&var_deref, var);
@@ -635,16 +629,10 @@ static struct hlsl_ir_load *add_load_index(struct hlsl_ctx *ctx, struct list *in } else { - struct vkd3d_string_buffer *name; struct hlsl_ir_store *store; struct hlsl_ir_var *var;
- if (!(name = hlsl_get_string_buffer(ctx))) - return NULL; - vkd3d_string_buffer_printf(name, "<deref-%p>", var_instr); - var = hlsl_new_synthetic_var(ctx, name->buffer, var_instr->data_type, var_instr->loc); - hlsl_release_string_buffer(ctx, name); - if (!var) + if (!(var = hlsl_new_synthetic_var(ctx, "deref", var_instr->data_type, &var_instr->loc))) return NULL;
if (!(store = hlsl_new_simple_store(ctx, var, var_instr))) @@ -674,16 +662,10 @@ static struct hlsl_ir_load *add_load_component(struct hlsl_ctx *ctx, struct list } else { - struct vkd3d_string_buffer *name; struct hlsl_ir_store *store; struct hlsl_ir_var *var;
- if (!(name = hlsl_get_string_buffer(ctx))) - return NULL; - vkd3d_string_buffer_printf(name, "<deref-%p>", var_instr); - var = hlsl_new_synthetic_var(ctx, name->buffer, var_instr->data_type, var_instr->loc); - hlsl_release_string_buffer(ctx, name); - if (!var) + if (!(var = hlsl_new_synthetic_var(ctx, "deref", var_instr->data_type, &var_instr->loc))) return NULL;
if (!(store = hlsl_new_simple_store(ctx, var, var_instr))) @@ -722,8 +704,6 @@ static bool add_matrix_index(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *matrix, struct hlsl_ir_node *index, const struct vkd3d_shader_location *loc) { struct hlsl_type *mat_type = matrix->data_type, *ret_type; - struct vkd3d_string_buffer *name; - static unsigned int counter = 0; struct hlsl_deref var_deref; struct hlsl_ir_load *load; struct hlsl_ir_var *var; @@ -734,11 +714,7 @@ static bool add_matrix_index(struct hlsl_ctx *ctx, struct list *instrs,
ret_type = hlsl_get_vector_type(ctx, mat_type->base_type, mat_type->dimx);
- name = vkd3d_string_buffer_get(&ctx->string_buffers); - vkd3d_string_buffer_printf(name, "<index-%u>", counter++); - var = hlsl_new_synthetic_var(ctx, name->buffer, ret_type, *loc); - vkd3d_string_buffer_release(&ctx->string_buffers, name); - if (!var) + if (!(var = hlsl_new_synthetic_var(ctx, "index", ret_type, loc))) return false; hlsl_init_simple_deref_from_var(&var_deref, var);
@@ -1247,8 +1223,6 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs,
if (type->type == HLSL_CLASS_MATRIX) { - struct vkd3d_string_buffer *name; - static unsigned int counter = 0; struct hlsl_type *vector_type; struct hlsl_deref var_deref; struct hlsl_ir_load *load; @@ -1256,11 +1230,7 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs,
vector_type = hlsl_get_vector_type(ctx, type->base_type, hlsl_type_minor_size(type));
- name = vkd3d_string_buffer_get(&ctx->string_buffers); - vkd3d_string_buffer_printf(name, "<split_op-%u>", counter++); - var = hlsl_new_synthetic_var(ctx, name->buffer, type, *loc); - vkd3d_string_buffer_release(&ctx->string_buffers, name); - if (!var) + if (!(var = hlsl_new_synthetic_var(ctx, "split_op", type, loc))) return NULL; hlsl_init_simple_deref_from_var(&var_deref, var);
@@ -2218,8 +2188,6 @@ static bool intrinsic_mul(struct hlsl_ctx *ctx, enum hlsl_base_type base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); struct hlsl_type *cast_type1 = arg1->data_type, *cast_type2 = arg2->data_type, *matrix_type, *ret_type; unsigned int i, j, k, vect_count = 0; - struct vkd3d_string_buffer *name; - static unsigned int counter = 0; struct hlsl_deref var_deref; struct hlsl_ir_load *load; struct hlsl_ir_var *var; @@ -2261,11 +2229,7 @@ static bool intrinsic_mul(struct hlsl_ctx *ctx, if (!(cast2 = add_implicit_conversion(ctx, params->instrs, arg2, cast_type2, loc))) return false;
- name = vkd3d_string_buffer_get(&ctx->string_buffers); - vkd3d_string_buffer_printf(name, "<mul-%u>", counter++); - var = hlsl_new_synthetic_var(ctx, name->buffer, matrix_type, *loc); - vkd3d_string_buffer_release(&ctx->string_buffers, name); - if (!var) + if (!(var = hlsl_new_synthetic_var(ctx, "mul", matrix_type, loc))) return false; hlsl_init_simple_deref_from_var(&var_deref, var);
@@ -2455,14 +2419,11 @@ static struct list *add_call(struct hlsl_ctx *ctx, const char *name, static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type, struct parse_initializer *params, struct vkd3d_shader_location loc) { - static unsigned int counter; struct hlsl_ir_load *load; struct hlsl_ir_var *var; unsigned int i, idx = 0; - char name[23];
- sprintf(name, "<constructor-%x>", counter++); - if (!(var = hlsl_new_synthetic_var(ctx, name, type, loc))) + if (!(var = hlsl_new_synthetic_var(ctx, "constructor", type, &loc))) return NULL;
for (i = 0; i < params->args_count; ++i) @@ -4079,8 +4040,8 @@ primary_expr: struct hlsl_ir_load *load; struct hlsl_ir_var *var;
- if (!(var = hlsl_new_synthetic_var(ctx, "<state-block-expr>", - hlsl_get_scalar_type(ctx, HLSL_TYPE_INT), @1))) + if (!(var = hlsl_new_synthetic_var(ctx, "state_block_expr", + hlsl_get_scalar_type(ctx, HLSL_TYPE_INT), &@1))) YYABORT; if (!(load = hlsl_new_var_load(ctx, var, @1))) YYABORT;