r300g: fix anisotropic filtering, fix macrotiling

Two bug fixes at the same time. :)
This commit is contained in:
Marek Olšák 2010-03-13 16:24:50 +01:00
parent bcec6d851c
commit d5749fb6fc

View file

@ -864,6 +864,8 @@ static void*
state->min_mip_filter,
state->max_anisotropy > 0);
sampler->filter0 |= r300_anisotropy(state->max_anisotropy);
/* Unfortunately, r300-r500 don't support floating-point mipmap lods. */
/* We must pass these to the merge function to clamp them properly. */
sampler->min_lod = MAX2((unsigned)state->min_lod, 0);
@ -873,8 +875,6 @@ static void*
sampler->filter1 |= lod_bias << R300_LOD_BIAS_SHIFT;
sampler->filter1 |= r300_anisotropy(state->max_anisotropy);
util_pack_color(state->border_color, PIPE_FORMAT_B8G8R8A8_UNORM, &uc);
sampler->border_color = uc.ui;