From cbba5e13acc2052349f7e2d304e6dddf31fb199a Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 9 Nov 2016 12:45:39 -0800 Subject: linker: Remove unnecessary overload of program_resource_visitor::visit_field MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Tapani Pälli --- src/compiler/glsl/link_uniforms.cpp | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'src/compiler/glsl/link_uniforms.cpp') 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 @@ -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) -- cgit v1.2.3