Hi Jason,
Am 30.06.2016 um 01:22 schrieb Jason Ekstrand:
> v2: Switch on the usage when filling out formats
>
> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com>
> ---
> src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 119
> ++++++++++++++++++++++++++
> src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 5 ++
> 2 files changed, 124 insertions(+)
>
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> index 8a746ec..6febb9a 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -3167,6 +3167,125 @@ intel_miptree_get_isl_surf(struct brw_context *brw,
> surf->usage = 0; /* TODO */
> }
>
> +/* WARNING: THE SURFACE CREATED BY THIS FUNCTION IS NOT COMPLETE AND CANNOT
> BE
> + * USED FOR ANY REAL CALCULATIONS. THE ONLY VALID USE OF SUCH A SURFACE IS
> TO
> + * PASS IT INTO isl_surf_fill_state.
> + */
> +void
> +intel_miptree_get_aux_isl_surf(struct brw_context *brw,
> + const struct intel_mipmap_tree *mt,
> + struct isl_surf *surf,
> + enum isl_aux_usage *usage)
> +{
> + /* Much is the same as the regular surface */
> + intel_miptree_get_isl_surf(brw, mt->mcs_mt, surf);
> +
> + /* Figure out the layout */
> + if (_mesa_get_format_base_format(mt->format) == GL_DEPTH_COMPONENT) {
> + *usage = ISL_AUX_USAGE_HIZ;
> + } else if (mt->num_samples > 1) {
> + if (mt->msaa_layout == INTEL_MSAA_LAYOUT_CMS)
> + *usage = ISL_AUX_USAGE_MCS;
> + else
> + *usage = ISL_AUX_USAGE_NONE;
> + } else if (intel_miptree_is_lossless_compressed(brw, mt)) {
> + assert(brw->gen >= 9);
> + *usage = ISL_AUX_USAGE_CCS_E;
> + } else if (mt->fast_clear_state != INTEL_FAST_CLEAR_STATE_NO_MCS) {
> + *usage = ISL_AUX_USAGE_CCS_D;
> + } else {
> + /* Can we even get here? */
> + *usage = ISL_AUX_USAGE_NONE;
> + }
> +
> + /* Figure out the format of the auxiliary surface */
> + switch (*usage) {
> + case ISL_AUX_USAGE_NONE:
> + /* Can we even get here? */
> + break;
> +
> + case ISL_AUX_USAGE_HIZ:
> + if (brw->gen >= 9) {
> + /* gen9+ uses the same size HiZ buffer regardless of multisampling
> */
> + surf->format = ISL_FORMAT_GEN9_HIZ;
> + } else {
> + switch (mt->num_samples) {
> + case 0:
> + case 1: surf->format = ISL_FORMAT_GEN6_HIZ_1X; break;
> + case 2: surf->format = ISL_FORMAT_GEN6_HIZ_2X; break;
> + case 4: surf->format = ISL_FORMAT_GEN6_HIZ_4X; break;
> + case 8: surf->format = ISL_FORMAT_GEN6_HIZ_8X; break;
> + default:
> + unreachable("Invalid number of samples");
> + }
> + }
> + break;
> +
> + case ISL_AUX_USAGE_MCS:
> + /*
> + * From the SKL PRM:
> + * "When Auxiliary Surface Mode is set to AUX_CCS_D or AUX_CCS_E,
> + * HALIGN 16 must be used."
> + */
That comment talks about CCS_D/E which is in the cases below. Shoudlnt
the first comment from below "When MCS is enabled for non-MSRT,
HALIGN_16 must be used" apply here?
--Michael
> + if (brw->gen >= 9)
> + assert(mt->halign == 16);
> +
> + switch (mt->num_samples) {
> + case 2: surf->format = ISL_FORMAT_MCS_2X; break;
> + case 4: surf->format = ISL_FORMAT_MCS_4X; break;
> + case 8: surf->format = ISL_FORMAT_MCS_8X; break;
> + case 16: surf->format = ISL_FORMAT_MCS_16X; break;
> + default:
> + unreachable("Invalid number of samples");
> + }
> + break;
> +
> + case ISL_AUX_USAGE_CCS_D:
> + case ISL_AUX_USAGE_CCS_E:
> + /*
> + * From the BDW PRM, Volume 2d, page 260 (RENDER_SURFACE_STATE):
> + *
> + * "When MCS is enabled for non-MSRT, HALIGN_16 must be used"
> + *
> + * From the hardware spec for GEN9:
> + *
> + * "When Auxiliary Surface Mode is set to AUX_CCS_D or AUX_CCS_E,
> + * HALIGN 16 must be used."
> + */
> + if (brw->gen >= 9 || mt->num_samples == 1)
> + assert(mt->halign == 16);
> +
> + if (brw->gen >= 9) {
> + assert(mt->tiling == I915_TILING_Y);
> + switch (_mesa_get_format_bytes(mt->format)) {
> + case 4: surf->format = ISL_FORMAT_GEN9_CCS_32BPP; break;
> + case 8: surf->format = ISL_FORMAT_GEN9_CCS_64BPP; break;
> + case 16: surf->format = ISL_FORMAT_GEN9_CCS_128BPP; break;
> + default:
> + unreachable("Invalid format size for color compression");
> + }
> + } else if (mt->tiling == I915_TILING_Y) {
> + switch (_mesa_get_format_bytes(mt->format)) {
> + case 4: surf->format = ISL_FORMAT_GEN7_CCS_32BPP_Y; break;
> + case 8: surf->format = ISL_FORMAT_GEN7_CCS_64BPP_Y; break;
> + case 16: surf->format = ISL_FORMAT_GEN7_CCS_128BPP_X; break;
> + default:
> + unreachable("Invalid format size for color compression");
> + }
> + } else {
> + assert(mt->tiling == I915_TILING_X);
> + switch (_mesa_get_format_bytes(mt->format)) {
> + case 4: surf->format = ISL_FORMAT_GEN7_CCS_32BPP_X; break;
> + case 8: surf->format = ISL_FORMAT_GEN7_CCS_64BPP_X; break;
> + case 16: surf->format = ISL_FORMAT_GEN7_CCS_128BPP_X; break;
> + default:
> + unreachable("Invalid format size for color compression");
> + }
> + }
> + break;
> + }
> +}
> +
> union isl_color_value
> intel_miptree_get_isl_clear_color(struct brw_context *brw,
> const struct intel_mipmap_tree *mt)
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
> b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
> index a50f181..4388741 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
> @@ -801,6 +801,11 @@ void
> intel_miptree_get_isl_surf(struct brw_context *brw,
> const struct intel_mipmap_tree *mt,
> struct isl_surf *surf);
> +void
> +intel_miptree_get_aux_isl_surf(struct brw_context *brw,
> + const struct intel_mipmap_tree *mt,
> + struct isl_surf *surf,
> + enum isl_aux_usage *usage);
>
> union isl_color_value
> intel_miptree_get_isl_clear_color(struct brw_context *brw,
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
