From cd499e76123f075c3201058f5fcda66425c4e5a8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sat, 10 Apr 2010 19:00:10 +0200 Subject: [PATCH] r300g: use clamp-to-edge instead of repeat/mirrored-repeat for NPOT textures --- src/gallium/drivers/r300/r300_state_derived.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c index ae54d06372f..ade603a47cf 100644 --- a/src/gallium/drivers/r300/r300_state_derived.c +++ b/src/gallium/drivers/r300/r300_state_derived.c @@ -493,6 +493,25 @@ static void r300_merge_textures_and_samplers(struct r300_context* r300) /* NPOT textures don't support mip filter, unfortunately. * This prevents incorrect rendering. */ texstate->filter[0] &= ~R300_TX_MIN_FILTER_MIP_MASK; + + /* Set repeat or mirrored-repeat to clamp-to-edge. */ + /* Wrap S. */ + if ((texstate->filter[0] & R300_TX_WRAP_S_MASK) == + R300_TX_WRAP_S(R300_TX_REPEAT) || + (texstate->filter[0] & R300_TX_WRAP_S_MASK) == + R300_TX_WRAP_S(R300_TX_MIRRORED)) { + texstate->filter[0] &= ~R300_TX_WRAP_S_MASK; + texstate->filter[0] |= R300_TX_WRAP_S(R300_TX_CLAMP_TO_EDGE); + } + + /* Wrap T. */ + if ((texstate->filter[0] & R300_TX_WRAP_T_MASK) == + R300_TX_WRAP_T(R300_TX_REPEAT) || + (texstate->filter[0] & R300_TX_WRAP_T_MASK) == + R300_TX_WRAP_T(R300_TX_MIRRORED)) { + texstate->filter[0] &= ~R300_TX_WRAP_T_MASK; + texstate->filter[0] |= R300_TX_WRAP_T(R300_TX_CLAMP_TO_EDGE); + } } else { /* determine min/max levels */ /* the MAX_MIP level is the largest (finest) one */ -- 2.30.2