From 4e79a77cdc65af621f77c685b01cd18ace187965 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 6 Nov 2017 17:01:56 -0800 Subject: [PATCH] intel/compiler: Move the destructor from vec4_visitor to backend_shader Reviewed-by: Kenneth Graunke --- src/intel/compiler/brw_shader.cpp | 4 ++++ src/intel/compiler/brw_shader.h | 1 + src/intel/compiler/brw_vec4.h | 1 - src/intel/compiler/brw_vec4_visitor.cpp | 4 ---- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/intel/compiler/brw_shader.cpp b/src/intel/compiler/brw_shader.cpp index 971ff4f..b27a71c 100644 --- a/src/intel/compiler/brw_shader.cpp +++ b/src/intel/compiler/brw_shader.cpp @@ -673,6 +673,10 @@ backend_shader::backend_shader(const struct brw_compiler *compiler, stage_abbrev = _mesa_shader_stage_to_abbrev(stage); } +backend_shader::~backend_shader() +{ +} + bool backend_reg::equals(const backend_reg &r) const { diff --git a/src/intel/compiler/brw_shader.h b/src/intel/compiler/brw_shader.h index d632f6d..ed434ac 100644 --- a/src/intel/compiler/brw_shader.h +++ b/src/intel/compiler/brw_shader.h @@ -197,6 +197,7 @@ protected: struct brw_stage_prog_data *stage_prog_data); public: + virtual ~backend_shader(); const struct brw_compiler *compiler; void *log_data; /* Passed to compiler->*_log functions */ diff --git a/src/intel/compiler/brw_vec4.h b/src/intel/compiler/brw_vec4.h index d828da0..2e93ee2 100644 --- a/src/intel/compiler/brw_vec4.h +++ b/src/intel/compiler/brw_vec4.h @@ -72,7 +72,6 @@ public: void *mem_ctx, bool no_spills, int shader_time_index); - virtual ~vec4_visitor(); dst_reg dst_null_f() { diff --git a/src/intel/compiler/brw_vec4_visitor.cpp b/src/intel/compiler/brw_vec4_visitor.cpp index db27eae..a845a8d 100644 --- a/src/intel/compiler/brw_vec4_visitor.cpp +++ b/src/intel/compiler/brw_vec4_visitor.cpp @@ -1883,10 +1883,6 @@ vec4_visitor::vec4_visitor(const struct brw_compiler *compiler, this->uniforms = 0; } -vec4_visitor::~vec4_visitor() -{ -} - void vec4_visitor::fail(const char *format, ...) -- 2.7.4