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

anv: Enable fast clears on gen7-8

Browse Source 
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Jason Ekstrand
2016-11-19 08:47:25 -08:00
parent 5e8069a572
commit 3fd79558be
2 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/intel/vulkan/anv_image.c
View File

@@ -195,7 +195,7 @@ make_surface(const struct anv_device *dev,
add_surface(image, &image->aux_surface); add_surface(image, &image->aux_surface);
} }
} else if (aspect == VK_IMAGE_ASPECT_COLOR_BIT && vk_info->samples == 1) { } else if (aspect == VK_IMAGE_ASPECT_COLOR_BIT && vk_info->samples == 1) {
if (dev->info.gen >= 9 && !unlikely(INTEL_DEBUG & DEBUG_NO_RBC)) { if (!unlikely(INTEL_DEBUG & DEBUG_NO_RBC)) {
assert(image->aux_surface.isl.size == 0); assert(image->aux_surface.isl.size == 0);
ok = isl_surf_get_ccs_surf(&dev->isl_dev, &anv_surf->isl, ok = isl_surf_get_ccs_surf(&dev->isl_dev, &anv_surf->isl,
&image->aux_surface.isl); &image->aux_surface.isl);

47
src/intel/vulkan/genX_cmd_buffer.c
View File

@@ -242,6 +242,21 @@ color_attachment_compute_aux_usage(struct anv_device *device,
render_area.extent.height != iview->extent.height) render_area.extent.height != iview->extent.height)
att_state->fast_clear = false; att_state->fast_clear = false;
if (GEN_GEN <= 7) {
/* On gen7, we can't do multi-LOD or multi-layer fast-clears. We
* technically can, but it comes with crazy restrictions that we
* don't want to deal with now.
*/
if (iview->isl.base_level > 0 ||
iview->isl.base_array_layer > 0 ||
iview->isl.array_len > 1)
att_state->fast_clear = false;
}
/* On Broadwell and earlier, we can only handle 0/1 clear colors */
if (GEN_GEN <= 8 && !att_state->clear_color_is_zero_one)
att_state->fast_clear = false;
if (att_state->fast_clear) { if (att_state->fast_clear) {
memcpy(fast_clear_color->u32, att_state->clear_value.color.uint32, memcpy(fast_clear_color->u32, att_state->clear_value.color.uint32,
sizeof(fast_clear_color->u32)); sizeof(fast_clear_color->u32));
@@ -256,18 +271,26 @@ color_attachment_compute_aux_usage(struct anv_device *device,
att_state->input_aux_usage = ISL_AUX_USAGE_CCS_E; att_state->input_aux_usage = ISL_AUX_USAGE_CCS_E;
} else if (att_state->fast_clear) { } else if (att_state->fast_clear) {
att_state->aux_usage = ISL_AUX_USAGE_CCS_D; att_state->aux_usage = ISL_AUX_USAGE_CCS_D;
/* From the Sky Lake PRM, RENDER_SURFACE_STATE::AuxiliarySurfaceMode: if (GEN_GEN >= 9) {
* /* From the Sky Lake PRM, RENDER_SURFACE_STATE::AuxiliarySurfaceMode:
* "If Number of Multisamples is MULTISAMPLECOUNT_1, AUX_CCS_D *
* setting is only allowed if Surface Format supported for Fast * "If Number of Multisamples is MULTISAMPLECOUNT_1, AUX_CCS_D
* Clear. In addition, if the surface is bound to the sampling * setting is only allowed if Surface Format supported for Fast
* engine, Surface Format must be supported for Render Target * Clear. In addition, if the surface is bound to the sampling
* Compression for surfaces bound to the sampling engine." * engine, Surface Format must be supported for Render Target
* * Compression for surfaces bound to the sampling engine."
* In other words, we can't sample from a fast-cleared image if it *
* doesn't also support color compression. * In other words, we can't sample from a fast-cleared image if it
*/ * doesn't also support color compression.
att_state->input_aux_usage = ISL_AUX_USAGE_NONE; */
att_state->input_aux_usage = ISL_AUX_USAGE_NONE;
} else if (GEN_GEN == 8) {
/* Broadwell can sample from fast-cleared images */
att_state->input_aux_usage = ISL_AUX_USAGE_CCS_D;
} else {
/* Ivy Bridge and Haswell cannot */
att_state->input_aux_usage = ISL_AUX_USAGE_NONE;
}
} else { } else {
att_state->aux_usage = ISL_AUX_USAGE_NONE; att_state->aux_usage = ISL_AUX_USAGE_NONE;
att_state->input_aux_usage = ISL_AUX_USAGE_NONE; att_state->input_aux_usage = ISL_AUX_USAGE_NONE;