KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965/miptree: Remove format assertion in alloc_aux 

intel_miptree_supports_{ccs,mcs,hiz} ensures the format is valid for the
color or depth miptree before the miptree is assigned an aux_usage.
alloc_aux switches on the aux_usage so don't assert that the format is
valid.

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
This commit is contained in:
Nanley Chery 2018-05-16 11:03:24 -07:00
parent 8007b2d78b
commit f88caf2321
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
View File

@ -1804,13 +1804,10 @@ intel_miptree_alloc_aux(struct brw_context *brw,
aux_surf_ok = true;
break;
case ISL_AUX_USAGE_HIZ:
assert(!_mesa_is_format_color_format(mt->format));
initial_state = ISL_AUX_STATE_AUX_INVALID;
aux_surf_ok = isl_surf_get_hiz_surf(&brw->isl_dev, &mt->surf, &aux_surf);
break;
case ISL_AUX_USAGE_MCS:
assert(_mesa_is_format_color_format(mt->format));
assert(brw->screen->devinfo.gen >= 7); /* MCS only used on Gen7+ */
/* From the Ivy Bridge PRM, Vol 2 Part 1 p326:
@ -1831,8 +1828,6 @@ intel_miptree_alloc_aux(struct brw_context *brw,
break;
case ISL_AUX_USAGE_CCS_D:
case ISL_AUX_USAGE_CCS_E:
assert(_mesa_is_format_color_format(mt->format));
/* When CCS_E is used, we need to ensure that the CCS starts off in a
* valid state. From the Sky Lake PRM, "MCS Buffer for Render
* Target(s)":