From: Roland Scheidegger Date: Sat, 15 Oct 2005 01:07:59 +0000 (+0000) Subject: fix two bugs wrt calculating max possible texture sizes for texture rectangles/cube... X-Git-Tag: android-x86-1.6~4418 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ccf13781319b5b9d7ba306728f74b4ae2d099ad0;p=android-x86%2Fexternal-mesa.git fix two bugs wrt calculating max possible texture sizes for texture rectangles/cube maps. --- diff --git a/src/mesa/drivers/dri/common/texmem.c b/src/mesa/drivers/dri/common/texmem.c index 3dd807c3265..c3f6ec9baea 100644 --- a/src/mesa/drivers/dri/common/texmem.c +++ b/src/mesa/drivers/dri/common/texmem.c @@ -945,7 +945,7 @@ get_max_size( unsigned nr_heaps, do { if ( max_sizes[v] != 0 ) { limits-> f = max_sizes[v]; } } while( 0 ) #define SET_MAX_RECT(f,v) \ - do { if ( max_sizes[v] != 0 ) { limits-> f = 1 << max_sizes[v]; } } while( 0 ) + do { if ( max_sizes[v] != 0 ) { limits-> f = 1 << (max_sizes[v] - 1); } } while( 0 ) /** @@ -1000,8 +1000,8 @@ driCalculateMaxTextureLevels( driTexHeap * const * heaps, mipmaps[0] = mipmaps_at_once; mipmaps[1] = mipmaps_at_once; - mipmaps[2] = 1; - mipmaps[3] = mipmaps_at_once; + mipmaps[2] = mipmaps_at_once; + mipmaps[3] = 1; /* Calculate the maximum number of texture levels in two passes. The