diff options
author | Kenneth Graunke <[email protected]> | 2018-12-07 11:02:50 -0800 |
---|---|---|
committer | Kenneth Graunke <[email protected]> | 2019-02-21 10:26:12 -0800 |
commit | 3cfc6a207bdd75355a540585b40ccae9435394f9 (patch) | |
tree | 3634b437dcdb4ae0c3b6fdc1aa6330aa13b46e80 /src/gallium | |
parent | a7bc4d60749cc4dd81d46bdfebf2266def389b59 (diff) |
iris: Fill out res->aux.possible_usages
Diffstat (limited to 'src/gallium')
-rw-r--r-- | src/gallium/drivers/iris/iris_resource.c | 71 |
1 files changed, 66 insertions, 5 deletions
diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index 5dbc4f7de6c..39cec6b6565 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -232,9 +232,53 @@ iris_alloc_resource(struct pipe_screen *pscreen, res->base.screen = pscreen; pipe_reference_init(&res->base.reference, 1); + res->aux.possible_usages = 1 << ISL_AUX_USAGE_NONE; + return res; } +static bool +supports_mcs(const struct isl_surf *surf) +{ + /* MCS compression only applies to multisampled resources. */ + if (surf->samples <= 1) + return false; + + /* See isl_surf_get_mcs_surf for details. */ + if (surf->samples == 16 && surf->logical_level0_px.width > 8192) + return false; + + /* Depth and stencil buffers use the IMS (interleaved) layout. */ + if (isl_surf_usage_is_depth_or_stencil(surf->usage)) + return false; + + return true; +} + +static bool +supports_ccs(const struct gen_device_info *devinfo, + const struct isl_surf *surf) +{ + /* Gen9+ only supports CCS for Y-tiled buffers. */ + if (surf->tiling != ISL_TILING_Y0) + return false; + + /* CCS only supports singlesampled resources. */ + if (surf->samples > 1) + return false; + + /* The PRM doesn't say this explicitly, but fast-clears don't appear to + * work for 3D textures until Gen9 where the layout of 3D textures changes + * to match 2D array textures. + */ + if (devinfo->gen < 9 && surf->dim != ISL_SURF_DIM_2D) + return false; + + /* Note: still need to check the format! */ + + return true; +} + static struct pipe_resource * iris_resource_create_for_buffer(struct pipe_screen *pscreen, const struct pipe_resource *templ) @@ -282,21 +326,21 @@ iris_resource_create_with_modifiers(struct pipe_screen *pscreen, struct iris_screen *screen = (struct iris_screen *)pscreen; struct gen_device_info *devinfo = &screen->devinfo; struct iris_resource *res = iris_alloc_resource(pscreen, templ); - const struct util_format_description *format_desc = - util_format_description(templ->format); if (!res) return NULL; + const struct util_format_description *format_desc = + util_format_description(templ->format); const bool has_depth = util_format_has_depth(format_desc); + const struct isl_drm_modifier_info *mod_info = NULL; uint64_t modifier = select_best_modifier(devinfo, modifiers, modifiers_count); isl_tiling_flags_t tiling_flags = ISL_TILING_ANY_MASK; if (modifier != DRM_FORMAT_MOD_INVALID) { - const struct isl_drm_modifier_info *mod_info = - isl_drm_modifier_get_info(modifier); + mod_info = isl_drm_modifier_get_info(modifier); tiling_flags = 1 << mod_info->tiling; } else { @@ -364,8 +408,25 @@ iris_resource_create_with_modifiers(struct pipe_screen *pscreen, .tiling_flags = tiling_flags); assert(isl_surf_created_successfully); - const char *name = "miptree"; + if (mod_info) { + res->aux.possible_usages |= 1 << mod_info->aux_usage; + } else if (has_depth) { + res->aux.possible_usages |= 1 << ISL_AUX_USAGE_HIZ; + } else if (supports_mcs(&res->surf)) { + res->aux.possible_usages |= 1 << ISL_AUX_USAGE_MCS; + } else if (supports_ccs(devinfo, &res->surf)) { + if (isl_format_supports_ccs_e(devinfo, res->surf.format)) + res->aux.possible_usages |= 1 << ISL_AUX_USAGE_CCS_E; + else if (isl_format_supports_ccs_d(devinfo, res->surf.format)) + res->aux.possible_usages |= 1 << ISL_AUX_USAGE_CCS_D; + } + + // XXX: we don't actually do aux yet + res->aux.possible_usages = 1 << ISL_AUX_USAGE_NONE; + res->aux.usage = util_last_bit(res->aux.possible_usages) - 1; + + const char *name = "miptree"; enum iris_memory_zone memzone = IRIS_MEMZONE_OTHER; /* These are for u_upload_mgr buffers only */ |