fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-02 11:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

iris: Don't add a clear color BO for MC_CCS

Browse source 
It's unusable because ISL_AUX_USAGE_MC doesn't support fast clears.

Instead of performing this change in the if-ladder, replace the
if-ladder with a switch statement to make it clear what's going on.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12795>
This commit is contained in:
Nanley Chery 2021-09-08 06:48:15 -07:00 • committed by Marge Bot
parent c7a61bbf13
commit a16d6bc179
1 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/gallium/drivers/iris/iris_resource.c
View file

@ -929,7 +929,10 @@ iris_resource_finish_aux_import(struct pipe_screen *pscreen,
}
/* Combine main and aux plane information. */
if (num_main_planes == 1 && num_planes == 2) {
switch (res->mod_info->modifier) {
case I915_FORMAT_MOD_Y_TILED_CCS:
case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS:
assert(num_main_planes == 1 && num_planes == 2);
import_aux_info(r[0], r[1]);
map_aux_addresses(screen, r[0], format, 0);
@ -940,7 +943,9 @@ iris_resource_finish_aux_import(struct pipe_screen *pscreen,
iris_get_aux_clear_color_state_size(screen), 1,
IRIS_MEMZONE_OTHER, BO_ALLOC_ZEROED);
}
} else if (num_main_planes == 1 && num_planes == 3) {
break;
case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC:
assert(num_main_planes == 1 && num_planes == 3);
import_aux_info(r[0], r[1]);
map_aux_addresses(screen, r[0], format, 0);
@ -949,18 +954,29 @@ iris_resource_finish_aux_import(struct pipe_screen *pscreen,
r[0]->aux.clear_color_bo = r[2]->aux.clear_color_bo;
r[0]->aux.clear_color_offset = r[2]->aux.clear_color_offset;
r[0]->aux.clear_color_unknown = true;
} else if (num_main_planes == 2 && num_planes == 4) {
import_aux_info(r[0], r[2]);
import_aux_info(r[1], r[3]);
map_aux_addresses(screen, r[0], format, 0);
map_aux_addresses(screen, r[1], format, 1);
} else {
/* Gallium has lowered a single main plane into two. */
assert(num_main_planes == 2 && num_planes == 3);
assert(isl_format_is_yuv(format) && !isl_format_is_planar(format));
import_aux_info(r[0], r[2]);
import_aux_info(r[1], r[2]);
map_aux_addresses(screen, r[0], format, 0);
break;
case I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS:
if (num_main_planes == 1 && num_planes == 2) {
import_aux_info(r[0], r[1]);
map_aux_addresses(screen, r[0], format, 0);
} else if (num_main_planes == 2 && num_planes == 4) {
import_aux_info(r[0], r[2]);
import_aux_info(r[1], r[3]);
map_aux_addresses(screen, r[0], format, 0);
map_aux_addresses(screen, r[1], format, 1);
} else {
/* Gallium has lowered a single main plane into two. */
assert(num_main_planes == 2 && num_planes == 3);
assert(isl_format_is_yuv(format) && !isl_format_is_planar(format));
import_aux_info(r[0], r[2]);
import_aux_info(r[1], r[2]);
map_aux_addresses(screen, r[0], format, 0);
}
assert(!isl_aux_usage_has_fast_clears(res->mod_info->aux_usage));
break;
default:
assert(res->mod_info->aux_usage == ISL_AUX_USAGE_NONE);
break;
}
}