From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sat, 3 May 2008 15:07:11 +0000 (-0600)
Subject: gallium: fix sampler->max_lod computation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3837d401cc665eccf079eba5822b1a3eec565b81;p=mesa.git

gallium: fix sampler->max_lod computation
---

diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c
index b020d435056..379b41c654f 100644
--- a/src/mesa/state_tracker/st_atom_sampler.c
+++ b/src/mesa/state_tracker/st_atom_sampler.c
@@ -148,8 +148,9 @@ update_samplers(struct st_context *st)
             sampler->normalized_coords = 1;
 
          sampler->lod_bias = st->ctx->Texture.Unit[su].LodBias;
-         sampler->min_lod = MAX2(0, texobj->MinLod);
-         sampler->max_lod = MIN2(texobj->MaxLevel, texobj->MaxLod);
+         sampler->min_lod = MAX2(0.0f, texobj->MinLod);
+         sampler->max_lod = MIN2(texobj->MaxLevel - texobj->BaseLevel,
+                                 texobj->MaxLod);
 
          sampler->border_color[0] = texobj->BorderColor[RCOMP];
          sampler->border_color[1] = texobj->BorderColor[GCOMP];