From 79d981cd03f2e2e8f67ab21d52711de989bb9a44 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 15 Dec 2011 13:43:00 -0800 Subject: [PATCH] i965: Don't minify depth when setting up cube map miptrees on Gen4. Prior to Ironlake, cube maps were stored as 3D textures. In recent refactoring, we removed a separate "layers" parameter in favor of using depth. Unfortunately, depth was getting minified, which is only correct for actual 3D textures. Fixes piglit tests: - bugs/crash-cubemap-order - fbo/fbo-cubemap - texturing/cubemap Also changes texturing/cubemap npot from abort to fail. This hasn't seen a full test run since Piglit on Mesa master hangs GM45 a lot. Signed-off-by: Kenneth Graunke Reviewed-by: Eric Anholt --- src/mesa/drivers/dri/i965/brw_tex_layout.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_tex_layout.c b/src/mesa/drivers/dri/i965/brw_tex_layout.c index eaea49bf55f..4c7e88ce770 100644 --- a/src/mesa/drivers/dri/i965/brw_tex_layout.c +++ b/src/mesa/drivers/dri/i965/brw_tex_layout.c @@ -124,7 +124,8 @@ brw_miptree_layout(struct intel_context *intel, struct intel_mipmap_tree *mt) mt->total_height += y; width = minify(width); height = minify(height); - depth = minify(depth); + if (mt->target == GL_TEXTURE_3D) + depth = minify(depth); if (mt->compressed) { pack_y_pitch = (height + 3) / 4; -- 2.30.2