radeon: derive radeon_renderbuffer from swrast_renderbuffer

[mesa.git] / src / mesa / drivers / dri / radeon / radeon_common.c

diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c
index 2b87f9631b760dca4a4f9c2c23e93fc3e61a2e3c..b64ff8160d0fe362f40fd51661042a6c154fa326 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_common.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common.c
@@ -305,7 +305,6 @@ void radeon_draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb)
                        offset = rrb->draw_offset;
                        rrbColor = rrb;
                }
-               radeon->constant_cliprect = GL_TRUE;
        }
 
        if (rrbColor == NULL)
@@ -314,8 +313,8 @@ void radeon_draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb)
                radeon->vtbl.fallback(ctx, RADEON_FALLBACK_DRAW_BUFFER, GL_FALSE);
 
 
-       if (fb->_DepthBuffer && fb->_DepthBuffer->Wrapped) {
-               rrbDepth = radeon_renderbuffer(fb->_DepthBuffer->Wrapped);
+       if (fb->Attachment[BUFFER_DEPTH].Renderbuffer) {
+               rrbDepth = radeon_renderbuffer(fb->Attachment[BUFFER_DEPTH].Renderbuffer);
                if (rrbDepth && rrbDepth->bo) {
                        radeon->vtbl.fallback(ctx, RADEON_FALLBACK_DEPTH_BUFFER, GL_FALSE);
                } else {
@@ -326,8 +325,8 @@ void radeon_draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb)
                rrbDepth = NULL;
        }
 
-       if (fb->_StencilBuffer && fb->_StencilBuffer->Wrapped) {
-               rrbStencil = radeon_renderbuffer(fb->_StencilBuffer->Wrapped);
+       if (fb->Attachment[BUFFER_STENCIL].Renderbuffer) {
+               rrbStencil = radeon_renderbuffer(fb->Attachment[BUFFER_STENCIL].Renderbuffer);
                if (rrbStencil && rrbStencil->bo) {
                        radeon->vtbl.fallback(ctx, RADEON_FALLBACK_STENCIL_BUFFER, GL_FALSE);
                        /* need to re-compute stencil hw state */
@@ -365,8 +364,8 @@ void radeon_draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb)
                ctx->NewState |= (_NEW_DEPTH | _NEW_STENCIL);
        }
 
-       _mesa_reference_renderbuffer(&radeon->state.depth.rb, &rrbDepth->base);
-       _mesa_reference_renderbuffer(&radeon->state.color.rb, &rrbColor->base);
+       _mesa_reference_renderbuffer(&radeon->state.depth.rb, &rrbDepth->base.Base);
+       _mesa_reference_renderbuffer(&radeon->state.color.rb, &rrbColor->base.Base);
        radeon->state.color.draw_offset = offset;
 
 #if 0