summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/math/m_vector.h4
-rw-r--r--src/mesa/pipe/Makefile.template3
-rw-r--r--src/mesa/pipe/draw/draw_context.h2
-rw-r--r--src/mesa/pipe/softpipe/sp_clear.c1
-rw-r--r--src/mesa/pipe/softpipe/sp_context.h2
-rw-r--r--src/mesa/pipe/softpipe/sp_prim_setup.c3
-rw-r--r--src/mesa/vf/vf.h2
7 files changed, 4 insertions, 13 deletions
diff --git a/src/mesa/math/m_vector.h b/src/mesa/math/m_vector.h
index 222b47f6e1..b1a65b3356 100644
--- 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 f2a9591de5..fe0a81af6a 100644
--- 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 b9cac7c6da..beba9429c9 100644
--- 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 2774413720..6e5e510637 100644
--- 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 8b0e970ea2..f45cb6fe2c 100644
--- 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 71ef798cbb..9b91628aaf 100644
--- 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 8ca3ab6d4a..83d7547619 100644
--- 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 {