Mesa (master): r300g: fix min/max lod computation

Marek Olšák mareko at kemper.freedesktop.org
Sat Aug 28 16:19:17 UTC 2010


Module: Mesa
Branch: master
Commit: c0f0eb866880ff3e701cd3a532d49417f2743283
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c0f0eb866880ff3e701cd3a532d49417f2743283

Author: Mathias Fröhlich <mathias.froehlich at gmx.net>
Date:   Sat Aug 28 18:16:41 2010 +0200

r300g: fix min/max lod computation

---

 src/gallium/drivers/r300/r300_state.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
index 2240011..9adaea3 100644
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -1213,8 +1213,8 @@ static void*
 
     /* Unfortunately, r300-r500 don't support floating-point mipmap lods. */
     /* We must pass these to the merge function to clamp them properly. */
-    sampler->min_lod = MAX2((unsigned)state->min_lod, 0);
-    sampler->max_lod = MAX2((unsigned)ceilf(state->max_lod), 0);
+    sampler->min_lod = (unsigned)MAX2(state->min_lod, 0);
+    sampler->max_lod = (unsigned)MAX2(ceilf(state->max_lod), 0);
 
     lod_bias = CLAMP((int)(state->lod_bias * 32 + 1), -(1 << 9), (1 << 9) - 1);
 




More information about the mesa-commit mailing list