nv40/nv50: enable mirror wrap modes

[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 5e1c7ade31b0cff948a2f998c178b743553b6b6d..38e1a5f04ca5db760041ddce5d01796dbaf30f70 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_miptree.c
+++ b/src/gallium/drivers/nv40/nv40_miptree.c
@@ -12,7 +12,7 @@ nv40_miptree_layout(struct nv40_miptree *nv40mt)
        boolean swizzled = FALSE;
        uint width = pt->width[0], height = pt->height[0], depth = pt->depth[0];
        uint offset = 0;
-       int nr_faces, l, f;
+       int nr_faces, l, f, pitch;
 
        if (pt->target == PIPE_TEXTURE_CUBE) {
                nr_faces = 6;
@@ -22,25 +22,26 @@ nv40_miptree_layout(struct nv40_miptree *nv40mt)
        } else {
                nr_faces = 1;
        }
-       
+
+       pitch = pt->width[0];
        for (l = 0; l <= pt->last_level; l++) {
                pt->width[l] = width;
                pt->height[l] = height;
                pt->depth[l] = depth;
+               pt->nblocksx[l] = pf_get_nblocksx(&pt->block, width);
+               pt->nblocksy[l] = pf_get_nblocksy(&pt->block, height);
 
                if (swizzled)
-                       nv40mt->level[l].pitch = pt->width[l] * pt->cpp;
-               else
-                       nv40mt->level[l].pitch = pt->width[0] * pt->cpp;
-               nv40mt->level[l].pitch = (nv40mt->level[l].pitch + 63) & ~63;
+                       pitch = pt->nblocksx[l];
+               pitch = align_int(pitch, 64);
 
+               nv40mt->level[l].pitch = pitch * pt->block.size;
                nv40mt->level[l].image_offset =
                        CALLOC(nr_faces, sizeof(unsigned));
 
                width  = MAX2(1, width  >> 1);
                height = MAX2(1, height >> 1);
                depth  = MAX2(1, depth  >> 1);
-
        }
 
        for (f = 0; f < nr_faces; f++) {
@@ -54,9 +55,9 @@ nv40_miptree_layout(struct nv40_miptree *nv40mt)
 }
 
 static struct pipe_texture *
-nv40_miptree_create(struct pipe_context *pipe, const struct pipe_texture *pt)
+nv40_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
 {
-       struct pipe_winsys *ws = pipe->winsys;
+       struct pipe_winsys *ws = pscreen->winsys;
        struct nv40_miptree *mt;
 
        mt = MALLOC(sizeof(struct nv40_miptree));
@@ -64,12 +65,16 @@ nv40_miptree_create(struct pipe_context *pipe, const struct pipe_texture *pt)
                return NULL;
        mt->base = *pt;
        mt->base.refcount = 1;
+       mt->base.screen = pscreen;
+
        nv40_miptree_layout(mt);
 
-       mt->buffer = ws->buffer_create(ws, 256, PIPE_BUFFER_USAGE_PIXEL,
+       mt->buffer = ws->buffer_create(ws, 256,
+                                      PIPE_BUFFER_USAGE_PIXEL |
+                                      NOUVEAU_BUFFER_USAGE_TEXTURE,
                                       mt->total_size);
        if (!mt->buffer) {
-               free(mt);
+               FREE(mt);
                return NULL;
        }
 
@@ -77,9 +82,9 @@ nv40_miptree_create(struct pipe_context *pipe, const struct pipe_texture *pt)
 }
 
 static void
-nv40_miptree_release(struct pipe_context *pipe, struct pipe_texture **pt)
+nv40_miptree_release(struct pipe_screen *pscreen, struct pipe_texture **pt)
 {
-       struct pipe_winsys *ws = pipe->winsys;
+       struct pipe_winsys *ws = pscreen->winsys;
        struct pipe_texture *mt = *pt;
 
        *pt = NULL;
@@ -90,34 +95,35 @@ nv40_miptree_release(struct pipe_context *pipe, struct pipe_texture **pt)
                pipe_buffer_reference(ws, &nv40mt->buffer, NULL);
                for (l = 0; l <= mt->last_level; l++) {
                        if (nv40mt->level[l].image_offset)
-                               free(nv40mt->level[l].image_offset);
+                               FREE(nv40mt->level[l].image_offset);
                }
-               free(nv40mt);
+               FREE(nv40mt);
        }
 }
 
-static void
-nv40_miptree_update(struct pipe_context *pipe, struct pipe_texture *mt)
-{
-}
-
 static struct pipe_surface *
-nv40_miptree_surface(struct pipe_context *pipe, struct pipe_texture *pt,
-                     unsigned face, unsigned level, unsigned zslice)
+nv40_miptree_surface_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
+                        unsigned face, unsigned level, unsigned zslice,
+                        unsigned flags)
 {
-       struct pipe_winsys *ws = pipe->winsys;
+       struct pipe_winsys *ws = pscreen->winsys;
        struct nv40_miptree *nv40mt = (struct nv40_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, nv40mt->buffer);
        ps->format = pt->format;
-       ps->cpp = pt->cpp;
        ps->width = pt->width[level];
        ps->height = pt->height[level];
-       ps->pitch = nv40mt->level[level].pitch / ps->cpp;
+       ps->block = pt->block;
+       ps->nblocksx = pt->nblocksx[level];
+       ps->nblocksy = pt->nblocksy[level];
+       ps->stride = nv40mt->level[level].pitch;
+       ps->usage = flags;
+       ps->status = PIPE_SURFACE_STATUS_DEFINED;
 
        if (pt->target == PIPE_TEXTURE_CUBE) {
                ps->offset = nv40mt->level[level].image_offset[face];
@@ -131,12 +137,27 @@ nv40_miptree_surface(struct pipe_context *pipe, struct pipe_texture *pt,
        return ps;
 }
 
+static void
+nv40_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
-nv40_init_miptree_functions(struct nv40_context *nv40)
+nv40_screen_init_miptree_functions(struct pipe_screen *pscreen)
 {
-       nv40->pipe.texture_create = nv40_miptree_create;
-       nv40->pipe.texture_release = nv40_miptree_release;
-       nv40->pipe.texture_update = nv40_miptree_update;
-       nv40->pipe.get_tex_surface = nv40_miptree_surface;
+       pscreen->texture_create = nv40_miptree_create;
+       pscreen->texture_release = nv40_miptree_release;
+       pscreen->get_tex_surface = nv40_miptree_surface_new;
+       pscreen->tex_surface_release = nv40_miptree_surface_del;
 }