Mesa (glsl2): intel: Remove include of texmem.h, since we haven' t used it in ages.

Eric Anholt anholt at kemper.freedesktop.org
Fri Aug 13 17:55:44 PDT 2010


Module: Mesa
Branch: glsl2
Commit: c374487a54aca2dd1053645092367c1cf0414ef7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c374487a54aca2dd1053645092367c1cf0414ef7

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Aug 10 22:21:59 2010 -0700

intel: Remove include of texmem.h, since we haven't used it in ages.

---

 src/mesa/drivers/dri/i965/brw_wm.c             |    2 +-
 src/mesa/drivers/dri/intel/intel_context.h     |    1 -
 src/mesa/drivers/dri/intel/intel_mipmap_tree.c |    1 +
 src/mesa/drivers/dri/intel/intel_tex.h         |    2 --
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
index e182fc3..34cefee 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.c
+++ b/src/mesa/drivers/dri/i965/brw_wm.c
@@ -32,7 +32,7 @@
 #include "brw_context.h"
 #include "brw_wm.h"
 #include "brw_state.h"
-
+#include "main/formats.h"
 
 /** Return number of src args for given instruction */
 GLuint brw_wm_nr_args( GLuint opcode )
diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h
index c7ac2de..f245ba8 100644
--- a/src/mesa/drivers/dri/intel/intel_context.h
+++ b/src/mesa/drivers/dri/intel/intel_context.h
@@ -32,7 +32,6 @@
 
 #include "main/mtypes.h"
 #include "main/mm.h"
-#include "texmem.h"
 #include "dri_metaops.h"
 #include "drm.h"
 #include "intel_bufmgr.h"
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index 39ac020..42adb4c 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -30,6 +30,7 @@
 #include "intel_regions.h"
 #include "intel_tex_layout.h"
 #include "main/enums.h"
+#include "main/formats.h"
 
 #define FILE_DEBUG_FLAG DEBUG_MIPTREE
 
diff --git a/src/mesa/drivers/dri/intel/intel_tex.h b/src/mesa/drivers/dri/intel/intel_tex.h
index 4bb012d..cd77dd5 100644
--- a/src/mesa/drivers/dri/intel/intel_tex.h
+++ b/src/mesa/drivers/dri/intel/intel_tex.h
@@ -31,8 +31,6 @@
 #include "main/mtypes.h"
 #include "main/formats.h"
 #include "intel_context.h"
-#include "texmem.h"
-
 
 void intelInitTextureFuncs(struct dd_function_table *functions);
 



More information about the mesa-commit mailing list