Module: vkd3d Branch: master Commit: 0c3b1d1d890c780cd29c035eafb220bd052b7ea7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0c3b1d1d890c780cd29c035e...
Author: Zebediah Figura zfigura@codeweavers.com Date: Tue Apr 27 12:14:20 2021 -0500
vkd3d-shader: Avoid using the term "varying" for all semantics.
It's not particularly accurate; "varying" only refers to the interface between two consecutive shader stages.
Replace it with "semantic" in most cases.
Signed-off-by: Zebediah Figura zfigura@codeweavers.com Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
Makefile.am | 4 +- libs/vkd3d-shader/hlsl.h | 4 +- libs/vkd3d-shader/hlsl_codegen.c | 43 +++++++++++----------- ...ader_test => hlsl-struct-semantics.shader_test} | 0 4 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/Makefile.am b/Makefile.am index cbf75ad..542b66e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,7 +65,7 @@ vkd3d_shader_tests = \ tests/hlsl-return-void.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-struct-assignment.shader_test \ - tests/hlsl-struct-varying.shader_test \ + tests/hlsl-struct-semantics.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ @@ -262,7 +262,7 @@ XFAIL_TESTS = \ tests/hlsl-return-void.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-struct-assignment.shader_test \ - tests/hlsl-struct-varying.shader_test \ + tests/hlsl-struct-semantics.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index c698983..9081ef3 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -229,8 +229,8 @@ struct hlsl_ir_var unsigned int first_write, last_read; struct hlsl_reg reg;
- uint32_t is_input_varying : 1; - uint32_t is_output_varying : 1; + uint32_t is_input_semantic : 1; + uint32_t is_output_semantic : 1; uint32_t is_uniform : 1; uint32_t is_param : 1; }; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 180259f..787d336 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -76,8 +76,8 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct struct hlsl_semantic new_semantic; struct hlsl_ir_constant *offset; struct hlsl_ir_store *store; - struct hlsl_ir_var *varying; struct hlsl_ir_load *load; + struct hlsl_ir_var *input;
if (!(name = vkd3d_string_buffer_get(&ctx->string_buffers))) { @@ -92,7 +92,7 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } new_semantic.index = semantic->index; - if (!(varying = hlsl_new_var(vkd3d_strdup(name->buffer), type, var->loc, &new_semantic, 0, NULL))) + if (!(input = hlsl_new_var(vkd3d_strdup(name->buffer), type, var->loc, &new_semantic, 0, NULL))) { vkd3d_string_buffer_release(&ctx->string_buffers, name); vkd3d_free((void *)new_semantic.name); @@ -100,12 +100,12 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } vkd3d_string_buffer_release(&ctx->string_buffers, name); - varying->is_input_varying = 1; - varying->is_param = var->is_param; - list_add_before(&var->scope_entry, &varying->scope_entry); - list_add_tail(&ctx->extern_vars, &varying->extern_entry); + input->is_input_semantic = 1; + input->is_param = var->is_param; + list_add_before(&var->scope_entry, &input->scope_entry); + list_add_tail(&ctx->extern_vars, &input->extern_entry);
- if (!(load = hlsl_new_var_load(varying, var->loc))) + if (!(load = hlsl_new_var_load(input, var->loc))) { ctx->failed = true; return; @@ -144,9 +144,8 @@ static void prepend_input_struct_copy(struct hlsl_ctx *ctx, struct list *instrs, } }
-/* Split input varyings into two variables representing the varying and temp - * registers, and copy the former to the latter, so that writes to input - * varyings work. */ +/* Split inputs into two variables representing the semantic and temp registers, + * and copy the former to the latter, so that writes to input variables work. */ static void prepend_input_var_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var) { if (var->data_type->type == HLSL_CLASS_STRUCT) @@ -162,7 +161,7 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct struct hlsl_semantic new_semantic; struct hlsl_ir_constant *offset; struct hlsl_ir_store *store; - struct hlsl_ir_var *varying; + struct hlsl_ir_var *output; struct hlsl_ir_load *load;
if (!(name = vkd3d_string_buffer_get(&ctx->string_buffers))) @@ -178,7 +177,7 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } new_semantic.index = semantic->index; - if (!(varying = hlsl_new_var(vkd3d_strdup(name->buffer), type, var->loc, &new_semantic, 0, NULL))) + if (!(output = hlsl_new_var(vkd3d_strdup(name->buffer), type, var->loc, &new_semantic, 0, NULL))) { vkd3d_free((void *)new_semantic.name); vkd3d_string_buffer_release(&ctx->string_buffers, name); @@ -186,10 +185,10 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } vkd3d_string_buffer_release(&ctx->string_buffers, name); - varying->is_output_varying = 1; - varying->is_param = var->is_param; - list_add_before(&var->scope_entry, &varying->scope_entry); - list_add_tail(&ctx->extern_vars, &varying->extern_entry); + output->is_output_semantic = 1; + output->is_param = var->is_param; + list_add_before(&var->scope_entry, &output->scope_entry); + list_add_tail(&ctx->extern_vars, &output->extern_entry);
if (!(offset = hlsl_new_uint_constant(ctx, field_offset * 4, var->loc))) { @@ -205,7 +204,7 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct } list_add_after(&offset->node.entry, &load->node.entry);
- if (!(store = hlsl_new_store(varying, NULL, &load->node, 0, var->loc))) + if (!(store = hlsl_new_store(output, NULL, &load->node, 0, var->loc))) { ctx->failed = true; return; @@ -230,9 +229,9 @@ static void append_output_struct_copy(struct hlsl_ctx *ctx, struct list *instrs, } }
-/* Split output varyings into two variables representing the temp and varying +/* Split outputs into two variables representing the temp and semantic * registers, and copy the former to the latter, so that reads from output - * varyings work. */ + * variables work. */ static void append_output_var_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var) { if (var->data_type->type == HLSL_CLASS_STRUCT) @@ -618,9 +617,9 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl
LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (var->is_uniform || var->is_input_varying) + if (var->is_uniform || var->is_input_semantic) var->first_write = 1; - else if (var->is_output_varying) + else if (var->is_output_semantic) var->last_read = UINT_MAX; }
@@ -744,7 +743,7 @@ static const char *debug_register(char class, struct hlsl_reg reg, const struct
static void allocate_variable_temp_register(struct hlsl_ir_var *var, struct liveness *liveness) { - if (var->is_input_varying || var->is_output_varying || var->is_uniform) + if (var->is_input_semantic || var->is_output_semantic || var->is_uniform) return;
if (!var->reg.allocated && var->last_read) diff --git a/tests/hlsl-struct-varying.shader_test b/tests/hlsl-struct-semantics.shader_test similarity index 100% rename from tests/hlsl-struct-varying.shader_test rename to tests/hlsl-struct-semantics.shader_test