Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / gallium / drivers / nv10 / nv10_miptree.c

diff --git a/src/gallium/drivers/nv10/nv10_miptree.c b/src/gallium/drivers/nv10/nv10_miptree.c
index 4dfc675a6b9143719734466d5fa81861c3a66389..943f9e21e98173179f18df49a9903003e2d0663f 100644 (file)
--- a/src/gallium/drivers/nv10/nv10_miptree.c
+++ b/src/gallium/drivers/nv10/nv10_miptree.c
@@ -1,6 +1,5 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
 
 #include "nv10_context.h"
@@ -11,7 +10,7 @@ nv10_miptree_layout(struct nv10_miptree *nv10mt)
 {
        struct pipe_texture *pt = &nv10mt->base;
        boolean swizzled = FALSE;
-       uint width = pt->width[0], height = pt->height[0], depth = pt->depth[0];
+       uint width = pt->width[0], height = pt->height[0];
        uint offset = 0;
        int nr_faces, l, f;
 
@@ -24,12 +23,13 @@ nv10_miptree_layout(struct nv10_miptree *nv10mt)
        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)
-                       nv10mt->level[l].pitch = pt->width[l] * pt->cpp;
+                       nv10mt->level[l].pitch = pt->nblocksx[l] * pt->block.size;
                else
-                       nv10mt->level[l].pitch = pt->width[0] * pt->cpp;
+                       nv10mt->level[l].pitch = pt->nblocksx[0] * pt->block.size;
                nv10mt->level[l].pitch = (nv10mt->level[l].pitch + 63) & ~63;
 
                nv10mt->level[l].image_offset =
@@ -37,7 +37,6 @@ nv10_miptree_layout(struct nv10_miptree *nv10mt)
 
                width  = MAX2(1, width  >> 1);
                height = MAX2(1, height >> 1);
-               depth  = MAX2(1, depth  >> 1);
 
        }
 
@@ -52,7 +51,7 @@ nv10_miptree_layout(struct nv10_miptree *nv10mt)
 }
 
 static struct pipe_texture *
-nv10_miptree_create(struct pipe_screen *screen, struct pipe_texture *pt)
+nv10_miptree_create(struct pipe_screen *screen, const struct pipe_texture *pt)
 {
        struct pipe_winsys *ws = screen->winsys;
        struct nv10_miptree *mt;
@@ -79,7 +78,6 @@ nv10_miptree_create(struct pipe_screen *screen, struct pipe_texture *pt)
 static void
 nv10_miptree_release(struct pipe_screen *screen, struct pipe_texture **pt)
 {
-       struct pipe_winsys *ws = screen->winsys;
        struct pipe_texture *mt = *pt;
 
        *pt = NULL;
@@ -87,7 +85,7 @@ nv10_miptree_release(struct pipe_screen *screen, struct pipe_texture **pt)
                struct nv10_miptree *nv10mt = (struct nv10_miptree *)mt;
                int l;
 
-               pipe_buffer_reference(ws, &nv10mt->buffer, NULL);
+               pipe_buffer_reference(screen, &nv10mt->buffer, NULL);
                for (l = 0; l <= mt->last_level; l++) {
                        if (nv10mt->level[l].image_offset)
                                FREE(nv10mt->level[l].image_offset);
@@ -105,7 +103,8 @@ nv10_miptree_update(struct pipe_context *pipe, struct pipe_texture *mt,
 
 static struct pipe_surface *
 nv10_miptree_surface_get(struct pipe_screen *screen, struct pipe_texture *pt,
-                        unsigned face, unsigned level, unsigned zslice)
+                        unsigned face, unsigned level, unsigned zslice,
+                        unsigned flags)
 {
        struct pipe_winsys *ws = screen->winsys;
        struct nv10_miptree *nv10mt = (struct nv10_miptree *)pt;
@@ -114,12 +113,16 @@ nv10_miptree_surface_get(struct pipe_screen *screen, struct pipe_texture *pt,
        ps = ws->surface_alloc(ws);
        if (!ps)
                return NULL;
-       pipe_buffer_reference(ws, &ps->buffer, nv10mt->buffer);
+       pipe_buffer_reference(screen, &ps->buffer, nv10mt->buffer);
        ps->format = pt->format;
-       ps->cpp = pt->cpp;
        ps->width = pt->width[level];
        ps->height = pt->height[level];
-       ps->pitch = nv10mt->level[level].pitch / ps->cpp;
+       ps->block = pt->block;
+       ps->nblocksx = pt->nblocksx[level];
+       ps->nblocksy = pt->nblocksy[level];
+       ps->stride = nv10mt->level[level].pitch;
+       ps->refcount = 1;
+       ps->winsys = screen->winsys;
 
        if (pt->target == PIPE_TEXTURE_CUBE) {
                ps->offset = nv10mt->level[level].image_offset[face];
@@ -130,9 +133,10 @@ nv10_miptree_surface_get(struct pipe_screen *screen, struct pipe_texture *pt,
        return ps;
 }
 
-void nv10_init_miptree_functions(struct nv10_context *nv10)
+static void
+nv10_miptree_surface_release(struct pipe_screen *screen,
+                            struct pipe_surface **surface)
 {
-       nv10->pipe.texture_update = nv10_miptree_update;
 }
 
 void nv10_screen_init_miptree_functions(struct pipe_screen *pscreen)
@@ -140,5 +144,6 @@ void nv10_screen_init_miptree_functions(struct pipe_screen *pscreen)
        pscreen->texture_create = nv10_miptree_create;
        pscreen->texture_release = nv10_miptree_release;
        pscreen->get_tex_surface = nv10_miptree_surface_get;
+       pscreen->tex_surface_release = nv10_miptree_surface_release;
 }