nv30: Update miptree to match latest changes

diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c
index ad0b257fe2bd773776fca9b5ab4950ceb5632be4..a0e488c09b1d42c950cbaa94f0b50ad842391f18 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_miptree.c
+++ b/src/gallium/drivers/nv30/nv30_miptree.c
@@ -32,8 +32,8 @@ nv30_miptree_layout(struct nv30_miptree *nv30mt)
                pt->nblocksy[l] = pf_get_nblocksy(&pt->block, height);
 
                if (swizzled)
-                       pitch = pt->width[l];
-               pitch = (pitch + 63) & ~63;
+                       pitch = pt->nblocksx[l];
+               pitch = align_int(pitch, 64);
 
                nv30mt->level[l].pitch = pitch * pt->block.size;
                nv30mt->level[l].image_offset =
@@ -42,7 +42,6 @@ nv30_miptree_layout(struct nv30_miptree *nv30mt)
                width  = MAX2(1, width  >> 1);
                height = MAX2(1, height >> 1);
                depth  = MAX2(1, depth  >> 1);
-
        }
 
        for (f = 0; f < nr_faces; f++) {
@@ -111,17 +110,20 @@ nv30_miptree_surface_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
        struct nv30_miptree *nv30mt = (struct nv30_miptree *)pt;
        struct pipe_surface *ps;
 
-       ps = ws->surface_alloc(ws);
+       ps = CALLOC_STRUCT(pipe_surface);
        if (!ps)
                return NULL;
+       pipe_texture_reference(&ps->texture, pt);
        pipe_buffer_reference(ws, &ps->buffer, nv30mt->buffer);
        ps->format = pt->format;
        ps->width = pt->width[level];
        ps->height = pt->height[level];
+       ps->block = pt->block;
        ps->nblocksx = pt->nblocksx[level];
        ps->nblocksy = pt->nblocksy[level];
-       ps->block = pt->block;
        ps->stride = nv30mt->level[level].pitch;
+       ps->usage = flags;
+       ps->status = PIPE_SURFACE_STATUS_DEFINED;
 
        if (pt->target == PIPE_TEXTURE_CUBE) {
                ps->offset = nv30mt->level[level].image_offset[face];
@@ -139,6 +141,15 @@ static void
 nv30_miptree_surface_del(struct pipe_screen *pscreen,
                         struct pipe_surface **psurface)
 {
+       struct pipe_surface *ps = *psurface;
+
+       *psurface = NULL;
+       if (--ps->refcount > 0)
+               return;
+
+       pipe_texture_reference(&ps->texture, NULL);
+       pipe_buffer_reference(pscreen->winsys, &ps->buffer, NULL);
+       FREE(ps);
 }
 
 void