i965/miptree: Replace is_lossless_compressed with mt->aux_usage checks

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

diff --git a/src/mesa/drivers/dri/radeon/radeon_span.c b/src/mesa/drivers/dri/radeon/radeon_span.c
index be5a91340faa8dfaed67af95424b8c319b4f4cd4..42f62a0cb7f418cf9b264d671bbb3eb27b03fe38 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_span.c
+++ b/src/mesa/drivers/dri/radeon/radeon_span.c
@@ -36,13 +36,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * Authors:
  *   Kevin E. Martin <martin@valinux.com>
  *   Gareth Hughes <gareth@valinux.com>
- *   Keith Whitwell <keith@tungstengraphics.com>
+ *   Keith Whitwell <keithw@vmware.com>
  *
  */
 
 #include "main/glheader.h"
 #include "main/texformat.h"
 #include "main/renderbuffer.h"
+#include "main/samplerobj.h"
 #include "swrast/swrast.h"
 #include "swrast/s_renderbuffer.h"
 
@@ -64,9 +65,10 @@ radeon_renderbuffer_map(struct gl_context *ctx, struct gl_renderbuffer *rb)
                                    GL_MAP_READ_BIT | GL_MAP_WRITE_BIT,
                                    &map, &stride);
 
-       rb->Map = map;
-       rb->RowStride = stride / _mesa_get_format_bytes(rb->Format);
-       rb->RowStrideBytes = stride;
+       rrb->base.Map = map;
+       rrb->base.RowStride = stride;
+       /* No floating point color buffers, use GLubytes */
+       rrb->base.ColorType = GL_UNSIGNED_BYTE;
 }
 
 static void
@@ -78,9 +80,8 @@ radeon_renderbuffer_unmap(struct gl_context *ctx, struct gl_renderbuffer *rb)
 
        ctx->Driver.UnmapRenderbuffer(ctx, rb);
 
-       rb->Map = NULL;
-       rb->RowStride = 0;
-       rb->RowStrideBytes = 0;
+       rrb->base.Map = NULL;
+       rrb->base.RowStride = 0;
 }
 
 static void
@@ -118,17 +119,11 @@ radeon_unmap_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
 static void radeonSpanRenderStart(struct gl_context * ctx)
 {
        radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
-       int i;
 
        radeon_firevertices(rmesa);
 
-       for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
-               if (ctx->Texture.Unit[i]._ReallyEnabled) {
-                       radeon_validate_texture_miptree(ctx, ctx->Texture.Unit[i]._Current);
-                       radeon_swrast_map_texture_images(ctx, ctx->Texture.Unit[i]._Current);
-               }
-       }
-       
+       _swrast_map_textures(ctx);
+
        radeon_map_framebuffer(ctx, ctx->DrawBuffer);
        if (ctx->ReadBuffer != ctx->DrawBuffer)
                radeon_map_framebuffer(ctx, ctx->ReadBuffer);
@@ -136,13 +131,8 @@ static void radeonSpanRenderStart(struct gl_context * ctx)
 
 static void radeonSpanRenderFinish(struct gl_context * ctx)
 {
-       int i;
-
        _swrast_flush(ctx);
-
-       for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++)
-               if (ctx->Texture.Unit[i]._ReallyEnabled)
-                       radeon_swrast_unmap_texture_images(ctx, ctx->Texture.Unit[i]._Current);
+       _swrast_unmap_textures(ctx);
 
        radeon_unmap_framebuffer(ctx, ctx->DrawBuffer);
        if (ctx->ReadBuffer != ctx->DrawBuffer)