fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 01:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use texture->first_level, not 0, when not mipmapping.

Browse source 
Fixes crash when GL_BASE_LEVEL!=0.
Also, remove old assertion.
This commit is contained in:
Brian 2007-09-28 13:49:50 -06:00
parent f971bdc051
commit f14ece2d2c
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/pipe/softpipe/sp_tex_sample.c
View file

@ -479,10 +479,8 @@ choose_mipmap_levels(struct tgsi_sampler *sampler,
{
if (sampler->state->min_mip_filter == PIPE_TEX_MIPFILTER_NONE) {
/* no mipmap selection needed */
assert(sampler->state->min_img_filter ==
sampler->state->mag_img_filter);
*imgFilter = sampler->state->mag_img_filter;
*level0 = *level1 = 0;
*level0 = *level1 = sampler->texture->first_level;
}
else {
float lambda;
@ -497,7 +495,7 @@ choose_mipmap_levels(struct tgsi_sampler *sampler,
if (lambda < 0.0) { /* XXX threshold depends on the filter */
/* magnifying */
*imgFilter = sampler->state->mag_img_filter;
*level0 = *level1 = 0;
*level0 = *level1 = sampler->texture->first_level;
}
else {
/* minifying */