diff options
| author | Vladimir Dergachev <volodya@freedesktop.org> | 2005-01-05 00:18:46 +0000 |
|---|---|---|
| committer | Vladimir Dergachev <volodya@freedesktop.org> | 2005-01-05 00:18:46 +0000 |
| commit | e99f390ff6b46495625b207e0e51f9431a564866 (patch) | |
| tree | 8c4d14e3087c10e16aa227650b7cd38549bcf4f1 /src/mesa/drivers/dri/r300/r300_texstate.c | |
| parent | 065f725672434319da6e5d91cc17c37a2e9c50eb (diff) | |
Play a little bit with texture formats.
Get NeHe demos 06, 07 and 19 working.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_texstate.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_texstate.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c index 22d1d6c6f9..55d97f304e 100644 --- a/src/mesa/drivers/dri/r300/r300_texstate.c +++ b/src/mesa/drivers/dri/r300/r300_texstate.c @@ -239,13 +239,13 @@ static void r300SetTexImages(r300ContextPtr rmesa, t->filter &= ~R200_MAX_MIP_LEVEL_MASK; t->filter |= (numLevels - 1) << R200_MAX_MIP_LEVEL_SHIFT; - t->format &= ~(R200_TXFORMAT_WIDTH_MASK | - R200_TXFORMAT_HEIGHT_MASK | + t->format &= ~(R300_TX_FORMAT_WIDTH_MASK | + R300_TX_FORMAT_HEIGHT_MASK | R200_TXFORMAT_CUBIC_MAP_ENABLE | R200_TXFORMAT_F5_WIDTH_MASK | R200_TXFORMAT_F5_HEIGHT_MASK); - t->format |= ((log2Width << R200_TXFORMAT_WIDTH_SHIFT) | - (log2Height << R200_TXFORMAT_HEIGHT_SHIFT)); + t->format |= ((log2Width << R300_TX_FORMAT_WIDTH_SHIFT) | + (log2Height << R300_TX_FORMAT_HEIGHT_SHIFT)); t->format_x &= ~(R200_DEPTH_LOG2_MASK | R200_TEXCOORD_MASK); if (tObj->Target == GL_TEXTURE_3D) { @@ -1291,7 +1291,7 @@ void r300UpdateTextureState(GLcontext * ctx) if (GET_CHIP(rmesa->radeon.radeonScreen) == RADEON_CHIP_REAL_R200) { /* * T0 hang workaround ------------- - * not needed for r300 derivatives? + * not needed for r200 derivatives? */ if ((rmesa->hw.ctx.cmd[CTX_PP_CNTL] & R200_TEX_ENABLE_MASK) == R200_TEX_0_ENABLE @@ -1339,7 +1339,7 @@ void r300UpdateTextureState(GLcontext * ctx) /* * Texture cache LRU hang workaround ------------- - * not needed for r300 derivatives? + * not needed for r200 derivatives? */ dbg = 0x0; |