Module: Mesa
Branch: mesa_7_6_branch
Commit: ec14d59afa952b4e53ad268971098584686a6fca
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec14d59afa952b4e53ad268971098584686a6fca
Author: Alex Deucher <alexdeuc...@gmail.com>
Date: Tue Sep 15 17:12:03 2009 -0400
radeon: don't build non-r600 span code on r600
---
src/mesa/drivers/dri/radeon/radeon_span.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/mesa/drivers/dri/radeon/radeon_span.c
b/src/mesa/drivers/dri/radeon/radeon_span.c
index 9959da0..d603f52 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
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
