summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/context.c2
-rw-r--r--src/mesa/main/dlist.c2
-rw-r--r--src/mesa/main/queryobj.c2
-rw-r--r--src/mesa/main/state.c6
-rw-r--r--src/mesa/sources2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 9dc7b11e361..ace68499d79 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -107,13 +107,13 @@
#include "lines.h"
#include "macros.h"
#include "matrix.h"
-#include "occlude.h"
#include "pixel.h"
#include "points.h"
#include "polygon.h"
#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
#include "program.h"
#endif
+#include "queryobj.h"
#include "rastpos.h"
#include "simple_list.h"
#include "state.h"
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 49bc2933bf5..c8c68214ce8 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -66,10 +66,10 @@
#include "dlist.h"
#include "macros.h"
#include "matrix.h"
-#include "occlude.h"
#include "pixel.h"
#include "points.h"
#include "polygon.h"
+#include "queryobj.h"
#include "state.h"
#include "texobj.h"
#include "teximage.h"
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 5fef4a800dc..0e59ba615a7 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -27,7 +27,7 @@
#include "context.h"
#include "hash.h"
#include "imports.h"
-#include "occlude.h"
+#include "queryobj.h"
#include "mtypes.h"
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 9ae71c57383..32af3ccc620 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -70,12 +70,12 @@
#include "lines.h"
#include "macros.h"
#include "matrix.h"
-#if FEATURE_ARB_occlusion_query || FEATURE_EXT_timer_query
-#include "occlude.h"
-#endif
#include "pixel.h"
#include "points.h"
#include "polygon.h"
+#if FEATURE_ARB_occlusion_query || FEATURE_EXT_timer_query
+#include "queryobj.h"
+#endif
#include "rastpos.h"
#include "state.h"
#include "stencil.h"
diff --git a/src/mesa/sources b/src/mesa/sources
index 0066c591644..dbfc01d0edf 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -41,10 +41,10 @@ MAIN_SOURCES = \
main/matrix.c \
main/mipmap.c \
main/mm.c \
- main/occlude.c \
main/pixel.c \
main/points.c \
main/polygon.c \
+ main/queryobj.c \
main/rastpos.c \
main/rbadaptors.c \
main/renderbuffer.c \