fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix mipmap posititioning for 2d ARB_npot textures.

Browse source 
Fix typo in 3D image layout for i915.
This commit is contained in:
Keith Whitwell 2006-09-27 19:01:12 +00:00
parent 93bc5e8402
commit 984387b89c
1 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/mesa/drivers/dri/i915/i915_tex_layout.c
View file

@ -126,11 +126,10 @@ i915_miptree_layout(struct intel_mipmap_tree * mt)
depth = mt->depth0;
for (level = mt->first_level; level <= mt->last_level; level++) {
GLuint i;
for (i = 0; i < depth; i++)
intel_miptree_set_image_offset(mt, level, depth,
for (i = 0; i < depth; i++)
intel_miptree_set_image_offset(mt, level, i,
0, i * stack_height);
depth = minify(depth);
}
@ -146,6 +145,7 @@ i915_miptree_layout(struct intel_mipmap_tree * mt)
default:{
GLuint width = mt->width0;
GLuint height = mt->height0;
GLuint img_height;
mt->pitch = ((mt->width0 * mt->cpp + 3) & ~3) / mt->cpp;
mt->total_height = 0;
@ -156,9 +156,13 @@ i915_miptree_layout(struct intel_mipmap_tree * mt)
width, height, 1);
if (mt->compressed)
mt->total_height += MAX2(1, height / 4);
img_height = MAX2(1, height / 4);
else
mt->total_height += MAX2(2, height);
img_height = MAX2(2, height);
mt->total_height += img_height;
mt->total_height += 1;
mt->total_height &= ~1;
width = minify(width);
height = minify(height);
@ -323,23 +327,36 @@ i945_miptree_layout(struct intel_mipmap_tree * mt)
GLuint y = 0;
GLuint width = mt->width0;
GLuint height = mt->height0;
GLint align_h = 2;
mt->pitch = ((mt->width0 * mt->cpp + 3) & ~3) / mt->cpp;
mt->total_height = 0;
for (level = mt->first_level; level <= mt->last_level; level++) {
intel_miptree_set_level_info(mt, level, 1,
x, y, width, height, 1);
GLuint img_height;
intel_miptree_set_level_info(mt, level, 1,
x, y,
width,
mt->compressed ? height/4 : height, 1);
if (mt->compressed)
img_height = MAX2(1, height / 4);
else
img_height = MAX2(align_h, height);
/* LPT change: step right after second mipmap.
*/
if (level == 1)
if (level == mt->first_level + 1) {
x += mt->pitch / 2;
else if (mt->compressed)
y += MAX2(1, height / 4);
else
y += MAX2(2, height);
x = (x + 3) & ~3;
}
else {
y += img_height;
y += align_h - 1;
y &= ~(align_h - 1);
}
/* Because the images are packed better, the final offset
* might not be the maximal one: