[PATCH 0/3] MR494: Remove some unnecessary local variables.

[PATCH 1/3] tests/shader_runner: Remove an unnecessary local variable declaration.

[Zebediah Figura]

From: Zebediah Figura

Found with -Wshadow.
---
 tests/shader_runner.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/shader_runner.c b/tests/shader_runner.c
index 2b875440e..0e6104ce3 100644
--- a/tests/shader_runner.c
+++ b/tests/shader_runner.c
@@ -618,7 +618,6 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
         D3D_PRIMITIVE_TOPOLOGY topology;
         struct resource_params params;
         unsigned int vertex_count;
-        char *rest;

if (!shader_runner_get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0))
         {

[PATCH 2/3] vkd3d-shader/hlsl: Remove an unnecessary local variable in copy_propagation_get_value().

[Zebediah Figura]

From: Zebediah Figura

Found with -Wshadow.
---
 libs/vkd3d-shader/hlsl_codegen.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 5a70878bc..aae1b159c 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -1304,12 +1304,10 @@ static struct copy_propagation_value *copy_propagation_get_value(const struct co
         {
             struct copy_propagation_var_def *var_def = RB_ENTRY_VALUE(entry, struct copy_propagation_var_def, entry);
             unsigned int component_count = hlsl_type_component_count(var->data_type);
-            enum copy_propagation_value_state state;

assert(component < component_count);
-            state = var_def->values[component].state;

-            switch (state)
+            switch (var_def->values[component].state)
             {
                 case VALUE_STATE_STATICALLY_WRITTEN:
                     return &var_def->values[component];

[PATCH 3/3] vkd3d-shader/tpf: Remove an unnecessary local variable declaration.

[Zebediah Figura]

From: Zebediah Figura

Found with -Wshadow.
---
 libs/vkd3d-shader/tpf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c
index 61d14e30d..81ead41ee 100644
--- a/libs/vkd3d-shader/tpf.c
+++ b/libs/vkd3d-shader/tpf.c
@@ -3528,8 +3528,8 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc)
             {
                 const unsigned int var_size = (profile->major_version >= 5 ? 10 : 6);
                 size_t var_offset = vars_start + j * var_size * sizeof(uint32_t);
-                size_t string_offset = put_string(&buffer, var->name);

+                string_offset = put_string(&buffer, var->name);
                 set_u32(&buffer, var_offset, string_offset);
                 write_sm4_type(ctx, &buffer, var->data_type);
                 set_u32(&buffer, var_offset + 4 * sizeof(uint32_t), var->data_type->bytecode_offset);

[PATCH 0/3] MR494: Remove some unnecessary local variables. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.

[PATCH 0/3] MR494: Remove some unnecessary local variables. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.