From 91627d1956a7e82a5821500a0bca537ffd6e5157 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Tue, 23 Aug 2016 21:46:58 -0700 Subject: i965: Fix assert with multisampling and cubemaps Signed-off-by: Jordan Justen Reviewed-by: Ian Romanick --- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index e7aa631..5fe6e47 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -384,6 +384,7 @@ intel_miptree_create_layout(struct brw_context *brw, mt->msaa_layout = INTEL_MSAA_LAYOUT_NONE; mt->refcount = 1; + int depth_multiply = 1; if (num_samples > 1) { /* Adjust width/height/depth for MSAA */ mt->msaa_layout = compute_msaa_layout(brw, format, @@ -470,7 +471,8 @@ intel_miptree_create_layout(struct brw_context *brw, } } else { /* Non-interleaved */ - depth0 *= num_samples; + depth_multiply = num_samples; + depth0 *= depth_multiply; } } @@ -500,7 +502,7 @@ intel_miptree_create_layout(struct brw_context *brw, } if (target == GL_TEXTURE_CUBE_MAP) - assert(depth0 == 6); + assert(depth0 == 6 * depth_multiply); mt->physical_width0 = width0; mt->physical_height0 = height0; -- cgit v1.1