diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-02-13 14:27:32 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-02-15 13:51:12 +1100 |
| commit | 7bd15fd271ecaad0446632dd4e2190930abac487 (patch) | |
| tree | 4e123af0be82df7c43f3af1ed7f1b06a33db2ac1 | |
| parent | 67a483909f8999de1e0c40229b94f7dabab7403b (diff) | |
nv40: remove use of pt->first_level
| -rw-r--r-- | src/mesa/pipe/nv40/nv40_fragtex.c | 3 | ||||
| -rw-r--r-- | src/mesa/pipe/nv40/nv40_miptree.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/mesa/pipe/nv40/nv40_fragtex.c b/src/mesa/pipe/nv40/nv40_fragtex.c index d278ce1897..69c0fcb5e0 100644 --- a/src/mesa/pipe/nv40/nv40_fragtex.c +++ b/src/mesa/pipe/nv40/nv40_fragtex.c @@ -70,8 +70,7 @@ nv40_fragtex_build(struct nv40_context *nv40, int unit) txf = ps->fmt; txf |= tf->format | 0x8000; - txf |= ((pt->last_level - pt->first_level + 1) << - NV40TCL_TEX_FORMAT_MIPMAP_COUNT_SHIFT); + txf |= ((pt->last_level + 1) << NV40TCL_TEX_FORMAT_MIPMAP_COUNT_SHIFT); if (1) /* XXX */ txf |= NV40TCL_TEX_FORMAT_NO_BORDER; diff --git a/src/mesa/pipe/nv40/nv40_miptree.c b/src/mesa/pipe/nv40/nv40_miptree.c index df70feaa05..1b3c27dc45 100644 --- a/src/mesa/pipe/nv40/nv40_miptree.c +++ b/src/mesa/pipe/nv40/nv40_miptree.c @@ -23,7 +23,7 @@ nv40_miptree_layout(struct nv40_miptree *nv40mt) nr_faces = 1; } - for (l = pt->first_level; l <= pt->last_level; l++) { + for (l = 0; l <= pt->last_level; l++) { pt->width[l] = width; pt->height[l] = height; pt->depth[l] = depth; @@ -44,7 +44,7 @@ nv40_miptree_layout(struct nv40_miptree *nv40mt) } for (f = 0; f < nr_faces; f++) { - for (l = pt->first_level; l <= pt->last_level; l++) { + for (l = 0; l <= pt->last_level; l++) { nv40mt->level[l].image_offset[f] = offset; offset += nv40mt->level[l].pitch * pt->height[l]; } @@ -87,7 +87,7 @@ nv40_miptree_release(struct pipe_context *pipe, struct pipe_texture **pt) int l; pipe_buffer_reference(ws, &nv40mt->buffer, NULL); - for (l = mt->first_level; l <= mt->last_level; l++) { + for (l = 0; l <= mt->last_level; l++) { if (nv40mt->level[l].image_offset) free(nv40mt->level[l].image_offset); } |