Mesa (master): radeon: fix warnings in wrapper with libdrm
Dave Airlie
airlied at kemper.freedesktop.org
Wed Jun 17 01:18:15 UTC 2009
Module: Mesa
Branch: master
Commit: 856221d6995a7754cde60748d7c229b5278f043e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=856221d6995a7754cde60748d7c229b5278f043e
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Jun 17 11:12:57 2009 +1000
radeon: fix warnings in wrapper with libdrm
---
src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h | 30 ++++++++++----------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h b/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
index 6f1a0b4..e0c70dd 100644
--- a/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
+++ b/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
@@ -1,21 +1,6 @@
#ifndef RADEON_CS_WRAPPER_H
#define RADEON_CS_WRAPPER_H
-#ifndef RADEON_PARAM_DEVICE_ID
-#define RADEON_PARAM_DEVICE_ID 16
-#endif
-
-#ifndef RADEON_INFO_DEVICE_ID
-#define RADEON_INFO_DEVICE_ID 0
-#endif
-#ifndef RADEON_INFO_NUM_GB_PIPES
-#define RADEON_INFO_NUM_GB_PIPES 0
-#endif
-
-#ifndef DRM_RADEON_INFO
-#define DRM_RADEON_INFO 0x1
-#endif
-
#ifdef HAVE_LIBDRM_RADEON
#include "radeon_bo.h"
@@ -50,6 +35,21 @@ struct drm_radeon_info {
};
#endif
+#ifndef RADEON_PARAM_DEVICE_ID
+#define RADEON_PARAM_DEVICE_ID 16
+#endif
+
+#ifndef RADEON_INFO_DEVICE_ID
+#define RADEON_INFO_DEVICE_ID 0
+#endif
+#ifndef RADEON_INFO_NUM_GB_PIPES
+#define RADEON_INFO_NUM_GB_PIPES 0
+#endif
+
+#ifndef DRM_RADEON_INFO
+#define DRM_RADEON_INFO 0x1
+#endif
+
static inline uint32_t radeon_gem_name_bo(struct radeon_bo *dummy)
{
More information about the mesa-commit
mailing list