Mesa (master): r300g: use clamp-to-edge instead of repeat/ mirrored-repeat for NPOT textures
Marek Olšák
mareko at kemper.freedesktop.org
Sat Apr 10 17:08:05 UTC 2010
Module: Mesa
Branch: master
Commit: cd499e76123f075c3201058f5fcda66425c4e5a8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd499e76123f075c3201058f5fcda66425c4e5a8
Author: Marek Olšák <maraeo at gmail.com>
Date: Sat Apr 10 19:00:10 2010 +0200
r300g: use clamp-to-edge instead of repeat/mirrored-repeat for NPOT textures
---
src/gallium/drivers/r300/r300_state_derived.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c
index ae54d06..ade603a 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 */
More information about the mesa-commit
mailing list