summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
989218b)
Previously, on Gen7, compute_msaa_layout_for_pipeline() would verify
that IMS layout is not used. However, now that we configure
SURFACE_STATE correctly for IMS surfaces, IMS layout is available.
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
assert(true_layout == INTEL_MSAA_LAYOUT_NONE ||
true_layout == INTEL_MSAA_LAYOUT_IMS);
return INTEL_MSAA_LAYOUT_NONE;
assert(true_layout == INTEL_MSAA_LAYOUT_NONE ||
true_layout == INTEL_MSAA_LAYOUT_IMS);
return INTEL_MSAA_LAYOUT_NONE;
+ } else {
+ assert(true_layout != INTEL_MSAA_LAYOUT_NONE);
}
/* Prior to Gen7, all MSAA surfaces use IMS layout. */
if (brw->intel.gen == 6) {
assert(true_layout == INTEL_MSAA_LAYOUT_IMS);
}
/* Prior to Gen7, all MSAA surfaces use IMS layout. */
if (brw->intel.gen == 6) {
assert(true_layout == INTEL_MSAA_LAYOUT_IMS);
- return INTEL_MSAA_LAYOUT_IMS;
- /* Since blorp uses color textures and render targets to do all its work
- * (even when blitting stencil and depth data), we always have to configure
- * the Gen7 GPU to use UMS or CMS layout on Gen7.
- */
- assert(true_layout == INTEL_MSAA_LAYOUT_UMS ||
- true_layout == INTEL_MSAA_LAYOUT_CMS);