mesa: Branch 'master'

[Brian Paul]

 src/mesa/main/context.c  |    2 +-
 src/mesa/main/dlist.c    |    2 +-
 src/mesa/main/queryobj.c |    2 +-
 src/mesa/main/state.c    |    6 +++---
 src/mesa/sources         |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
diff-tree 74afcabd8599565c1b6d06ea5f355662a81c3778 (from b3ab925e910defa0955cac1adb6167a0bff1076f)
Author: Brian <brian at yutani.localnet.net>
Date:   Sat Apr 21 12:42:54 2007 -0600

    Rename occlude.[ch] to queryobj.[ch]

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 9dc7b11..ace6849 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 49bc293..c8c6821 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 5fef4a8..0e59ba6 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 9ae71c5..32af3cc 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 0066c59..dbfc01d 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 \