fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 03:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: remove includes of sampler.h from extern "C" blocks

Browse source 
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 <brianp@vmware.com>
Tested-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Mark Janes 2014-12-16 14:29:28 -08:00 • committed by Kenneth Graunke
parent 3eb6258db7
commit fc016bc0f3
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_fs.cpp
View file

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

2
src/mesa/drivers/dri/i965/brw_fs.h
View file

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

3
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
View file

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

2
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
View file

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