summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/glsl/ast_to_hir.cpp2
-rw-r--r--src/glsl/builtin_functions.cpp14
-rw-r--r--src/glsl/builtin_variables.cpp11
-rw-r--r--src/glsl/ir.h3
-rw-r--r--src/glsl/ir_print_visitor.cpp2
-rw-r--r--src/glsl/linker.cpp3
-rw-r--r--src/glsl/program.h3
-rw-r--r--src/glsl/standalone_scaffolding.cpp2
-rw-r--r--src/mesa/program/ir_to_mesa.cpp2
9 files changed, 15 insertions, 27 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 517841c99f8..72c6459da3c 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -4578,7 +4578,7 @@ ast_function::hir(exec_list *instructions,
if (state->es_shader && state->language_version >= 300) {
/* Local shader has no exact candidates; check the built-ins. */
_mesa_glsl_initialize_builtin_functions();
- if (_mesa_glsl_find_builtin_function_by_name(state, name)) {
+ if (_mesa_glsl_find_builtin_function_by_name(name)) {
YYLTYPE loc = this->get_location();
_mesa_glsl_error(& loc, state,
"A shader cannot redefine or overload built-in "
diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp
index 5e051996758..3b4a9df808c 100644
--- a/src/glsl/builtin_functions.cpp
+++ b/src/glsl/builtin_functions.cpp
@@ -522,7 +522,6 @@ private:
void add_function(const char *name, ...);
typedef ir_function_signature *(builtin_builder::*image_prototype_ctr)(const glsl_type *image_type,
- const char *intrinsic_name,
unsigned num_arguments,
unsigned flags);
@@ -738,11 +737,9 @@ private:
B1(mid3)
ir_function_signature *_image_prototype(const glsl_type *image_type,
- const char *intrinsic_name,
unsigned num_arguments,
unsigned flags);
ir_function_signature *_image_size_prototype(const glsl_type *image_type,
- const char *intrinsic_name,
unsigned num_arguments,
unsigned flags);
ir_function_signature *_image(image_prototype_ctr prototype,
@@ -4866,7 +4863,6 @@ builtin_builder::_mid3(const glsl_type *type)
ir_function_signature *
builtin_builder::_image_prototype(const glsl_type *image_type,
- const char *intrinsic_name,
unsigned num_arguments,
unsigned flags)
{
@@ -4916,9 +4912,8 @@ builtin_builder::_image_prototype(const glsl_type *image_type,
ir_function_signature *
builtin_builder::_image_size_prototype(const glsl_type *image_type,
- const char *intrinsic_name,
- unsigned num_arguments,
- unsigned flags)
+ unsigned /* num_arguments */,
+ unsigned /* flags */)
{
const glsl_type *ret_type;
unsigned num_components = image_type->coordinate_components();
@@ -4962,7 +4957,7 @@ builtin_builder::_image(image_prototype_ctr prototype,
unsigned num_arguments,
unsigned flags)
{
- ir_function_signature *sig = (this->*prototype)(image_type, intrinsic_name,
+ ir_function_signature *sig = (this->*prototype)(image_type,
num_arguments, flags);
if (flags & IMAGE_FUNCTION_EMIT_STUB) {
@@ -5043,8 +5038,7 @@ _mesa_glsl_find_builtin_function(_mesa_glsl_parse_state *state,
}
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)
{
ir_function *f;
mtx_lock(&builtins_lock);
diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index dd7804f7b8c..560155aa761 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) {
diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index ede8caa6e47..7cdea017af8 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 8dbd938c58b..b6832692419 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 4838ab44339..94f847e1e98 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -3216,8 +3216,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 c06541a6105..64f54635f62 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 6033364afc5..e52869f288e 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 8f58f3edf98..0defed83207 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);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 18:34:54 +0000