← Back to branch summary

~ubuntu-branches/ubuntu/raring/mesa/raring

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2013-01-22 11:54:09 UTC
  • mfrom: (1.7.13)
  • Revision ID: package-import@ubuntu.com-20130122115409-5e9xii2ee1whab3e
Tags: 9.0.2-0ubuntu1
* New upstream release.
* Decrease size of mesa's libgl1-mesa-dri again
  - re-enable 117-static-gallium.patch
  - add 118-dricore-gallium.patch to link against libdricore again

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
270
270
                        minLod = MIN2(minLod, tObj->MaxLevel);
271
271
                        maxLod = tObj->BaseLevel + (GLint)(samp->MaxLod + 0.5);
272
272
                        maxLod = MIN2(maxLod, tObj->MaxLevel);
273
 
                        maxLod = MIN2(maxLod, tObj->Image[0][minLod]->MaxLog2 + minLod);
 
273
                        maxLod = MIN2(maxLod, tObj->Image[0][minLod]->MaxNumLevels - 1 + minLod);
274
274
                        maxLod = MAX2(maxLod, minLod); /* need at least one level */
275
275
                }
276
276
                break;
329
329
 
330
330
        mtBaseLevel = &mt->levels[texObj->BaseLevel - mt->baseLevel];
331
331
        firstImage = texObj->Image[0][texObj->BaseLevel];
332
 
        numLevels = MIN2(texObj->_MaxLevel - texObj->BaseLevel + 1, firstImage->MaxLog2 + 1);
 
332
        numLevels = MIN2(texObj->_MaxLevel - texObj->BaseLevel + 1, firstImage->MaxNumLevels);
333
333
 
334
334
        if (radeon_is_debug_enabled(RADEON_TEXTURE,RADEON_TRACE)) {
335
335
                fprintf(stderr, "Checking if miptree %p matches texObj %p\n", mt, texObj);
378
378
        }
379
379
 
380
380
 
381
 
        numLevels = MIN2(texObj->MaxLevel - texObj->BaseLevel + 1, texImg->MaxLog2 + 1);
 
381
        numLevels = MIN2(texObj->MaxLevel - texObj->BaseLevel + 1, texImg->MaxNumLevels);
382
382
 
383
383
        t->mt = radeon_miptree_create(rmesa, t->base.Target,
384
384
                texImg->TexFormat, texObj->BaseLevel,