On Tue, 2015-09-01 at 18:56 -0700, Ian Romanick wrote:
(...)
> diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
> index dd7804f..bd25f45 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;
> @@ -1064,8 +1063,7 @@ builtin_variable_generator::generate_cs_special_vars()
> */
> void
> builtin_variable_generator::add_varying(int slot, const glsl_type *type,
> - const char *name,
> - const char *name_as_gs_input)
> + const char *name)
You also want to remove the reference to 'name_as_gs_input' in the
comment right above this function too.
Other than this,
Reviewed-by: Iago Toral Quiroga <ito...@igalia.com>
> {
> switch (state->stage) {
> case MESA_SHADER_TESS_CTRL:
> @@ -1094,7 +1092,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) {
> diff --git a/src/glsl/ir.h b/src/glsl/ir.h
> index ede8caa..7cdea01 100644
> --- a/src/glsl/ir.h
> +++ b/src/glsl/ir.h
> @@ -2523,8 +2523,7 @@ _mesa_glsl_find_builtin_function(_mesa_glsl_parse_state
> *state,
> const char *name, exec_list
> *actual_parameters);
>
> extern ir_function *
> -_mesa_glsl_find_builtin_function_by_name(_mesa_glsl_parse_state *state,
> - const char *name);
> +_mesa_glsl_find_builtin_function_by_name(const char *name);
>
> extern gl_shader *
> _mesa_glsl_get_builtin_function_shader(void);
> diff --git a/src/glsl/ir_print_visitor.cpp b/src/glsl/ir_print_visitor.cpp
> index 8dbd938..b683269 100644
> --- a/src/glsl/ir_print_visitor.cpp
> +++ b/src/glsl/ir_print_visitor.cpp
> @@ -586,7 +586,7 @@ ir_print_visitor::visit(ir_end_primitive *ir)
> }
>
> void
> -ir_print_visitor::visit(ir_barrier *ir)
> +ir_print_visitor::visit(ir_barrier *)
> {
> fprintf(f, "(barrier)\n");
> }
> diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
> index bc5e55b..7fc70de 100644
> --- a/src/glsl/linker.cpp
> +++ b/src/glsl/linker.cpp
> @@ -3209,8 +3209,7 @@ add_interface_variables(struct gl_shader_program
> *shProg,
> * resource data.
> */
> void
> -build_program_resource_list(struct gl_context *ctx,
> - struct gl_shader_program *shProg)
> +build_program_resource_list(struct gl_shader_program *shProg)
> {
> /* Rebuild resource list. */
> if (shProg->ProgramResourceList) {
> diff --git a/src/glsl/program.h b/src/glsl/program.h
> index c06541a..64f5463 100644
> --- a/src/glsl/program.h
> +++ b/src/glsl/program.h
> @@ -40,8 +40,7 @@ extern void
> link_shaders(struct gl_context *ctx, struct gl_shader_program *prog);
>
> extern void
> -build_program_resource_list(struct gl_context *ctx,
> - struct gl_shader_program *shProg);
> +build_program_resource_list(struct gl_shader_program *shProg);
>
> extern void
> linker_error(struct gl_shader_program *prog, const char *fmt, ...)
> diff --git a/src/glsl/standalone_scaffolding.cpp
> b/src/glsl/standalone_scaffolding.cpp
> index 6033364..e52869f 100644
> --- a/src/glsl/standalone_scaffolding.cpp
> +++ b/src/glsl/standalone_scaffolding.cpp
> @@ -62,7 +62,7 @@ _mesa_reference_shader(struct gl_context *ctx, struct
> gl_shader **ptr,
> }
>
> void
> -_mesa_shader_debug(struct gl_context *, GLenum, GLuint *id,
> +_mesa_shader_debug(struct gl_context *, GLenum, GLuint *,
> const char *, int)
> {
> }
> diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
> index 8f58f3e..0defed8 100644
> --- a/src/mesa/program/ir_to_mesa.cpp
> +++ b/src/mesa/program/ir_to_mesa.cpp
> @@ -2979,7 +2979,7 @@ _mesa_glsl_link_shader(struct gl_context *ctx, struct
> gl_shader_program *prog)
> if (!ctx->Driver.LinkShader(ctx, prog)) {
> prog->LinkStatus = GL_FALSE;
> } else {
> - build_program_resource_list(ctx, prog);
> + build_program_resource_list(prog);
> }
> }
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
