Mesa (r6xx-rewrite): fix build when HAVE_LIBDRM_RADEON is defined

Alex Deucher agd5f at kemper.freedesktop.org
Tue May 26 17:05:19 UTC 2009


Module: Mesa
Branch: r6xx-rewrite
Commit: ced2f1b94c2bac8344f44e9474b1e363f65f4d3f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ced2f1b94c2bac8344f44e9474b1e363f65f4d3f

Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue May 26 10:33:23 2009 -0400

fix build when HAVE_LIBDRM_RADEON is defined

---

 src/mesa/drivers/dri/radeon/radeon_common.h        |    2 ++
 .../drivers/dri/radeon/radeon_common_context.h     |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_common.h b/src/mesa/drivers/dri/radeon/radeon_common.h
index dcfd5a6..aa6058c 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common.h
+++ b/src/mesa/drivers/dri/radeon/radeon_common.h
@@ -5,9 +5,11 @@
 #include "radeon_dma.h"
 #include "radeon_texture.h"
 
+#ifndef HAVE_LIBDRM_RADEON
 #ifndef RADEON_DEBUG_BO
 #define RADEON_DEBUG_BO 1
 #endif
+#endif
 
 #define TRI_CLEAR_COLOR_BITS (BUFFER_BIT_BACK_LEFT |			\
 			      BUFFER_BIT_FRONT_LEFT |			\
diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.h b/src/mesa/drivers/dri/radeon/radeon_common_context.h
index 233a150..07e60a2 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common_context.h
+++ b/src/mesa/drivers/dri/radeon/radeon_common_context.h
@@ -560,8 +560,10 @@ extern int RADEON_DEBUG;
 #define RADEON_DEBUG		0
 #endif
 
+#ifndef HAVE_LIBDRM_RADEON
 #ifndef RADEON_DEBUG_BO
 #define RADEON_DEBUG_BO 1
 #endif
+#endif
 
 #endif




More information about the mesa-commit mailing list