Browse Source

i965: isl: Move the MCS gen7+ assertion into ISL

This is useful for every user of ISL. Drop the comment along the way to
match similar functions in ISL.

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
tags/18.2-branchpoint
Nanley Chery 7 years ago
parent
commit
0ab25f05ab
2 changed files with 2 additions and 2 deletions
  1. 2
    0
      src/intel/isl/isl.c
  2. 0
    2
      src/mesa/drivers/dri/i965/intel_mipmap_tree.c

+ 2
- 0
src/intel/isl/isl.c View File

@@ -1642,6 +1642,8 @@ isl_surf_get_mcs_surf(const struct isl_device *dev,
const struct isl_surf *surf,
struct isl_surf *mcs_surf)
{
assert(ISL_DEV_GEN(dev) >= 7);

/* It must be multisampled with an array layout */
assert(surf->samples > 1 && surf->msaa_layout == ISL_MSAA_LAYOUT_ARRAY);


+ 0
- 2
src/mesa/drivers/dri/i965/intel_mipmap_tree.c View File

@@ -1808,8 +1808,6 @@ intel_miptree_alloc_aux(struct brw_context *brw,
aux_surf_ok = isl_surf_get_hiz_surf(&brw->isl_dev, &mt->surf, &aux_surf);
break;
case ISL_AUX_USAGE_MCS:
assert(brw->screen->devinfo.gen >= 7); /* MCS only used on Gen7+ */

/* From the Ivy Bridge PRM, Vol 2 Part 1 p326:
*
* When MCS buffer is enabled and bound to MSRT, it is required that

Loading…
Cancel
Save