diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-02-15 13:54:07 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-02-15 13:54:07 +1100 |
| commit | 8d13f55d2c8483148f0a8786a50daf6e890690a3 (patch) | |
| tree | 00217b7e6515991a7b63a413bf23afca8aa772ba | |
| parent | 4c239ec2d76a7cb1c4ce0a782a30639bb061705d (diff) | |
nv30: fix build
| -rw-r--r-- | src/mesa/pipe/nv30/nv30_fragtex.c | 2 | ||||
| -rw-r--r-- | src/mesa/pipe/nv30/nv30_miptree.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/pipe/nv30/nv30_fragtex.c b/src/mesa/pipe/nv30/nv30_fragtex.c index e75b1f7f28..575f968cc5 100644 --- a/src/mesa/pipe/nv30/nv30_fragtex.c +++ b/src/mesa/pipe/nv30/nv30_fragtex.c @@ -95,7 +95,7 @@ nv30_fragtex_build(struct nv30_context *nv30, int unit) } txf = tf->format << 8; - txf |= (pt->last_level - pt->first_level + 1) << 16; + txf |= (pt->last_level + 1) << 16; txf |= log2i(pt->width[0]) << 20; txf |= log2i(pt->height[0]) << 24; txf |= log2i(pt->depth[0]) << 28; diff --git a/src/mesa/pipe/nv30/nv30_miptree.c b/src/mesa/pipe/nv30/nv30_miptree.c index 75e9b993c1..475f1be8ad 100644 --- a/src/mesa/pipe/nv30/nv30_miptree.c +++ b/src/mesa/pipe/nv30/nv30_miptree.c @@ -23,7 +23,7 @@ nv30_miptree_layout(struct nv30_miptree *nv30mt) 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 @@ nv30_miptree_layout(struct nv30_miptree *nv30mt) } 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++) { nv30mt->level[l].image_offset[f] = offset; offset += nv30mt->level[l].pitch * pt->height[l]; } @@ -88,7 +88,7 @@ nv30_miptree_release(struct pipe_context *pipe, struct pipe_texture **pt) int l; pipe_buffer_reference(ws, &nv30mt->buffer, NULL); - for (l = mt->first_level; l <= mt->last_level; l++) { + for (l = 0; l <= mt->last_level; l++) { if (nv30mt->level[l].image_offset) free(nv30mt->level[l].image_offset); } |