diff options
author | Roland Scheidegger <sroland@vmware.com> | 2009-12-02 16:55:33 +0100 |
---|---|---|
committer | Roland Scheidegger <sroland@vmware.com> | 2009-12-02 16:55:33 +0100 |
commit | 94b5c28a98850f42fbcdab9ceda1450279e1e6fd (patch) | |
tree | bc0a996594146a991a7079e10daff6263c8f47a4 /src/gallium/drivers/nv04/nv04_miptree.c | |
parent | c78748a5274e58bcbb122923edf81065be9bbe16 (diff) |
gallium: adapt nv drivers to interface cleanups
Diffstat (limited to 'src/gallium/drivers/nv04/nv04_miptree.c')
-rw-r--r-- | src/gallium/drivers/nv04/nv04_miptree.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/gallium/drivers/nv04/nv04_miptree.c b/src/gallium/drivers/nv04/nv04_miptree.c index 4fd72c82e6..eeab6dfa30 100644 --- a/src/gallium/drivers/nv04/nv04_miptree.c +++ b/src/gallium/drivers/nv04/nv04_miptree.c @@ -10,28 +10,21 @@ static void nv04_miptree_layout(struct nv04_miptree *nv04mt) { struct pipe_texture *pt = &nv04mt->base; - uint width = pt->width0, height = pt->height0; uint offset = 0; int nr_faces, l; nr_faces = 1; for (l = 0; l <= pt->last_level; l++) { - - pt->nblocksx[l] = pf_get_nblocksx(&pt->block, width); - pt->nblocksy[l] = pf_get_nblocksy(&pt->block, height); - nv04mt->level[l].pitch = pt->width0; nv04mt->level[l].pitch = (nv04mt->level[l].pitch + 63) & ~63; - - width = u_minify(width, 1); - height = u_minify(height, 1); } for (l = 0; l <= pt->last_level; l++) { - nv04mt->level[l].image_offset = CALLOC(nr_faces, sizeof(unsigned)); + /* XXX guess was obviously missing */ + nv04mt->level[l].image_offset[0] = offset; offset += nv04mt->level[l].pitch * u_minify(pt->height0, l); } @@ -128,7 +121,7 @@ nv04_miptree_surface_new(struct pipe_screen *pscreen, struct pipe_texture *pt, ns->base.zslice = zslice; ns->pitch = nv04mt->level[level].pitch; - ns->base.offset = nv04mt->level[level].image_offset; + ns->base.offset = nv04mt->level[level].image_offset[0]; return &ns->base; } |