diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2015-08-26 13:38:49 +0100 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2015-09-09 19:15:15 -0700 |
| commit | bd0245b8b2fba3852178d635f4e9602845ea6dd3 (patch) | |
| tree | 93d6cda9e734a1093925f29d80537d953071bd37 /src/glsl/builtin_variables.cpp | |
| parent | 342e68dc60eebb20ac1be9f47800ee9e604354f0 (diff) | |
| download | external_mesa3d-bd0245b8b2fba3852178d635f4e9602845ea6dd3.zip external_mesa3d-bd0245b8b2fba3852178d635f4e9602845ea6dd3.tar.gz external_mesa3d-bd0245b8b2fba3852178d635f4e9602845ea6dd3.tar.bz2 | |
glsl: Silence unused parameter warnings
builtin_variables.cpp:1062:53: warning: unused parameter 'name_as_gs_input' [-Wunused-parameter]
const char *name_as_gs_input)
^
builtin_functions.cpp:4774:47: warning: unused parameter 'intrinsic_name' [-Wunused-parameter]
const char *intrinsic_name,
^
builtin_functions.cpp:4907:66: warning: unused parameter 'state' [-Wunused-parameter]
_mesa_glsl_find_builtin_function_by_name(_mesa_glsl_parse_state *state,
^
builtin_functions.cpp:4915:49: warning: unused parameter 'num_arguments' [-Wunused-parameter]
unsigned num_arguments,
^
builtin_functions.cpp:4916:49: warning: unused parameter 'flags' [-Wunused-parameter]
unsigned flags)
^
ir_print_visitor.cpp:589:37: warning: unused parameter 'ir' [-Wunused-parameter]
ir_print_visitor::visit(ir_barrier *ir)
^
linker.cpp:3212:48: warning: unused parameter 'ctx' [-Wunused-parameter]
build_program_resource_list(struct gl_context *ctx,
^
standalone_scaffolding.cpp:65:57: warning: unused parameter ‘id’ [-Wunused-parameter]
_mesa_shader_debug(struct gl_context *, GLenum, GLuint *id,
^
v2: Rebase on top of GL_ARB_shader_image_size work (especially
58a86897). Silence more warnings added by that work.
v3: Remove mention of the removed parameter from comments. Suggested by
Iago.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> [v1]
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Cc: "Martin Peres <martin.peres@linux.intel.com>"
Diffstat (limited to 'src/glsl/builtin_variables.cpp')
| -rw-r--r-- | src/glsl/builtin_variables.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp index dd7804f..560155a 100644 --- a/src/glsl/builtin_variables.cpp +++ b/src/glsl/builtin_variables.cpp @@ -383,8 +383,7 @@ private: ir_variable *add_uniform(const glsl_type *type, const char *name); ir_variable *add_const(const char *name, int value); ir_variable *add_const_ivec3(const char *name, int x, int y, int z); - void add_varying(int slot, const glsl_type *type, const char *name, - const char *name_as_gs_input); + void add_varying(int slot, const glsl_type *type, const char *name); exec_list * const instructions; struct _mesa_glsl_parse_state * const state; @@ -1059,13 +1058,11 @@ builtin_variable_generator::generate_cs_special_vars() /** * Add a single "varying" variable. The variable's type and direction (input * or output) are adjusted as appropriate for the type of shader being - * compiled. For geometry shaders using {ARB,EXT}_geometry_shader4, - * name_as_gs_input is used for the input (to avoid ambiguity). + * compiled. */ void builtin_variable_generator::add_varying(int slot, const glsl_type *type, - const char *name, - const char *name_as_gs_input) + const char *name) { switch (state->stage) { case MESA_SHADER_TESS_CTRL: @@ -1094,7 +1091,7 @@ void builtin_variable_generator::generate_varyings() { #define ADD_VARYING(loc, type, name) \ - add_varying(loc, type, name, name "In") + add_varying(loc, type, name) /* gl_Position and gl_PointSize are not visible from fragment shaders. */ if (state->stage != MESA_SHADER_FRAGMENT) { |