OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iris: Resolve stencil resource prior to copy or used by CPU

Browse Source 
v2: Decide aux usage in get_copy_region_aux_settings (Nanley Chery)

v3: Use isl_surf_usage_is_stencil function (Nanley Chery)

Signed-off-by: Sagar Ghuge <sagar.ghuge@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
This commit is contained in:
Sagar Ghuge
2019-09-17 13:20:16 -07:00
parent 5d331251cf
commit b22b349443
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gallium/drivers/iris/iris_blit.c
View File

@@ -566,12 +566,21 @@ static void
get_copy_region_aux_settings(const struct gen_device_info *devinfo, get_copy_region_aux_settings(const struct gen_device_info *devinfo,
struct iris_resource *res, struct iris_resource *res,
enum isl_aux_usage *out_aux_usage, enum isl_aux_usage *out_aux_usage,
bool *out_clear_supported) bool *out_clear_supported,
bool is_render_target)
{ {
switch (res->aux.usage) { switch (res->aux.usage) {
case ISL_AUX_USAGE_MCS: case ISL_AUX_USAGE_MCS:
case ISL_AUX_USAGE_MCS_CCS: case ISL_AUX_USAGE_MCS_CCS:
case ISL_AUX_USAGE_CCS_E: case ISL_AUX_USAGE_CCS_E:
/* A stencil resolve operation must be performed prior to doing resource
* copies or used by CPU.
* (see HSD 1209978162)
*/
if (is_render_target && isl_surf_usage_is_stencil(res->surf.usage)) {
*out_aux_usage = ISL_AUX_USAGE_NONE;
*out_clear_supported = false;
} else {
*out_aux_usage = res->aux.usage; *out_aux_usage = res->aux.usage;
/* Prior to Gen9, fast-clear only supported 0/1 clear colors. Since /* Prior to Gen9, fast-clear only supported 0/1 clear colors. Since
* we're going to re-interpret the format as an integer format possibly * we're going to re-interpret the format as an integer format possibly
@@ -579,6 +588,7 @@ get_copy_region_aux_settings(const struct gen_device_info *devinfo,
* until Gen9. * until Gen9.
*/ */
*out_clear_supported = devinfo->gen >= 9; *out_clear_supported = devinfo->gen >= 9;
}
break; break;
default: default:
*out_aux_usage = ISL_AUX_USAGE_NONE; *out_aux_usage = ISL_AUX_USAGE_NONE;
@@ -615,9 +625,9 @@ iris_copy_region(struct blorp_context *blorp,
enum isl_aux_usage src_aux_usage, dst_aux_usage; enum isl_aux_usage src_aux_usage, dst_aux_usage;
bool src_clear_supported, dst_clear_supported; bool src_clear_supported, dst_clear_supported;
get_copy_region_aux_settings(devinfo, src_res, &src_aux_usage, get_copy_region_aux_settings(devinfo, src_res, &src_aux_usage,
&src_clear_supported); &src_clear_supported, false);
get_copy_region_aux_settings(devinfo, dst_res, &dst_aux_usage, get_copy_region_aux_settings(devinfo, dst_res, &dst_aux_usage,
&dst_clear_supported); &dst_clear_supported, true);
if (iris_batch_references(batch, src_res->bo)) if (iris_batch_references(batch, src_res->bo))
tex_cache_flush_hack(batch, ISL_FORMAT_UNSUPPORTED, src_res->surf.format); tex_cache_flush_hack(batch, ISL_FORMAT_UNSUPPORTED, src_res->surf.format);