Mesa (radeon-rewrite): radeon: fixup include ordering

Dave Airlie airlied at kemper.freedesktop.org
Thu Feb 12 05:08:55 UTC 2009


Module: Mesa
Branch: radeon-rewrite
Commit: 5ee1dd2133c5514713281f32cd4b05fabf14354a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ee1dd2133c5514713281f32cd4b05fabf14354a

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Feb 13 01:21:37 2009 +1000

radeon: fixup include ordering

---

 src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h |    7 ++++---
 src/mesa/drivers/dri/radeon/radeon_cs_drm.h       |    1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h b/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
index 0f45e9d..97467b2 100644
--- a/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
+++ b/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
@@ -15,6 +15,10 @@
 #define RADEON_GEM_DOMAIN_GTT 0x2   // GTT or cache flushed
 #define RADEON_GEM_DOMAIN_VRAM 0x4  // VRAM domain
 
+/* to be used to build locally in mesa with no libdrm bits */
+#include "../radeon/radeon_bo_drm.h"
+#include "../radeon/radeon_cs_drm.h"
+
 #ifndef DRM_RADEON_GEM_INFO
 #define DRM_RADEON_GEM_INFO 0x1c
 
@@ -31,9 +35,6 @@ struct drm_radeon_gem_info {
 #define RADEON_PARAM_DEVICE_ID 17
 #endif
 
-/* to be used to build locally in mesa with no libdrm bits */
-#include "../radeon/radeon_bo_drm.h"
-#include "../radeon/radeon_cs_drm.h"
 
 
 static inline void *radeon_bo_manager_gem_ctor(int fd)
diff --git a/src/mesa/drivers/dri/radeon/radeon_cs_drm.h b/src/mesa/drivers/dri/radeon/radeon_cs_drm.h
index ffda17c..8f0b449 100644
--- a/src/mesa/drivers/dri/radeon/radeon_cs_drm.h
+++ b/src/mesa/drivers/dri/radeon/radeon_cs_drm.h
@@ -35,7 +35,6 @@
 #include <stdint.h>
 #include "drm.h"
 #include "radeon_drm.h"
-#include "radeon_bocs_wrapper.h"
 
 struct radeon_cs_reloc {
     struct radeon_bo    *bo;




More information about the mesa-commit mailing list