From fc016bc0f3d83bbf3eb968938f4bc9df55214ecd Mon Sep 17 00:00:00 2001 From: Mark Janes Date: Tue, 16 Dec 2014 14:29:28 -0800 Subject: [PATCH] i965: remove includes of sampler.h from extern "C" blocks 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. Reviewed-by: Brian Paul Tested-by: Ian Romanick --- 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 6cac6d7cdb4..578d8c1264a 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 58bb3ae1ce0..06575a54753 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 399e772e3c5..bd9345ebef2 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 723878888af..09d79c83704 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 { -- 2.30.2