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

iris: Drop redundant iris_resource_disable_aux call

Browse Source 
Drop the call to iris_resource_disable_aux in
iris_resource_configure_aux. With the previous patches, we no longer
create CCS surfaces and pick the AUX_NONE usage. As a result, if the aux
usage is NONE, all iris_resource fields already indicate that aux is
disabled.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12398>
This commit is contained in:
Nanley Chery
2021-08-16 09:08:24 -07:00
committed by Marge Bot
parent 137a054c94
commit c394f2f0ea
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/drivers/iris/iris_resource.c
View File

@@ -773,7 +773,8 @@ iris_resource_configure_aux(struct iris_screen *screen,
} else if (want_ccs_e_for_format(devinfo, res->surf.format)) { } else if (want_ccs_e_for_format(devinfo, res->surf.format)) {
res->aux.possible_usages |= devinfo->ver < 12 ? res->aux.possible_usages |= devinfo->ver < 12 ?
1 << ISL_AUX_USAGE_CCS_E : 1 << ISL_AUX_USAGE_GFX12_CCS_E; 1 << ISL_AUX_USAGE_CCS_E : 1 << ISL_AUX_USAGE_GFX12_CCS_E;
} else if (isl_format_supports_ccs_d(devinfo, res->surf.format)) { } else {
assert(isl_format_supports_ccs_d(devinfo, res->surf.format));
res->aux.possible_usages |= 1 << ISL_AUX_USAGE_CCS_D; res->aux.possible_usages |= 1 << ISL_AUX_USAGE_CCS_D;
} }
} }
@@ -788,9 +789,6 @@ iris_resource_configure_aux(struct iris_screen *screen,
switch (res->aux.usage) { switch (res->aux.usage) {
case ISL_AUX_USAGE_NONE: case ISL_AUX_USAGE_NONE:
/* Update relevant fields to indicate that aux is disabled. */
iris_resource_disable_aux(res);
/* Having no aux buffer is only okay if there's no modifier with aux. */ /* Having no aux buffer is only okay if there's no modifier with aux. */
return !res->mod_info || res->mod_info->aux_usage == ISL_AUX_USAGE_NONE; return !res->mod_info || res->mod_info->aux_usage == ISL_AUX_USAGE_NONE;
case ISL_AUX_USAGE_HIZ: case ISL_AUX_USAGE_HIZ: