summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/s_texture.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-08-28 03:04:41 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-08-28 03:04:41 +0000
commit781fb93877ea3a6faeefcdb48d9b463da7d954a3 (patch)
treec933acef1652c7af93315b5a74cd735793e68740 /src/mesa/swrast/s_texture.c
parenta6ed6f48e6bf4ca5427d921cac863cf3b42f7efc (diff)
Added OpenGL 1.4's per-texture LOD bias.
Diffstat (limited to 'src/mesa/swrast/s_texture.c')
-rw-r--r--src/mesa/swrast/s_texture.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index 172401f594..b9e08148ec 100644
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -4198,11 +4198,11 @@ _swrast_texture_span( GLcontext *ctx, struct sw_span *span )
/* adjust texture lod (lambda) */
if (span->arrayMask & SPAN_LAMBDA) {
- if (texUnit->LodBias != 0.0F) {
+ if (texUnit->LodBias + curObj->LodBias != 0.0F) {
/* apply LOD bias, but don't clamp yet */
GLuint i;
for (i = 0; i < span->end; i++) {
- lambda[i] += texUnit->LodBias;
+ lambda[i] += (texUnit->LodBias + curObj->LodBias);
}
}