Mesa (master): glsl, i965: Remove unnecessary talloc includes.
Kenneth Graunke
kwg at kemper.freedesktop.org
Fri Jan 21 23:51:13 UTC 2011
Module: Mesa
Branch: master
Commit: e256e4743c3f8f924f0d191759d9428f33f3e329
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e256e4743c3f8f924f0d191759d9428f33f3e329
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Wed Jan 19 02:56:06 2011 -0800
glsl, i965: Remove unnecessary talloc includes.
These are already picked up by ir.h or glsl_types.h.
---
src/glsl/ir_reader.cpp | 4 ----
src/glsl/link_functions.cpp | 4 ----
src/glsl/linker.cpp | 4 ----
src/mesa/drivers/dri/i965/brw_fs.cpp | 1 -
src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp | 1 -
.../dri/i965/brw_fs_schedule_instructions.cpp | 1 -
6 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/src/glsl/ir_reader.cpp b/src/glsl/ir_reader.cpp
index 40901dc..0a2f743 100644
--- 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 05930ed..6207371 100644
--- 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 c906d74..5702ec0 100644
--- 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 9a71e53..e5b2e17 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 078a349..4ec5b57 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 c8f0b27..b5202d4 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"
More information about the mesa-commit
mailing list