fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-22 08:30:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix some corner cases in i945_miptree_layout_2d().

Browse source 
Based on a patch from Keith Whitwell, with some further fixes.
This commit is contained in:
Michel Dänzer 2006-12-14 12:42:51 +01:00
parent 3416ef303a
commit 81855f22cd
1 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/mesa/drivers/dri/intel/intel_tex_layout.c
View file

@ -35,16 +35,39 @@
#include "macros.h"
static int align(int value, int alignment)
{
return (value + alignment - 1) & ~(alignment - 1);
}
void i945_miptree_layout_2d( struct intel_mipmap_tree *mt )
{
GLint align_h = 2;
GLint align_h = 2, align_w = 4;
GLuint level;
GLuint x = 0;
GLuint y = 0;
GLuint width = mt->width0;
GLuint height = mt->height0;
mt->pitch = ((mt->width0 * mt->cpp + 3) & ~3) / mt->cpp;
mt->pitch = mt->width0;
/* May need to adjust pitch to accomodate the placement of
* the 2nd mipmap. This occurs when the alignment
* constraints of mipmap placement push the right edge of the
* 2nd mipmap out past the width of its parent.
*/
if (mt->first_level != mt->last_level) {
GLuint mip1_width = align(minify(mt->width0), align_w)
+ minify(minify(mt->width0));
if (mip1_width > mt->width0)
mt->pitch = mip1_width;
}
/* Pitch must be a whole number of dwords, even though we
* express it in texels.
*/
mt->pitch = align(mt->pitch * mt->cpp, 4) / mt->cpp;
mt->total_height = 0;
for ( level = mt->first_level ; level <= mt->last_level ; level++ ) {
@ -56,7 +79,7 @@ void i945_miptree_layout_2d( struct intel_mipmap_tree *mt )
if (mt->compressed)
img_height = MAX2(1, height/4);
else
img_height = MAX2(align_h, height);
img_height = align(height, align_h);
/* Because the images are packed better, the final offset
@ -67,13 +90,10 @@ void i945_miptree_layout_2d( struct intel_mipmap_tree *mt )
/* Layout_below: step right after second mipmap.
*/
if (level == mt->first_level + 1) {
x += mt->pitch / 2;
x = (x + 3) & ~ 3;
x += align(width, align_w);
}
else {
y += img_height;
y += align_h - 1;
y &= ~(align_h - 1);
}
width = minify(width);