Module: Mesa
Branch: master
Commit: 3f30b0709b5a71915df336194f9f805e4c306cef
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f30b0709b5a71915df336194f9f805e4c306cef

Author: Owen Taylor <[email protected]>
Date:   Wed Oct 14 16:20:07 2009 -0400

Use the right pitch when rendering to a texture

We need to get the pitch from the texture level we are rendering to,
rather than just using the base texel width.

---

 src/mesa/drivers/dri/radeon/radeon_fbo.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_fbo.c 
b/src/mesa/drivers/dri/radeon/radeon_fbo.c
index d83b166..2012cbc 100644
--- a/src/mesa/drivers/dri/radeon/radeon_fbo.c
+++ b/src/mesa/drivers/dri/radeon/radeon_fbo.c
@@ -445,7 +445,6 @@ restart:
                goto restart;
        }
        
-       rrb->pitch = texImage->Width * rrb->cpp;
        rrb->base.InternalFormat = rrb->base._ActualFormat;
        rrb->base.Width = texImage->Width;
        rrb->base.Height = texImage->Height;
@@ -555,8 +554,10 @@ radeon_render_texture(GLcontext * ctx,
       imageOffset += offsets[att->Zoffset];
    }
 
-   /* store that offset in the region */
+   /* store that offset in the region, along with the correct pitch for
+    * the image we are rendering to */
    rrb->draw_offset = imageOffset;
+   rrb->pitch = radeon_image->mt->levels[att->TextureLevel].rowstride;
 
    /* update drawing region, etc */
    radeon_draw_buffer(ctx, fb);

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to