Use intel_uxa.h in all uxa-specific files

Instead of always including intel_uxa.h from intel.h, and including
uxa.h from some files directly, use intel_uxa.h directly from .c files
that have UXA-specific code in them.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

18 files changed, 27 insertions, 13 deletions

diff --git a/src/uxa/i830_3d.c b/src/uxa/i830_3d.c
index e03aaa05..5dec2727 100644
--- a/src/uxa/i830_3d.c
+++ b/src/uxa/i830_3d.c
@@ -32,6 +32,7 @@
 #include "xorg-server.h"
 #include "xf86.h"
 #include "intel.h"
+#include "intel_uxa.h"
 
 #include "i830_reg.h"
 
diff --git a/src/uxa/i830_render.c b/src/uxa/i830_render.c
index 51374deb..905b1569 100644
--- a/src/uxa/i830_render.c
+++ b/src/uxa/i830_render.c
@@ -33,6 +33,7 @@
 #include "xorg-server.h"
 #include "xf86.h"
 #include "intel.h"
+#include "intel_uxa.h"
 #include "i830_reg.h"
 
 struct blendinfo {
diff --git a/src/uxa/i915_3d.c b/src/uxa/i915_3d.c
index 24f60814..41006fa0 100644
--- a/src/uxa/i915_3d.c
+++ b/src/uxa/i915_3d.c
@@ -32,6 +32,7 @@
 #include "xorg-server.h"
 #include "xf86.h"
 #include "intel.h"
+#include "intel_uxa.h"
 
 #include "i915_reg.h"
 
diff --git a/src/uxa/i915_render.c b/src/uxa/i915_render.c
index 5238d8f5..637350f2 100644
--- a/src/uxa/i915_render.c
+++ b/src/uxa/i915_render.c
@@ -33,6 +33,7 @@
 #include "xorg-server.h"
 #include "xf86.h"
 #include "intel.h"
+#include "intel_uxa.h"
 #include "i915_reg.h"
 #include "i915_3d.h"
 
diff --git a/src/uxa/i915_video.c b/src/uxa/i915_video.c
index 1996e8ce..a2fb50cf 100644
--- a/src/uxa/i915_video.c
+++ b/src/uxa/i915_video.c
@@ -37,7 +37,7 @@
 #include "gcstruct.h"
 
 #include "intel.h"
-#include "intel_video.h"
+#include "intel_uxa.h"
 #include "i915_reg.h"
 #include "i915_3d.h"
 
diff --git a/src/uxa/i965_3d.c b/src/uxa/i965_3d.c
index 757a9794..e067c8ce 100644
--- a/src/uxa/i965_3d.c
+++ b/src/uxa/i965_3d.c
@@ -28,6 +28,7 @@
 #include <string.h>
 
 #include "intel.h"
+#include "intel_uxa.h"
 #include "i965_reg.h"
 #include "brw_defines.h"
 
diff --git a/src/uxa/i965_render.c b/src/uxa/i965_render.c
index 205744d7..c1943fb6 100644
--- a/src/uxa/i965_render.c
+++ b/src/uxa/i965_render.c
@@ -37,6 +37,7 @@
 #include "xorg-server.h"
 #include "xf86.h"
 #include "intel.h"
+#include "intel_uxa.h"
 #include "i830_reg.h"
 #include "i965_reg.h"
 
diff --git a/src/uxa/i965_video.c b/src/uxa/i965_video.c
index 252a6a04..68e6fd38 100644
--- a/src/uxa/i965_video.c
+++ b/src/uxa/i965_video.c
@@ -38,7 +38,7 @@
 
 #include "intel.h"
 #include "intel_xvmc.h"
-#include "intel_video.h"
+#include "intel_uxa.h"
 #include "i830_reg.h"
 #include "i965_reg.h"
 #include "brw_defines.h"
diff --git a/src/uxa/intel.h b/src/uxa/intel.h
index 65d8e5c8..52de9805 100644
--- a/src/uxa/intel.h
+++ b/src/uxa/intel.h
@@ -534,8 +534,6 @@ Bool intel_present_screen_init(ScreenPtr screen);
 static inline Bool intel_present_screen_init(ScreenPtr screen) { return 0; }
 #endif
 
-#include "intel_uxa.h"
-
 dri_bo *
 intel_get_pixmap_bo(PixmapPtr pixmap);
 
diff --git a/src/uxa/intel_batchbuffer.c b/src/uxa/intel_batchbuffer.c
index 25349fcf..a29e4434 100644
--- a/src/uxa/intel_batchbuffer.c
+++ b/src/uxa/intel_batchbuffer.c
@@ -41,7 +41,7 @@
 #include "i915_drm.h"
 #include "i965_reg.h"
 
-#include "uxa.h"
+#include "intel_uxa.h"
 
 #define DUMP_BATCHBUFFERS NULL // "/tmp/i915-batchbuffers.dump"
 
diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c
index 46aafe39..8a4a340b 100644
--- a/src/uxa/intel_display.c
+++ b/src/uxa/intel_display.c
@@ -55,7 +55,10 @@
 #endif
 #include "xf86DDC.h"
 #include "fb.h"
-#include "uxa.h"
+
+#if USE_UXA
+#include "intel_uxa.h"
+#endif
 
 #include "intel_glamor.h"
 
diff --git a/src/uxa/intel_dri.c b/src/uxa/intel_dri.c
index 1042def8..dfe7a458 100644
--- a/src/uxa/intel_dri.c
+++ b/src/uxa/intel_dri.c
@@ -66,8 +66,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "dri2.h"
 
+#if USE_UXA
+#include "intel_uxa.h"
+#endif
 #include "intel_glamor.h"
-#include "uxa.h"
 
 typedef struct {
 	int refcnt;
diff --git a/src/uxa/intel_dri3.c b/src/uxa/intel_dri3.c
index 914dff67..fed6b185 100644
--- a/src/uxa/intel_dri3.c
+++ b/src/uxa/intel_dri3.c
@@ -29,6 +29,9 @@
 #include "fb.h"
 
 #include "intel.h"
+#if USE_UXA
+#include "intel_uxa.h"
+#endif
 #include "dri3.h"
 #include "intel_glamor.h"
 
diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
index ea990e40..f31f7bd6 100644
--- a/src/uxa/intel_driver.c
+++ b/src/uxa/intel_driver.c
@@ -68,12 +68,13 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "intel_xvmc.h"
 #endif
 
-#include "uxa.h"
-
-#include "i915_drm.h"
+#if USE_UXA
+#include "intel_uxa.h"
+#endif
 
 #include "intel_glamor.h"
 #include "intel_options.h"
+#include "i915_drm.h"
 
 static void i830AdjustFrame(ADJUST_FRAME_ARGS_DECL);
 static Bool I830CloseScreen(CLOSE_SCREEN_ARGS_DECL);
diff --git a/src/uxa/intel_glamor.c b/src/uxa/intel_glamor.c
index 1e2cf828..2a78c216 100644
--- a/src/uxa/intel_glamor.c
+++ b/src/uxa/intel_glamor.c
@@ -39,7 +39,7 @@
 #include "intel.h"
 #include "i915_drm.h"
 #include "intel_glamor.h"
-#include "uxa.h"
+#include "intel_uxa.h"
 #include "intel_options.h"
 
 void
diff --git a/src/uxa/intel_uxa.c b/src/uxa/intel_uxa.c
index 9ef3b1b5..1746e3d3 100644
--- a/src/uxa/intel_uxa.c
+++ b/src/uxa/intel_uxa.c
@@ -40,8 +40,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <unistd.h>
 
 #include "intel.h"
+#include "intel_uxa.h"
 #include "intel_glamor.h"
-#include "uxa.h"
 
 #include "i830_reg.h"
 #include "i915_drm.h"
diff --git a/src/uxa/intel_uxa.h b/src/uxa/intel_uxa.h
index 539e12b4..f449b54d 100644
--- a/src/uxa/intel_uxa.h
+++ b/src/uxa/intel_uxa.h
@@ -24,6 +24,7 @@
 #define _INTEL_UXA_H_
 
 #include "intel_video.h"
+#include "uxa.h"
 
 struct intel_uxa_pixmap {
 	dri_bo *bo;
diff --git a/src/uxa/intel_uxa_video.c b/src/uxa/intel_uxa_video.c
index 7ff909ff..c5a1956e 100644
--- a/src/uxa/intel_uxa_video.c
+++ b/src/uxa/intel_uxa_video.c
@@ -63,7 +63,7 @@
 #include "windowstr.h"
 #include "damage.h"
 #include "intel.h"
-#include "intel_video.h"
+#include "intel_uxa.h"
 #include "i830_reg.h"
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>