summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
authorFabian Bieler <[email protected]>2011-03-25 11:06:01 +0100
committerBrian Paul <[email protected]>2011-04-05 09:08:19 -0600
commit5d5db24a26415cdec4b3d3f2a92bae7112c9f884 (patch)
treebb2af6a48ba7a6c86c61bcf67acd35e2ac5a5ba9 /src/mesa/state_tracker
parentd863bd7d7baa0a71529f195b0025d57b9d65089a (diff)
st/mesa: Apply LOD from texture object
Signed-off-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r--src/mesa/state_tracker/st_atom_sampler.c3
1 files changed, 2 insertions, 1 deletions
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)