diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-02-03 09:49:45 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-02-03 09:49:45 +1000 |
| commit | d9cf1319252e053a894dd49583064e4cd063d119 (patch) | |
| tree | f0495c56950619ca249e90e6795c9a0ce9685bc6 /src/mesa/drivers/dri/r300/r300_texstate.c | |
| parent | dbf72bdd3dda73384381a9ae8a94b522b7f786c2 (diff) | |
r300: fixup mipmap + texsubimage issues
This fixes a few regression in piglit, and adds some debug to the mipmap code
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_texstate.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_texstate.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c index 7ffc15fe39..6e2b1309c5 100644 --- a/src/mesa/drivers/dri/r300/r300_texstate.c +++ b/src/mesa/drivers/dri/r300/r300_texstate.c @@ -225,8 +225,9 @@ static void setup_hardware_state(r300ContextPtr rmesa, radeonTexObj *t) t->pp_txformat |= R300_TX_FORMAT_3D; t->pp_txsize = (((firstImage->Width - 1) << R300_TX_WIDTHMASK_SHIFT) - | ((firstImage->Height - 1) << R300_TX_HEIGHTMASK_SHIFT)) - | ((t->mt->lastLevel - t->mt->firstLevel) << R300_TX_MAX_MIP_LEVEL_SHIFT); + | ((firstImage->Height - 1) << R300_TX_HEIGHTMASK_SHIFT) + | ((firstImage->DepthLog2) << R300_TX_DEPTHMASK_SHIFT) + | ((t->mt->lastLevel - t->mt->firstLevel) << R300_TX_MAX_MIP_LEVEL_SHIFT)); if (t->base.Target == GL_TEXTURE_RECTANGLE_NV) { unsigned int align = (64 / t->mt->bpp) - 1; |