Merge remote branch 'origin/mesa_7_7_branch'

[mesa.git] / src / gallium / drivers / nv40 / nv40_transfer.c

diff --git a/src/gallium/drivers/nv40/nv40_transfer.c b/src/gallium/drivers/nv40/nv40_transfer.c
index 6d92ac3db9caaa8fe26afd9f10f981e33f35c94a..791ee6823d332ab3dd9ec36846995b92fa365073 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_transfer.c
+++ b/src/gallium/drivers/nv40/nv40_transfer.c
@@ -1,7 +1,9 @@
 #include <pipe/p_state.h>
 #include <pipe/p_defines.h>
 #include <pipe/p_inlines.h>
+#include <util/u_format.h>
 #include <util/u_memory.h>
+#include <util/u_math.h>
 #include <nouveau/nouveau_winsys.h>
 #include "nv40_context.h"
 #include "nv40_screen.h"
@@ -10,38 +12,19 @@
 struct nv40_transfer {
        struct pipe_transfer base;
        struct pipe_surface *surface;
-       bool direct;
+       boolean direct;
 };
 
-static unsigned nv40_usage_tx_to_buf(unsigned tx_usage)
-{
-       switch (tx_usage) {
-               case PIPE_TRANSFER_READ:
-                       return PIPE_BUFFER_USAGE_CPU_READ;
-               case PIPE_TRANSFER_WRITE:
-                       return PIPE_BUFFER_USAGE_CPU_WRITE;
-               case PIPE_TRANSFER_READ_WRITE:
-                       return PIPE_BUFFER_USAGE_CPU_READ_WRITE;
-               default:
-                       assert(0);
-       }
-
-       return -1;
-}
-
 static void
-nv40_compatible_transfer_tex(struct pipe_texture *pt, unsigned level,
+nv40_compatible_transfer_tex(struct pipe_texture *pt, unsigned width, unsigned height,
                              struct pipe_texture *template)
 {
        memset(template, 0, sizeof(struct pipe_texture));
        template->target = pt->target;
        template->format = pt->format;
-       template->width[0] = pt->width[level];
-       template->height[0] = pt->height[level];
-       template->depth[0] = 1;
-       template->block = pt->block;
-       template->nblocksx[0] = pt->nblocksx[level];
-       template->nblocksy[0] = pt->nblocksx[level];
+       template->width0 = width;
+       template->height0 = height;
+       template->depth0 = 1;
        template->last_level = 0;
        template->nr_samples = pt->nr_samples;
 
@@ -64,14 +47,10 @@ nv40_transfer_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
                return NULL;
 
        pipe_texture_reference(&tx->base.texture, pt);
-       tx->base.format = pt->format;
        tx->base.x = x;
        tx->base.y = y;
        tx->base.width = w;
        tx->base.height = h;
-       tx->base.block = pt->block;
-       tx->base.nblocksx = pt->nblocksx[level];
-       tx->base.nblocksy = pt->nblocksy[level];
        tx->base.stride = mt->level[level].pitch;
        tx->base.usage = usage;
        tx->base.face = face;
@@ -86,13 +65,13 @@ nv40_transfer_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
                tx->direct = true;
                tx->surface = pscreen->get_tex_surface(pscreen, pt,
                                                       face, level, zslice,
-                                                      nv40_usage_tx_to_buf(usage));
+                                                      pipe_transfer_buffer_flags(&tx->base));
                return &tx->base;
        }
 
        tx->direct = false;
 
-       nv40_compatible_transfer_tex(pt, level, &tx_tex_template);
+       nv40_compatible_transfer_tex(pt, w, h, &tx_tex_template);
 
        tx_tex = pscreen->texture_create(pscreen, &tx_tex_template);
        if (!tx_tex)
@@ -101,9 +80,11 @@ nv40_transfer_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
                return NULL;
        }
 
+       tx->base.stride = ((struct nv40_miptree*)tx_tex)->level[0].pitch;
+
        tx->surface = pscreen->get_tex_surface(pscreen, tx_tex,
                                               0, 0, 0,
-                                              nv40_usage_tx_to_buf(usage));
+                                              pipe_transfer_buffer_flags(&tx->base));
 
        pipe_texture_reference(&tx_tex, NULL);
 
@@ -114,7 +95,7 @@ nv40_transfer_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
                return NULL;
        }
 
-       if (usage != PIPE_TRANSFER_WRITE) {
+       if (usage & PIPE_TRANSFER_READ) {
                struct nv40_screen *nvscreen = nv40_screen(pscreen);
                struct pipe_surface *src;
 
@@ -126,8 +107,8 @@ nv40_transfer_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
                /* TODO: Check if SIFM can un-swizzle */
                nvscreen->eng2d->copy(nvscreen->eng2d,
                                      tx->surface, 0, 0,
-                                     src, 0, 0,
-                                     src->width, src->height);
+                                     src, x, y,
+                                     w, h);
 
                pipe_surface_reference(&src, NULL);
        }
@@ -140,20 +121,20 @@ nv40_transfer_del(struct pipe_transfer *ptx)
 {
        struct nv40_transfer *tx = (struct nv40_transfer *)ptx;
 
-       if (!tx->direct && ptx->usage != PIPE_TRANSFER_READ) {
+       if (!tx->direct && (ptx->usage & PIPE_TRANSFER_WRITE)) {
                struct pipe_screen *pscreen = ptx->texture->screen;
                struct nv40_screen *nvscreen = nv40_screen(pscreen);
                struct pipe_surface *dst;
 
                dst = pscreen->get_tex_surface(pscreen, ptx->texture,
                                               ptx->face, ptx->level, ptx->zslice,
-                                              PIPE_BUFFER_USAGE_GPU_WRITE);
+                                              PIPE_BUFFER_USAGE_GPU_WRITE | NOUVEAU_BUFFER_USAGE_NO_RENDER);
 
                /* TODO: Check if SIFM can deal with x,y,w,h when swizzling */
                nvscreen->eng2d->copy(nvscreen->eng2d,
-                                     dst, 0, 0,
+                                     dst, tx->base.x, tx->base.y,
                                      tx->surface, 0, 0,
-                                     dst->width, dst->height);
+                                     tx->base.width, tx->base.height);
 
                pipe_surface_reference(&dst, NULL);
        }
@@ -170,10 +151,12 @@ nv40_transfer_map(struct pipe_screen *pscreen, struct pipe_transfer *ptx)
        struct nv04_surface *ns = (struct nv04_surface *)tx->surface;
        struct nv40_miptree *mt = (struct nv40_miptree *)tx->surface->texture;
        void *map = pipe_buffer_map(pscreen, mt->buffer,
-                                   nv40_usage_tx_to_buf(ptx->usage));
+                                   pipe_transfer_buffer_flags(ptx));
 
-       return map + ns->base.offset +
-              ptx->y * ns->pitch + ptx->x * ptx->block.size;
+       if(!tx->direct)
+               return map + ns->base.offset;
+       else
+               return map + ns->base.offset + ptx->y * ns->pitch + ptx->x * util_format_get_blocksize(ptx->texture->format);
 }
 
 static void