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 40901dc6c92ea0cd16350dbd789aaf63f41d7644..0a2f74304d1e7aa161908dfb2587503deda47d58 100644 (file)
--- a/src/glsl/ir_reader.cpp
+++ b/src/glsl/ir_reader.cpp
@@ -21,10 +21,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-extern "C" {
-#include <talloc.h>
-}
-
 #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 05930edb80e93241dda5509e4e4e7b41292a8e4c..6207371c30137eaf6ecfb170159ea7cb1aef2f39 100644 (file)
--- a/src/glsl/link_functions.cpp
+++ b/src/glsl/link_functions.cpp
@@ -25,10 +25,6 @@
 #include <cstdio>
 #include <cstdarg>
 
-extern "C" {
-#include <talloc.h>
-}
-
 #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 c906d7442127dadb9c2f073134ea01a09aeab042..5702ec0e91ad72e40edaf46538c0a687d2cd9d52 100644 (file)
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -68,10 +68,6 @@
 #include <cstdarg>
 #include <climits>
 
-extern "C" {
-#include <talloc.h>
-}
-
 #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 9a71e5377dfe5faf2dd065f04242c2ef83520266..e5b2e1758c08dab35cd1aababeca4dbb71e0a0ce 100644 (file)
--- 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 078a349abdf1466c7d397a72c6f89264f91b86d8..4ec5b57cde73121c9d3eb8729399d17690b36efd 100644 (file)
--- 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 c8f0b27b76f1062e28f7d7512dfdc5ab2593e7c9..b5202d4d2eacb68aa54b95e326885e353f904c92 100644 (file)
--- 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"