diff options
| author | Fabian Bieler <der.fabe@gmx.net> | 2011-03-25 11:06:01 +0100 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-04-05 09:10:49 -0600 |
| commit | 1068b7f9ed35b5eadad6ec5521662e62a5964986 (patch) | |
| tree | b61ae27742056c160b821e751a39e5ef0a4ab29f | |
| parent | e17ac39d3849eb0206b711d21f56d3f738a13cc4 (diff) | |
st/mesa: Apply LOD from texture object
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 5d5db24a26415cdec4b3d3f2a92bae7112c9f884)
| -rw-r--r-- | src/mesa/state_tracker/st_atom_sampler.c | 3 |
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 96bdc7f331..5f1849dcd8 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) |