On 12/16/2014 03:29 PM, Mark Janes wrote:
C linkage was removed from functions in program/sampler.cpp. However, some cpp files include program/sampler.h within extern "C" blocks, causing link errors for test_vec4_copy_propagation. --- src/mesa/drivers/dri/i965/brw_fs.cpp | 2 +- src/mesa/drivers/dri/i965/brw_fs.h | 2 +- src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 3 ++- src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 2 -- 4 files changed, 4 insertions(+), 5 deletions(-)diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 6cac6d7..578d8c1 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -39,7 +39,6 @@ extern "C" { #include "program/prog_parameter.h" #include "program/prog_print.h" #include "util/register_allocate.h" -#include "program/sampler.h" #include "program/hash_table.h" #include "brw_context.h" #include "brw_eu.h" @@ -51,6 +50,7 @@ extern "C" { #include "main/uniforms.h" #include "brw_fs_live_variables.h" #include "glsl/glsl_types.h" +#include "program/sampler.h" void fs_inst::init(enum opcode opcode, uint8_t exec_size, const fs_reg &dst, diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index 58bb3ae..06575a5 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -40,7 +40,6 @@ extern "C" { #include "program/prog_print.h" #include "program/prog_optimize.h" #include "util/register_allocate.h" -#include "program/sampler.h" #include "program/hash_table.h" #include "brw_context.h" #include "brw_eu.h" @@ -50,6 +49,7 @@ extern "C" { } #include "glsl/glsl_types.h" #include "glsl/ir.h" +#include "program/sampler.h" #define MAX_SAMPLER_MESSAGE_SIZE 11 #define MAX_VGRF_SIZE 16 diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index 399e772..bd9345e 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -37,7 +37,6 @@ extern "C" { #include "program/prog_print.h" #include "program/prog_optimize.h" #include "util/register_allocate.h" -#include "program/sampler.h" #include "program/hash_table.h" #include "brw_context.h" #include "brw_eu.h" @@ -48,6 +47,8 @@ extern "C" { #include "main/uniforms.h" #include "glsl/glsl_types.h" #include "glsl/ir_optimization.h" +#include "program/sampler.h" + fs_reg * fs_visitor::emit_vs_system_value(enum brw_reg_type type, int location) diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index 7238788..09d79c8 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -24,9 +24,7 @@ #include "brw_vec4.h" #include "brw_cfg.h" #include "glsl/ir_uniform.h" -extern "C" { #include "program/sampler.h" -} namespace brw {
LGTM. Reviewed-by: Brian Paul <bri...@vmware.com> _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
