[PATCH 15/18] Use intel_uxa.h in all uxa-specific files
Keith Packard
keithp at keithp.com
Sat Aug 16 23:13:18 PDT 2014
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 at keithp.com>
---
src/uxa/i830_3d.c | 1 +
src/uxa/i830_render.c | 1 +
src/uxa/i915_3d.c | 1 +
src/uxa/i915_render.c | 1 +
src/uxa/i915_video.c | 2 +-
src/uxa/i965_3d.c | 1 +
src/uxa/i965_render.c | 1 +
src/uxa/i965_video.c | 2 +-
src/uxa/intel.h | 2 --
src/uxa/intel_batchbuffer.c | 2 +-
src/uxa/intel_display.c | 5 ++++-
src/uxa/intel_dri.c | 4 +++-
src/uxa/intel_dri3.c | 3 +++
src/uxa/intel_driver.c | 7 ++++---
src/uxa/intel_glamor.c | 2 +-
src/uxa/intel_uxa.c | 2 +-
src/uxa/intel_uxa.h | 1 +
src/uxa/intel_uxa_video.c | 2 +-
18 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/src/uxa/i830_3d.c b/src/uxa/i830_3d.c
index e03aaa0..5dec272 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 51374de..905b156 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 24f6081..41006fa 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 5238d8f..637350f 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 1996e8c..a2fb50c 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 757a979..e067c8c 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 205744d..c1943fb 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 252a6a0..68e6fd3 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 9b4b2fb..bc61a3e 100644
--- a/src/uxa/intel.h
+++ b/src/uxa/intel.h
@@ -535,8 +535,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 25349fc..a29e443 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 ecd8544..f3ef05a 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 1042def..dfe7a45 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 f57472f..2c44442 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"
static int
diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
index 4548137..a8345d4 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 a2a19d2..6550432 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 9ef3b1b..1746e3d 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 539e12b..f449b54 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 7ff909f..c5a1956 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>
--
2.0.1
More information about the xorg-devel
mailing list