From d456ef48e5e23bc8c9d90bfe80f781eafe65eb39 Mon Sep 17 00:00:00 2001 From: Vladimir Dergachev Date: Thu, 13 Jan 2005 09:05:31 +0000 Subject: Incorporate TX_FORMAT information contributed by Wladimir van der Laan. Attempt to use it in r300_state.c We are still missing something and the formats do not quite work. Perhaps something in texture management code ? --- src/mesa/drivers/dri/r300/r300_texstate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mesa/drivers/dri/r300/r300_texstate.c') diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c index 15d3605d01..d10ff4b09a 100644 --- a/src/mesa/drivers/dri/r300/r300_texstate.c +++ b/src/mesa/drivers/dri/r300/r300_texstate.c @@ -248,13 +248,13 @@ static void r300SetTexImages(r300ContextPtr rmesa, t->filter &= ~R200_MAX_MIP_LEVEL_MASK; t->filter |= (numLevels - 1) << R200_MAX_MIP_LEVEL_SHIFT; #endif - t->format &= ~(R300_TX_FORMAT_WIDTH_MASK | - R300_TX_FORMAT_HEIGHT_MASK | + t->format &= ~(R200_TXFORMAT_WIDTH_MASK | + R200_TXFORMAT_HEIGHT_MASK | R200_TXFORMAT_CUBIC_MAP_ENABLE | R200_TXFORMAT_F5_WIDTH_MASK | R200_TXFORMAT_F5_HEIGHT_MASK); - t->format |= ((log2Width << R300_TX_FORMAT_WIDTH_SHIFT) | - (log2Height << R300_TX_FORMAT_HEIGHT_SHIFT)); + t->format |= ((log2Width << R200_TXFORMAT_WIDTH_SHIFT) | + (log2Height << R200_TXFORMAT_HEIGHT_SHIFT)); t->format_x &= ~(R200_DEPTH_LOG2_MASK | R200_TEXCOORD_MASK); if (tObj->Target == GL_TEXTURE_3D) { -- cgit v1.2.3