summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/compiler/glsl/link_uniform_blocks.cpp20
-rw-r--r--src/compiler/glsl/link_uniforms.cpp21
-rw-r--r--src/compiler/glsl/link_varyings.cpp7
-rw-r--r--src/compiler/glsl/linker.h14
-rw-r--r--src/mesa/program/ir_to_mesa.cpp11
5 files changed, 22 insertions, 51 deletions
diff --git a/src/compiler/glsl/link_uniform_blocks.cpp b/src/compiler/glsl/link_uniform_blocks.cpp
index 1fc0e2d5109..a73b2d20937 100644
--- a/src/compiler/glsl/link_uniform_blocks.cpp
+++ b/src/compiler/glsl/link_uniform_blocks.cpp
@@ -60,15 +60,6 @@ public:
struct gl_shader_program *prog;
private:
- virtual void visit_field(const glsl_type *type, const char *name,
- bool row_major)
- {
- (void) type;
- (void) name;
- (void) row_major;
- assert(!"Should not get here.");
- }
-
virtual void enter_record(const glsl_type *type, const char *,
bool row_major, const enum glsl_interface_packing packing) {
assert(type->is_record());
@@ -191,12 +182,13 @@ public:
unsigned num_active_uniforms;
private:
- virtual void visit_field(const glsl_type *type, const char *name,
- bool row_major)
+ virtual void visit_field(const glsl_type * /* type */,
+ const char * /* name */,
+ bool /* row_major */,
+ const glsl_type * /* record_type */,
+ const enum glsl_interface_packing,
+ bool /* last_field */)
{
- (void) type;
- (void) name;
- (void) row_major;
this->num_active_uniforms++;
}
};
diff --git a/src/compiler/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp
index 54adbdf38ff..40347ac0777 100644
--- a/src/compiler/glsl/link_uniforms.cpp
+++ b/src/compiler/glsl/link_uniforms.cpp
@@ -225,16 +225,6 @@ program_resource_visitor::recursion(const glsl_type *t, char **name,
}
void
-program_resource_visitor::visit_field(const glsl_type *type, const char *name,
- bool row_major,
- const glsl_type *,
- const enum glsl_interface_packing,
- bool /* last_field */)
-{
- visit_field(type, name, row_major);
-}
-
-void
program_resource_visitor::visit_field(const glsl_struct_field *)
{
}
@@ -345,7 +335,10 @@ public:
private:
virtual void visit_field(const glsl_type *type, const char *name,
- bool /* row_major */)
+ bool /* row_major */,
+ const glsl_type * /* record_type */,
+ const enum glsl_interface_packing,
+ bool /* last_field */)
{
assert(!type->without_array()->is_record());
assert(!type->without_array()->is_interface());
@@ -648,12 +641,6 @@ private:
this->record_array_count = record_array_count;
}
- virtual void visit_field(const glsl_type *, const char *,
- bool /* row_major */)
- {
- assert(!"Should not get here.");
- }
-
virtual void enter_record(const glsl_type *type, const char *,
bool row_major,
const enum glsl_interface_packing packing)
diff --git a/src/compiler/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp
index 87d7c91604e..308d9c5b9e6 100644
--- a/src/compiler/glsl/link_varyings.cpp
+++ b/src/compiler/glsl/link_varyings.cpp
@@ -1788,13 +1788,14 @@ public:
private:
virtual void visit_field(const glsl_type *type, const char *name,
- bool row_major)
+ bool /* row_major */,
+ const glsl_type * /* record_type */,
+ const enum glsl_interface_packing,
+ bool /* last_field */)
{
assert(!type->without_array()->is_record());
assert(!type->without_array()->is_interface());
- (void) row_major;
-
tfeedback_candidate *candidate
= rzalloc(this->mem_ctx, tfeedback_candidate);
candidate->toplevel_var = this->toplevel_var;
diff --git a/src/compiler/glsl/linker.h b/src/compiler/glsl/linker.h
index 420abf97fce..d30aeda4f65 100644
--- a/src/compiler/glsl/linker.h
+++ b/src/compiler/glsl/linker.h
@@ -145,23 +145,11 @@ protected:
* \param last_field Set if \c name is the last field of the structure
* containing it. This will always be false for items
* not contained in a structure or interface block.
- *
- * The default implementation just calls the other \c visit_field method.
*/
virtual void visit_field(const glsl_type *type, const char *name,
bool row_major, const glsl_type *record_type,
const enum glsl_interface_packing packing,
- bool last_field);
-
- /**
- * Method invoked for each leaf of the variable
- *
- * \param type Type of the field.
- * \param name Fully qualified name of the field.
- * \param row_major For a matrix type, is it stored row-major.
- */
- virtual void visit_field(const glsl_type *type, const char *name,
- bool row_major) = 0;
+ bool last_field) = 0;
/**
* Visit a record before visiting its fields
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index f4c2ad6770c..6a1a977584c 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -2381,7 +2381,9 @@ public:
private:
virtual void visit_field(const glsl_type *type, const char *name,
- bool row_major);
+ bool row_major, const glsl_type *record_type,
+ const enum glsl_interface_packing packing,
+ bool last_field);
struct gl_shader_program *shader_program;
struct gl_program_parameter_list *params;
@@ -2393,12 +2395,13 @@ private:
void
add_uniform_to_shader::visit_field(const glsl_type *type, const char *name,
- bool row_major)
+ bool /* row_major */,
+ const glsl_type * /* record_type */,
+ const enum glsl_interface_packing,
+ bool /* last_field */)
{
unsigned int size;
- (void) row_major;
-
/* atomics don't get real storage */
if (type->contains_atomic())
return;