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

i965: Fix assert with multisampling and cubemaps

Browse source 
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Jordan Justen 2016-08-23 21:46:58 -07:00
parent b82bb98441
commit 91627d1956
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;