[Mesa-dev] [PATCH v2 4/4] mesa/program: Fix -Wunused-param warning

Gert Wollny gw.fossdev at gmail.com
Thu Jan 18 08:57:29 UTC 2018


v2: Remove the unused ctx parameter from _mesa_optimize_program.

v1: Annotate the unused parameter
v1 was reviewed by Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

Signed-off-by: Gert Wollny <gw.fossdev at gmail.com>
---
 src/mesa/program/arbprogparse.c  | 2 +-
 src/mesa/program/ir_to_mesa.cpp  | 2 +-
 src/mesa/program/prog_optimize.c | 3 +--
 src/mesa/program/prog_optimize.h | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/mesa/program/arbprogparse.c b/src/mesa/program/arbprogparse.c
index 83a501eea6..7cb1beb5bb 100644
--- a/src/mesa/program/arbprogparse.c
+++ b/src/mesa/program/arbprogparse.c
@@ -181,7 +181,7 @@ _mesa_parse_arb_vertex_program(struct gl_context *ctx, GLenum target,
       return;
    }
 
-   _mesa_optimize_program(ctx, &prog, program);
+   _mesa_optimize_program(&prog, program);
 
    ralloc_free(program->String);
 
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 29198509a6..56b66e2d62 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -2967,7 +2967,7 @@ get_mesa_program(struct gl_context *ctx,
       prog->info.fs.depth_layout = shader_program->FragDepthLayout;
    }
 
-   _mesa_optimize_program(ctx, prog, prog);
+   _mesa_optimize_program(prog, prog);
 
    /* This has to be done last.  Any operation that can cause
     * prog->ParameterValues to get reallocated (e.g., anything that adds a
diff --git a/src/mesa/program/prog_optimize.c b/src/mesa/program/prog_optimize.c
index 6a228ba258..7efdcadc12 100644
--- a/src/mesa/program/prog_optimize.c
+++ b/src/mesa/program/prog_optimize.c
@@ -1312,8 +1312,7 @@ _mesa_simplify_cmp(struct gl_program * program)
  * instructions, temp regs, etc.
  */
 void
-_mesa_optimize_program(struct gl_context *ctx, struct gl_program *program,
-                       void *mem_ctx)
+_mesa_optimize_program(struct gl_program *program, void *mem_ctx)
 {
    GLboolean any_change;
 
diff --git a/src/mesa/program/prog_optimize.h b/src/mesa/program/prog_optimize.h
index c99ce9ecee..fadfd621c5 100644
--- a/src/mesa/program/prog_optimize.h
+++ b/src/mesa/program/prog_optimize.h
@@ -46,8 +46,7 @@ _mesa_find_temp_intervals(const struct prog_instruction *instructions,
                           GLint intEnd[MAX_PROGRAM_TEMPS]);
 
 extern void
-_mesa_optimize_program(struct gl_context *ctx, struct gl_program *program,
-                       void *mem_ctx);
+_mesa_optimize_program(struct gl_program *program, void *mem_ctx);
 
 extern GLboolean
 _mesa_constant_fold(struct gl_program *prog);
-- 
2.13.6



More information about the mesa-dev mailing list