diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-11-17 19:02:03 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2009-11-17 19:02:03 +0100 |
| commit | 33e93f42770e344edf1cd693a6c8115acd505a08 (patch) | |
| tree | af3f6e95349625b9640e1ac15dc14dd3a99ac83b | |
| parent | 0e783c7d03128aade3ca50b28a56e254fef6b6ab (diff) | |
| download | external_mesa3d-33e93f42770e344edf1cd693a6c8115acd505a08.zip external_mesa3d-33e93f42770e344edf1cd693a6c8115acd505a08.tar.gz external_mesa3d-33e93f42770e344edf1cd693a6c8115acd505a08.tar.bz2 | |
r600: More span breakage fixes.
At least now the compiler doesn't complain about implicitly declared functions
anymore...
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_span.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_span.c b/src/mesa/drivers/dri/radeon/radeon_span.c index 459ad4b..b3986ef 100644 --- a/src/mesa/drivers/dri/radeon/radeon_span.c +++ b/src/mesa/drivers/dri/radeon/radeon_span.c @@ -516,11 +516,19 @@ static GLubyte *radeon_ptr_2byte_8x2(const struct radeon_renderbuffer * rrb, #define TAG(x) radeon##x##_BGRx8888 #define TAG2(x,y) radeon##x##_BGRx8888##y +#if defined(RADEON_R600) +#define GET_VALUE(_x, _y) ((*(GLuint*)(r600_ptr_color(rrb, _x + x_off, _y + y_off)) | 0x000000ff)) +#define PUT_VALUE(_x, _y, d) { \ + GLuint *_ptr = (GLuint*)r600_ptr_color( rrb, _x + x_off, _y + y_off ); \ + *_ptr = d; \ +} while (0) +#else #define GET_VALUE(_x, _y) ((*(GLuint*)(radeon_ptr_4byte(rrb, _x + x_off, _y + y_off)) | 0x000000ff)) #define PUT_VALUE(_x, _y, d) { \ GLuint *_ptr = (GLuint*)radeon_ptr_4byte( rrb, _x + x_off, _y + y_off ); \ *_ptr = d; \ } while (0) +#endif #include "spantmp2.h" /* 32 bit, BGRA8888 color spanline and pixel functions @@ -530,7 +538,11 @@ static GLubyte *radeon_ptr_2byte_8x2(const struct radeon_renderbuffer * rrb, #define TAG(x) radeon##x##_BGRA8888 #define TAG2(x,y) radeon##x##_BGRA8888##y +#if defined(RADEON_R600) +#define GET_PTR(X,Y) r600_ptr_color(rrb, (X) + x_off, (Y) + y_off) +#else #define GET_PTR(X,Y) radeon_ptr_4byte(rrb, (X) + x_off, (Y) + y_off) +#endif #include "spantmp2.h" /* ================================================================ |