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

Revert "i965/miptree: Set logical_depth0 == 6 for cube maps"

Browse source 
This reverts commit 48e9ecc47f.

The commit regressed several piglit tests on SNB/ILK hardware.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97567
This commit is contained in:
Emil Velikov 2016-09-03 18:52:06 +01:00
parent 463d9ea0dc
commit 49e84b8f18
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
View file

@ -501,8 +501,10 @@ intel_miptree_create_layout(struct brw_context *brw,
}
}
if (target == GL_TEXTURE_CUBE_MAP)
assert(depth0 == 6);
if (target == GL_TEXTURE_CUBE_MAP) {
assert(depth0 == 1);
depth0 = 6;
}
mt->physical_width0 = width0;
mt->physical_height0 = height0;
@ -1036,15 +1038,6 @@ intel_get_image_dims(struct gl_texture_image *image,
*height = 1;
*depth = image->Height;
break;
case GL_TEXTURE_CUBE_MAP:
/* For Cube maps, the mesa/main api layer gives us a depth of 1 even
* though we really have 6 slices.
*/
assert(image->Depth == 1);
*width = image->Width;
*height = image->Height;
*depth = 6;
break;
default:
*width = image->Width;
*height = image->Height;