#include clean-ups, fixes

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.h b/src/mesa/drivers/dri/intel_winsys/intel_context.h
index 281d68cc7ef251f82dace2ae64a0c8382d4d129d..0686162ebeed69a23a539b28720dd81faab9e8cd 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.h
@@ -32,12 +32,9 @@
 
 #include "mtypes.h"
 #include "drm.h"
-#include "mm.h"
-#include "texmem.h"
 
 #include "intel_screen.h"
 #include "i915_drm.h"
-#include "i830_common.h"
 
 
 struct pipe_context;

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys_i915.c b/src/mesa/drivers/dri/intel_winsys/intel_winsys_i915.c
index e07fadb278ccf180335e01053f38dc19a4c5212a..022fb66927f7f238719b17678dca36dd19652b6d 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_winsys_i915.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_winsys_i915.c
@@ -38,6 +38,7 @@
 #include "intel_batchbuffer.h"
 #include "intel_winsys.h"
 
+#include "pipe/p_util.h"
 #include "pipe/i915simple/i915_winsys.h"
 
 

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c b/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
index 7f788b8537e11f0f55d3c3dc0cc5f995cbd635a8..9c3fd56d8d2ca55ab6ca515573a4ae608c2b216c 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
@@ -42,6 +42,7 @@
 #include "pipe/p_winsys.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
+#include "pipe/p_util.h"