diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-06 21:03:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-06 21:03:59 +0000 |
| commit | e2b908c356746281aba48128da7dc15a28f5a773 (patch) | |
| tree | 5f0a12dfa33c059d8fe09d9a5a792792f44189a6 /mesalib/src/mesa/state_tracker/st_atom_sampler.c | |
| parent | 1fc1b7f67928082b9e922463be25c232d9bcba6a (diff) | |
| parent | 704e01fc69ebf6302aa1876906805147248abdaa (diff) | |
| download | vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.gz vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.bz2 vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom_sampler.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_sampler.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_sampler.c b/mesalib/src/mesa/state_tracker/st_atom_sampler.c index 17596d4c8..d1ab1ac3e 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_sampler.c +++ b/mesalib/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[su].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)
|