From: Fabian Bieler <der.fabe@gmx.net>
Date: Fri, 25 Mar 2011 10:06:01 +0000 (+0100)
Subject: st/mesa: Apply LOD from texture object
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5d5db24a26415cdec4b3d3f2a92bae7112c9f884;p=mesa.git

st/mesa: Apply LOD from texture object

Signed-off-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c
index 96bdc7f331a..5f1849dcd83 100644
--- a/src/mesa/state_tracker/st_atom_sampler.c
+++ b/src/mesa/state_tracker/st_atom_sampler.c
@@ -163,7 +163,8 @@ update_samplers(struct st_context *st)
          if (texobj->Target != GL_TEXTURE_RECTANGLE_ARB)
             sampler->normalized_coords = 1;
 
-         sampler->lod_bias = st->ctx->Texture.Unit[texUnit].LodBias;
+         sampler->lod_bias = st->ctx->Texture.Unit[texUnit].LodBias +
+            texobj->LodBias;
 
          sampler->min_lod = texobj->BaseLevel + texobj->MinLod;
          if (sampler->min_lod < texobj->BaseLevel)