Mesa (master): r300g: mask out the mirrored bit correctly in the registers
Marek Olšák
mareko at kemper.freedesktop.org
Thu Apr 15 22:40:25 UTC 2010
Module: Mesa
Branch: master
Commit: 85cbff5b60c79731a583104a0c2b32ee149b8c8c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=85cbff5b60c79731a583104a0c2b32ee149b8c8c
Author: Marek Olšák <maraeo at gmail.com>
Date: Thu Apr 15 23:15:41 2010 +0200
r300g: mask out the mirrored bit correctly in the registers
It was previously done wrong + now it shouldn't render garbage,
so that the NPOT fallback can get in.
---
src/gallium/drivers/r300/r300_state_derived.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c
index a36cff9..46c192e 100644
--- a/src/gallium/drivers/r300/r300_state_derived.c
+++ b/src/gallium/drivers/r300/r300_state_derived.c
@@ -514,22 +514,22 @@ static void r300_merge_textures_and_samplers(struct r300_context* r300)
* This prevents incorrect rendering. */
texstate->filter0 &= ~R300_TX_MIN_FILTER_MIP_MASK;
- /* Set repeat or mirrored-repeat to clamp-to-edge. */
- /* Wrap S. */
+ /* Mask out the mirrored flag. */
+ if (texstate->filter0 & R300_TX_WRAP_S(R300_TX_MIRRORED)) {
+ texstate->filter0 &= ~R300_TX_WRAP_S(R300_TX_MIRRORED);
+ }
+ if (texstate->filter0 & R300_TX_WRAP_T(R300_TX_MIRRORED)) {
+ texstate->filter0 &= ~R300_TX_WRAP_T(R300_TX_MIRRORED);
+ }
+
+ /* Change repeat to clamp-to-edge.
+ * (the repeat bit has a value of 0, no masking needed). */
if ((texstate->filter0 & R300_TX_WRAP_S_MASK) ==
- R300_TX_WRAP_S(R300_TX_REPEAT) ||
- (texstate->filter0 & R300_TX_WRAP_S_MASK) ==
- R300_TX_WRAP_S(R300_TX_MIRRORED)) {
- texstate->filter0 &= ~R300_TX_WRAP_S_MASK;
+ R300_TX_WRAP_S(R300_TX_REPEAT)) {
texstate->filter0 |= R300_TX_WRAP_S(R300_TX_CLAMP_TO_EDGE);
}
-
- /* Wrap T. */
if ((texstate->filter0 & R300_TX_WRAP_T_MASK) ==
- R300_TX_WRAP_T(R300_TX_REPEAT) ||
- (texstate->filter0 & R300_TX_WRAP_T_MASK) ==
- R300_TX_WRAP_T(R300_TX_MIRRORED)) {
- texstate->filter0 &= ~R300_TX_WRAP_T_MASK;
+ R300_TX_WRAP_T(R300_TX_REPEAT)) {
texstate->filter0 |= R300_TX_WRAP_T(R300_TX_CLAMP_TO_EDGE);
}
} else {
More information about the mesa-commit
mailing list