From ff04e50e2e4f423b7d8866b85d299c9acce5fed6 Mon Sep 17 00:00:00 2001 From: Aapo Tahkola Date: Tue, 11 Jan 2005 23:34:55 +0000 Subject: Mipmapping and other texture filters now work. Beaware that R300_TX_MIN_FILTER_MASK might be incorrect because i havent been able to confirm that all filters operate correctly. Because of this its also pretty pointless trying to get other features that use filter field to work. Lod bias should also work but have been unable to test it because lodbias test doesnt work. --- src/mesa/drivers/dri/r300/r300_texstate.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 fde17e3df6..15d3605d01 100644 --- a/src/mesa/drivers/dri/r300/r300_texstate.c +++ b/src/mesa/drivers/dri/r300/r300_texstate.c @@ -120,13 +120,16 @@ static void r300SetTexImages(r300ContextPtr rmesa, t->format &= ~(R200_TXFORMAT_FORMAT_MASK | R200_TXFORMAT_ALPHA_IN_MAP); +#if 0 t->filter &= ~R200_YUV_TO_RGB; - +#endif if (VALID_FORMAT(baseImage->TexFormat->MesaFormat)) { t->format |= tx_table[baseImage->TexFormat->MesaFormat].format; +#if 0 t->filter |= tx_table[baseImage->TexFormat->MesaFormat].filter; +#endif } else { _mesa_problem(NULL, "unexpected texture format in %s", __FUNCTION__); @@ -241,9 +244,10 @@ static void r300SetTexImages(r300ContextPtr rmesa, /* Hardware state: */ +#if 1 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 | R200_TXFORMAT_CUBIC_MAP_ENABLE | -- cgit v1.2.3