From: Kenneth Graunke Date: Wed, 19 Jan 2011 10:56:06 +0000 (-0800) Subject: glsl, i965: Remove unnecessary talloc includes. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e256e4743c3f8f924f0d191759d9428f33f3e329;p=mesa.git glsl, i965: Remove unnecessary talloc includes. These are already picked up by ir.h or glsl_types.h. --- diff --git a/src/glsl/ir_reader.cpp b/src/glsl/ir_reader.cpp index 40901dc6c92..0a2f74304d1 100644 --- a/src/glsl/ir_reader.cpp +++ b/src/glsl/ir_reader.cpp @@ -21,10 +21,6 @@ * DEALINGS IN THE SOFTWARE. */ -extern "C" { -#include -} - #include "ir_reader.h" #include "glsl_parser_extras.h" #include "glsl_types.h" diff --git a/src/glsl/link_functions.cpp b/src/glsl/link_functions.cpp index 05930edb80e..6207371c301 100644 --- a/src/glsl/link_functions.cpp +++ b/src/glsl/link_functions.cpp @@ -25,10 +25,6 @@ #include #include -extern "C" { -#include -} - #include "main/core.h" #include "glsl_symbol_table.h" #include "glsl_parser_extras.h" diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index c906d744212..5702ec0e91a 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -68,10 +68,6 @@ #include #include -extern "C" { -#include -} - #include "main/core.h" #include "glsl_symbol_table.h" #include "ir.h" diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 9a71e5377df..e5b2e1758c0 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -41,7 +41,6 @@ extern "C" { #include "brw_context.h" #include "brw_eu.h" #include "brw_wm.h" -#include "talloc.h" } #include "brw_fs.h" #include "../glsl/glsl_types.h" diff --git a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp index 078a349abdf..4ec5b57cde7 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp @@ -41,7 +41,6 @@ extern "C" { #include "brw_context.h" #include "brw_eu.h" #include "brw_wm.h" -#include "talloc.h" } #include "brw_fs.h" #include "../glsl/glsl_types.h" diff --git a/src/mesa/drivers/dri/i965/brw_fs_schedule_instructions.cpp b/src/mesa/drivers/dri/i965/brw_fs_schedule_instructions.cpp index c8f0b27b76f..b5202d4d2ea 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_schedule_instructions.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_schedule_instructions.cpp @@ -39,7 +39,6 @@ extern "C" { #include "brw_context.h" #include "brw_eu.h" #include "brw_wm.h" -#include "talloc.h" } #include "brw_fs.h" #include "../glsl/glsl_types.h"