Merge branch 'mesa_7_6_branch'

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

diff --git a/src/gallium/drivers/nv40/nv40_miptree.c b/src/gallium/drivers/nv40/nv40_miptree.c
index e4f8df910a9a6465d38c274cd78a4b417b943575..5a201ccf458041c1d0fc56d56ed0d19c0716f81b 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_miptree.c
+++ b/src/gallium/drivers/nv40/nv40_miptree.c
@@ -50,7 +50,8 @@ nv40_miptree_layout(struct nv40_miptree *mt)
                for (l = 0; l < pt->last_level; l++) {
                        mt->level[l].image_offset[f] = offset;
 
-                       if (!(pt->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR))
+                       if (!(pt->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR) &&
+                           pt->width[l + 1] > 1 && pt->height[l + 1] > 1)
                                offset += align(mt->level[l].pitch * pt->height[l], 64);
                        else
                                offset += mt->level[l].pitch * pt->height[l];
@@ -66,7 +67,6 @@ nv40_miptree_layout(struct nv40_miptree *mt)
 static struct pipe_texture *
 nv40_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
 {
-       struct pipe_winsys *ws = pscreen->winsys;
        struct nv40_miptree *mt;
        unsigned buf_usage = PIPE_BUFFER_USAGE_PIXEL |
                             NOUVEAU_BUFFER_USAGE_TEXTURE;
@@ -75,10 +75,8 @@ nv40_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
        if (!mt)
                return NULL;
        mt->base = *pt;
-       mt->base.refcount = 1;
+       pipe_reference_init(&mt->base.reference, 1);
        mt->base.screen = pscreen;
-       mt->shadow_tex = NULL;
-       mt->shadow_surface = NULL;
 
        /* Swizzled textures must be POT */
        if (pt->width[0] & (pt->width[0] - 1) ||
@@ -113,7 +111,7 @@ nv40_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
 
        nv40_miptree_layout(mt);
 
-       mt->buffer = ws->buffer_create(ws, 256, buf_usage, mt->total_size);
+       mt->buffer = pscreen->buffer_create(pscreen, 256, buf_usage, mt->total_size);
        if (!mt->buffer) {
                FREE(mt);
                return NULL;
@@ -138,38 +136,27 @@ nv40_miptree_blanket(struct pipe_screen *pscreen, const struct pipe_texture *pt,
                return NULL;
 
        mt->base = *pt;
-       mt->base.refcount = 1;
+       pipe_reference_init(&mt->base.reference, 1);
        mt->base.screen = pscreen;
        mt->level[0].pitch = stride[0];
        mt->level[0].image_offset = CALLOC(1, sizeof(unsigned));
 
-       pipe_buffer_reference(pscreen, &mt->buffer, pb);
+       pipe_buffer_reference(&mt->buffer, pb);
        return &mt->base;
 }
 
 static void
-nv40_miptree_release(struct pipe_screen *pscreen, struct pipe_texture **ppt)
+nv40_miptree_destroy(struct pipe_texture *pt)
 {
-       struct pipe_texture *pt = *ppt;
        struct nv40_miptree *mt = (struct nv40_miptree *)pt;
        int l;
 
-       *ppt = NULL;
-       if (--pt->refcount)
-               return;
-
-       pipe_buffer_reference(pscreen, &mt->buffer, NULL);
+       pipe_buffer_reference(&mt->buffer, NULL);
        for (l = 0; l <= pt->last_level; l++) {
                if (mt->level[l].image_offset)
                        FREE(mt->level[l].image_offset);
        }
 
-       if (mt->shadow_tex) {
-               if (mt->shadow_surface)
-                       pscreen->tex_surface_release(pscreen, &mt->shadow_surface);
-               nv40_miptree_release(pscreen, &mt->shadow_tex);
-       }
-
        FREE(mt);
 }
 
@@ -179,48 +166,37 @@ nv40_miptree_surface_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
                         unsigned flags)
 {
        struct nv40_miptree *mt = (struct nv40_miptree *)pt;
-       struct pipe_surface *ps;
+       struct nv04_surface *ns;
 
-       ps = CALLOC_STRUCT(pipe_surface);
-       if (!ps)
+       ns = CALLOC_STRUCT(nv04_surface);
+       if (!ns)
                return NULL;
-       pipe_texture_reference(&ps->texture, pt);
-       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->stride = mt->level[level].pitch;
-       ps->usage = flags;
-       ps->status = PIPE_SURFACE_STATUS_DEFINED;
-       ps->refcount = 1;
-       ps->face = face;
-       ps->level = level;
-       ps->zslice = zslice;
+       pipe_texture_reference(&ns->base.texture, pt);
+       ns->base.format = pt->format;
+       ns->base.width = pt->width[level];
+       ns->base.height = pt->height[level];
+       ns->base.usage = flags;
+       pipe_reference_init(&ns->base.reference, 1);
+       ns->base.face = face;
+       ns->base.level = level;
+       ns->base.zslice = zslice;
+       ns->pitch = mt->level[level].pitch;
 
        if (pt->target == PIPE_TEXTURE_CUBE) {
-               ps->offset = mt->level[level].image_offset[face];
+               ns->base.offset = mt->level[level].image_offset[face];
        } else
        if (pt->target == PIPE_TEXTURE_3D) {
-               ps->offset = mt->level[level].image_offset[zslice];
+               ns->base.offset = mt->level[level].image_offset[zslice];
        } else {
-               ps->offset = mt->level[level].image_offset[0];
+               ns->base.offset = mt->level[level].image_offset[0];
        }
 
-       return ps;
+       return &ns->base;
 }
 
 static void
-nv40_miptree_surface_del(struct pipe_screen *pscreen,
-                        struct pipe_surface **psurface)
+nv40_miptree_surface_del(struct pipe_surface *ps)
 {
-       struct pipe_surface *ps = *psurface;
-
-       *psurface = NULL;
-       if (--ps->refcount > 0)
-               return;
-
        pipe_texture_reference(&ps->texture, NULL);
        FREE(ps);
 }
@@ -230,8 +206,8 @@ nv40_screen_init_miptree_functions(struct pipe_screen *pscreen)
 {
        pscreen->texture_create = nv40_miptree_create;
        pscreen->texture_blanket = nv40_miptree_blanket;
-       pscreen->texture_release = nv40_miptree_release;
+       pscreen->texture_destroy = nv40_miptree_destroy;
        pscreen->get_tex_surface = nv40_miptree_surface_new;
-       pscreen->tex_surface_release = nv40_miptree_surface_del;
+       pscreen->tex_surface_destroy = nv40_miptree_surface_del;
 }