Remove mesa include directories, be stricter about include paths.

diff --git a/src/mesa/math/m_vector.h b/src/mesa/math/m_vector.h
index 222b47f6e197c2862c19cae4e0738354d29dc4a0..b1a65b33569f9b1106fa600e72c48908958ba39e 100644 (file)
--- a/src/mesa/math/m_vector.h
+++ b/src/mesa/math/m_vector.h
@@ -31,8 +31,8 @@
 #ifndef _M_VECTOR_H_
 #define _M_VECTOR_H_
 
-#include "glheader.h"
-#include "mtypes.h"            /* hack for GLchan */
+#include "main/glheader.h"
+#include "main/mtypes.h"               /* hack for GLchan */
 
 
 #define VEC_DIRTY_0        0x1

diff --git a/src/mesa/pipe/Makefile.template b/src/mesa/pipe/Makefile.template
index f2a9591de53b32cd3e293e1218bd2856bece50da..fe0a81af6a53de237fbf15962dfdec18f5910c9d 100644 (file)
--- a/src/mesa/pipe/Makefile.template
+++ b/src/mesa/pipe/Makefile.template
@@ -14,10 +14,7 @@ OBJECTS = $(C_SOURCES:.c=.o) \
 ### Include directories
 INCLUDES = \
        -I. \
-       -I$(TOP)/src/mesa/drivers/dri/common \
-       -I$(TOP)/src/mesa/main \
        -I$(TOP)/src/mesa/pipe \
-       -I$(TOP)/include \
        -I$(TOP)/src/mesa 
 
 

diff --git a/src/mesa/pipe/draw/draw_context.h b/src/mesa/pipe/draw/draw_context.h
index b9cac7c6daa05fb4fd8a42b138c76726afc2c818..beba9429c910c134918f8ffc03f46269e42cf3b7 100644 (file)
--- a/src/mesa/pipe/draw/draw_context.h
+++ b/src/mesa/pipe/draw/draw_context.h
@@ -38,7 +38,7 @@
 #define DRAW_CONTEXT_H
 
 
-#include "glheader.h"
+#include "main/glheader.h"
 #include "pipe/p_state.h"
 
 

diff --git a/src/mesa/pipe/softpipe/sp_clear.c b/src/mesa/pipe/softpipe/sp_clear.c
index 277441372095fc69d90ed9b79d1f1346d1b011d0..6e5e510637983e76cfdb9d0e6c38e7944dc9c64d 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_clear.c
+++ b/src/mesa/pipe/softpipe/sp_clear.c
@@ -35,7 +35,6 @@
 #include "sp_context.h"
 #include "sp_surface.h"
 #include "sp_state.h"
-//#include "colormac.h"
 
 
 /**

diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h
index 8b0e970ea2db3108f1e9850c648bbbc7b49a455b..f45cb6fe2c488fdd67a621f05bac9ffc62321a6f 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_context.h
+++ b/src/mesa/pipe/softpipe/sp_context.h
@@ -31,8 +31,6 @@
 #ifndef SP_CONTEXT_H
 #define SP_CONTEXT_H
 
-//#include "glheader.h"
-
 #include "pipe/p_state.h"
 #include "pipe/p_context.h"
 

diff --git a/src/mesa/pipe/softpipe/sp_prim_setup.c b/src/mesa/pipe/softpipe/sp_prim_setup.c
index 71ef798cbbb718517b32538d1e329f96457972b5..9b91628aaf28c1c12d811c18737adbe7dcd70e4d 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_prim_setup.c
+++ b/src/mesa/pipe/softpipe/sp_prim_setup.c
@@ -33,9 +33,6 @@
  */
 
 
-//#include "imports.h"
-//#include "macros.h"
-
 #include "sp_context.h"
 #include "sp_headers.h"
 #include "sp_quad.h"

diff --git a/src/mesa/vf/vf.h b/src/mesa/vf/vf.h
index 8ca3ab6d4a6ab7ad7d9249cd57b1086fa6ca1fb3..83d7547619c2be59cfef440b14e831ee63a342d9 100644 (file)
--- a/src/mesa/vf/vf.h
+++ b/src/mesa/vf/vf.h
@@ -28,7 +28,7 @@
 #ifndef VF_VERTEX_H
 #define VF_VERTEX_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "math/m_vector.h"
 
 enum {