diff options
| author | David Nusinow <[email protected]> | 2007-06-27 21:29:16 -0400 |
|---|---|---|
| committer | David Nusinow <[email protected]> | 2007-06-27 21:29:16 -0400 |
| commit | b2e67fdb7ca78c468ecf583ef1fcf9643df55817 (patch) | |
| tree | 4c6b1894e9a3db74b17626dd893ab7924e8ed225 /src/mesa/main/attrib.c | |
| parent | 1953cfc9542dafe2b92d2c9a0da819513ee2c1a4 (diff) | |
| parent | 131baefac30e46287f0c83f43fc0e7b858877830 (diff) | |
Merge branch 'upstream-experimental' into debian-experimental
Conflicts:
.gitignore
progs/miniglx/miniglxtest.c
src/glx/mini/Makefile
src/glx/mini/miniglx.c
src/mesa/drivers/dri/r300/.gitignore
Diffstat (limited to 'src/mesa/main/attrib.c')
| -rw-r--r-- | src/mesa/main/attrib.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index e2cfb8a1f66..0b821cff44d 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -764,6 +764,7 @@ pop_texture_group(GLcontext *ctx, const struct gl_texture_attrib *texAttrib) _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, obj->MagFilter); _mesa_TexParameterf(target, GL_TEXTURE_MIN_LOD, obj->MinLod); _mesa_TexParameterf(target, GL_TEXTURE_MAX_LOD, obj->MaxLod); + _mesa_TexParameterf(target, GL_TEXTURE_LOD_BIAS, obj->LodBias); _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, obj->BaseLevel); if (target != GL_TEXTURE_RECTANGLE_ARB) _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, obj->MaxLevel); |