diff options
| author | Brian Paul <[email protected]> | 2011-12-05 20:40:48 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-12-08 08:56:30 -0700 |
| commit | d0dc75c000d5af92648c7de901756400672b8447 (patch) | |
| tree | b24277323119309015a3d8a2e3aea266d09b4299 /src/mesa/drivers/dri/radeon | |
| parent | b85284f45e8b05ba9a0dac8dd95a9c078e4a635e (diff) | |
mesa/drivers: use new swrast renderbuffer functions
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/radeon')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_screen.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_span.c | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index 391b9f8c7bf..2e364d02807 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -42,6 +42,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/framebuffer.h" #include "main/renderbuffer.h" #include "main/fbobject.h" +#include "swrast/s_renderbuffer.h" #define STANDALONE_MMIO #include "radeon_chipset.h" @@ -651,7 +652,7 @@ radeonCreateBuffer( __DRIscreen *driScrnPriv, depth->has_surface = screen->depthHasSurface; } - _mesa_add_soft_renderbuffers(&rfb->base, + _swrast_add_soft_renderbuffers(&rfb->base, GL_FALSE, /* color */ swDepth, swStencil, diff --git a/src/mesa/drivers/dri/radeon/radeon_span.c b/src/mesa/drivers/dri/radeon/radeon_span.c index ebacf8ec20f..e3bdc36f954 100644 --- a/src/mesa/drivers/dri/radeon/radeon_span.c +++ b/src/mesa/drivers/dri/radeon/radeon_span.c @@ -44,6 +44,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/texformat.h" #include "main/renderbuffer.h" #include "swrast/swrast.h" +#include "swrast/s_renderbuffer.h" #include "radeon_common.h" #include "radeon_span.h" @@ -298,13 +299,13 @@ static void radeonSetSpanFunctions(struct radeon_renderbuffer *rrb) } else if (rrb->base.Format == MESA_FORMAT_ARGB1555_REV) { radeonInitPointers_ARGB1555_REV(&rrb->base); } else if (rrb->base.Format == MESA_FORMAT_Z16) { - _mesa_set_renderbuffer_accessors(&rrb->base); + _swrast_set_renderbuffer_accessors(&rrb->base); } else if (rrb->base.Format == MESA_FORMAT_X8_Z24) { - _mesa_set_renderbuffer_accessors(&rrb->base); + _swrast_set_renderbuffer_accessors(&rrb->base); } else if (rrb->base.Format == MESA_FORMAT_S8_Z24) { - _mesa_set_renderbuffer_accessors(&rrb->base); + _swrast_set_renderbuffer_accessors(&rrb->base); } else if (rrb->base.Format == MESA_FORMAT_S8) { - _mesa_set_renderbuffer_accessors(&rrb->base); + _swrast_set_renderbuffer_accessors(&rrb->base); } else { fprintf(stderr, "radeonSetSpanFunctions: bad format: 0x%04X\n", rrb->base.Format); } |