OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linker: Remove unnecessary overload of program_resource_visitor::visit_field

Browse Source 
It looks like I added this version as a short-hand for users that didn't
need the fuller version.  I don't think there's any real utility in
that.  I'm not sure what my thinking was there.  Maybe if those users
overloaded the recursion function could just call the compact version to
avoid passing some parameters?  None of the users do that.

Either way, having this extra overload is not useful.  Delete it.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Ian Romanick
2016-11-09 12:45:39 -08:00
parent b359f62456
commit cbba5e13ac
5 changed files with 22 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/compiler/glsl/link_uniform_blocks.cpp
View File

@@ -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++;
}
};

21
src/compiler/glsl/link_uniforms.cpp
View File

@@ -224,16 +224,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)

7
src/compiler/glsl/link_varyings.cpp
View File

@@ -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;

14
src/compiler/glsl/linker.h
View File

@@ -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

11
src/mesa/program/ir_to_mesa.cpp
View File

@@ -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;