From: Alex Deucher <alexdeucher@gmail.com>
Date: Tue, 15 Sep 2009 21:12:03 +0000 (-0400)
Subject: radeon: don't build non-r600 span code on r600
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=87d40a95bfd99141215b6d952080135f7605d7d0;p=mesa.git

radeon: don't build non-r600 span code on r600
---

diff --git a/src/mesa/drivers/dri/radeon/radeon_span.c b/src/mesa/drivers/dri/radeon/radeon_span.c
index 9959da011e4..d603f52df7b 100644
--- a/src/mesa/drivers/dri/radeon/radeon_span.c
+++ b/src/mesa/drivers/dri/radeon/radeon_span.c
@@ -239,7 +239,7 @@ static GLubyte *r600_ptr_color(const struct radeon_renderbuffer * rrb,
     return &ptr[offset];
 }
 
-#endif
+#else
 
 /* radeon tiling on r300-r500 has 4 states,
    macro-linear/micro-linear
@@ -332,7 +332,10 @@ static GLubyte *radeon_ptr_2byte_8x2(const struct radeon_renderbuffer * rrb,
     return &ptr[offset];
 }
 
+#endif
+
 #ifndef COMPILE_R300
+#ifndef COMPILE_R600
 static uint32_t
 z24s8_to_s8z24(uint32_t val)
 {
@@ -345,6 +348,7 @@ s8z24_to_z24s8(uint32_t val)
    return (val >> 24) | (val << 8);
 }
 #endif
+#endif
 
 /*
  * Note that all information needed to access pixels in a renderbuffer