From 18642987fdd4dd69ce64852228afa022cedfd1e1 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Thu, 15 Jul 2021 08:23:42 +0200 Subject: [PATCH] v3dv: remove more dead clearing code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We forgot to remove the v3dvx code for the clearing code fallbacks we removed after we implemented layered clears. Fixes: 5ba7f64b45 ('v3dv: remove fallback path for vkCmdClearAttachments') Reviewed-by: Alejandro Piñeiro Part-of: --- src/broadcom/vulkan/v3dvx_meta_clear.c | 375 ------------------------- src/broadcom/vulkan/v3dvx_private.h | 10 +- 2 files changed, 1 insertion(+), 384 deletions(-) diff --git a/src/broadcom/vulkan/v3dvx_meta_clear.c b/src/broadcom/vulkan/v3dvx_meta_clear.c index 01940896f59..305ccb0aaaf 100644 --- a/src/broadcom/vulkan/v3dvx_meta_clear.c +++ b/src/broadcom/vulkan/v3dvx_meta_clear.c @@ -26,378 +26,3 @@ #include "broadcom/cle/v3dx_pack.h" #include "broadcom/compiler/v3d_compiler.h" -static void -emit_tlb_clear_store(struct v3dv_cmd_buffer *cmd_buffer, - struct v3dv_cl *cl, - uint32_t attachment_idx, - uint32_t layer, - uint32_t buffer) -{ - const struct v3dv_image_view *iview = - cmd_buffer->state.framebuffer->attachments[attachment_idx]; - const struct v3dv_image *image = iview->image; - const struct v3d_resource_slice *slice = &image->slices[iview->base_level]; - uint32_t layer_offset = v3dv_layer_offset(image, - iview->base_level, - iview->first_layer + layer); - - cl_emit(cl, STORE_TILE_BUFFER_GENERAL, store) { - store.buffer_to_store = buffer; - store.address = v3dv_cl_address(image->mem->bo, layer_offset); - store.clear_buffer_being_stored = false; - - store.output_image_format = iview->format->rt_type; - store.r_b_swap = iview->swap_rb; - store.memory_format = slice->tiling; - - if (slice->tiling == V3D_TILING_UIF_NO_XOR || - slice->tiling == V3D_TILING_UIF_XOR) { - store.height_in_ub_or_stride = - slice->padded_height_of_output_image_in_uif_blocks; - } else if (slice->tiling == V3D_TILING_RASTER) { - store.height_in_ub_or_stride = slice->stride; - } - - if (image->samples > VK_SAMPLE_COUNT_1_BIT) - store.decimate_mode = V3D_DECIMATE_MODE_ALL_SAMPLES; - else - store.decimate_mode = V3D_DECIMATE_MODE_SAMPLE_0; - } -} - -static void -emit_tlb_clear_stores(struct v3dv_cmd_buffer *cmd_buffer, - struct v3dv_cl *cl, - uint32_t attachment_count, - const VkClearAttachment *attachments, - uint32_t layer) -{ - struct v3dv_cmd_buffer_state *state = &cmd_buffer->state; - const struct v3dv_subpass *subpass = - &state->pass->subpasses[state->subpass_idx]; - - bool has_stores = false; - for (uint32_t i = 0; i < attachment_count; i++) { - uint32_t attachment_idx; - uint32_t buffer; - if (attachments[i].aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | - VK_IMAGE_ASPECT_STENCIL_BIT)) { - attachment_idx = subpass->ds_attachment.attachment; - buffer = v3dX(zs_buffer_from_aspect_bits)(attachments[i].aspectMask); - } else { - uint32_t rt_idx = attachments[i].colorAttachment; - attachment_idx = subpass->color_attachments[rt_idx].attachment; - buffer = RENDER_TARGET_0 + rt_idx; - } - - if (attachment_idx == VK_ATTACHMENT_UNUSED) - continue; - - has_stores = true; - emit_tlb_clear_store(cmd_buffer, cl, attachment_idx, layer, buffer); - } - - if (!has_stores) { - cl_emit(cl, STORE_TILE_BUFFER_GENERAL, store) { - store.buffer_to_store = NONE; - } - } -} - -static void -emit_tlb_clear_per_tile_rcl(struct v3dv_cmd_buffer *cmd_buffer, - uint32_t attachment_count, - const VkClearAttachment *attachments, - uint32_t layer) -{ - struct v3dv_job *job = cmd_buffer->state.job; - assert(job); - - struct v3dv_cl *cl = &job->indirect; - v3dv_cl_ensure_space(cl, 200, 1); - v3dv_return_if_oom(cmd_buffer, NULL); - - struct v3dv_cl_reloc tile_list_start = v3dv_cl_get_address(cl); - - cl_emit(cl, TILE_COORDINATES_IMPLICIT, coords); - - cl_emit(cl, END_OF_LOADS, end); /* Nothing to load */ - - cl_emit(cl, PRIM_LIST_FORMAT, fmt) { - fmt.primitive_type = LIST_TRIANGLES; - } - - cl_emit(cl, BRANCH_TO_IMPLICIT_TILE_LIST, branch); - - emit_tlb_clear_stores(cmd_buffer, cl, attachment_count, attachments, layer); - - cl_emit(cl, END_OF_TILE_MARKER, end); - - cl_emit(cl, RETURN_FROM_SUB_LIST, ret); - - cl_emit(&job->rcl, START_ADDRESS_OF_GENERIC_TILE_LIST, branch) { - branch.start = tile_list_start; - branch.end = v3dv_cl_get_address(cl); - } -} - -static void -emit_tlb_clear_layer_rcl(struct v3dv_cmd_buffer *cmd_buffer, - uint32_t attachment_count, - const VkClearAttachment *attachments, - uint32_t layer) -{ - const struct v3dv_cmd_buffer_state *state = &cmd_buffer->state; - const struct v3dv_framebuffer *framebuffer = state->framebuffer; - - struct v3dv_job *job = cmd_buffer->state.job; - struct v3dv_cl *rcl = &job->rcl; - - const struct v3dv_frame_tiling *tiling = &job->frame_tiling; - - const uint32_t tile_alloc_offset = - 64 * layer * tiling->draw_tiles_x * tiling->draw_tiles_y; - cl_emit(rcl, MULTICORE_RENDERING_TILE_LIST_SET_BASE, list) { - list.address = v3dv_cl_address(job->tile_alloc, tile_alloc_offset); - } - - cl_emit(rcl, MULTICORE_RENDERING_SUPERTILE_CFG, config) { - config.number_of_bin_tile_lists = 1; - config.total_frame_width_in_tiles = tiling->draw_tiles_x; - config.total_frame_height_in_tiles = tiling->draw_tiles_y; - - config.supertile_width_in_tiles = tiling->supertile_width; - config.supertile_height_in_tiles = tiling->supertile_height; - - config.total_frame_width_in_supertiles = - tiling->frame_width_in_supertiles; - config.total_frame_height_in_supertiles = - tiling->frame_height_in_supertiles; - } - - /* Emit the clear and also the workaround for GFXH-1742 */ - for (int i = 0; i < 2; i++) { - cl_emit(rcl, TILE_COORDINATES, coords); - cl_emit(rcl, END_OF_LOADS, end); - cl_emit(rcl, STORE_TILE_BUFFER_GENERAL, store) { - store.buffer_to_store = NONE; - } - if (i == 0) { - cl_emit(rcl, CLEAR_TILE_BUFFERS, clear) { - clear.clear_z_stencil_buffer = true; - clear.clear_all_render_targets = true; - } - } - cl_emit(rcl, END_OF_TILE_MARKER, end); - } - - cl_emit(rcl, FLUSH_VCD_CACHE, flush); - - emit_tlb_clear_per_tile_rcl(cmd_buffer, attachment_count, attachments, layer); - - uint32_t supertile_w_in_pixels = - tiling->tile_width * tiling->supertile_width; - uint32_t supertile_h_in_pixels = - tiling->tile_height * tiling->supertile_height; - - const uint32_t max_render_x = framebuffer->width - 1; - const uint32_t max_render_y = framebuffer->height - 1; - const uint32_t max_x_supertile = max_render_x / supertile_w_in_pixels; - const uint32_t max_y_supertile = max_render_y / supertile_h_in_pixels; - - for (int y = 0; y <= max_y_supertile; y++) { - for (int x = 0; x <= max_x_supertile; x++) { - cl_emit(rcl, SUPERTILE_COORDINATES, coords) { - coords.column_number_in_supertiles = x; - coords.row_number_in_supertiles = y; - } - } - } -} - -static void -emit_tlb_clear_job(struct v3dv_cmd_buffer *cmd_buffer, - uint32_t attachment_count, - const VkClearAttachment *attachments, - uint32_t base_layer, - uint32_t layer_count) -{ - const struct v3dv_cmd_buffer_state *state = &cmd_buffer->state; - const struct v3dv_framebuffer *framebuffer = state->framebuffer; - const struct v3dv_subpass *subpass = - &state->pass->subpasses[state->subpass_idx]; - struct v3dv_job *job = cmd_buffer->state.job; - assert(job); - - /* Check how many color attachments we have and also if we have a - * depth/stencil attachment. - */ - uint32_t color_attachment_count = 0; - VkClearAttachment color_attachments[4]; - const VkClearDepthStencilValue *ds_clear_value = NULL; - uint8_t internal_depth_type = V3D_INTERNAL_TYPE_DEPTH_32F; - for (uint32_t i = 0; i < attachment_count; i++) { - if (attachments[i].aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | - VK_IMAGE_ASPECT_STENCIL_BIT)) { - assert(subpass->ds_attachment.attachment != VK_ATTACHMENT_UNUSED); - ds_clear_value = &attachments[i].clearValue.depthStencil; - struct v3dv_render_pass_attachment *att = - &state->pass->attachments[subpass->ds_attachment.attachment]; - internal_depth_type = v3dX(get_internal_depth_type)(att->desc.format); - } else if (attachments[i].aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) { - color_attachments[color_attachment_count++] = attachments[i]; - } - } - - uint8_t internal_bpp; - bool msaa; - v3dX(framebuffer_compute_internal_bpp_msaa)(framebuffer, subpass, - &internal_bpp, &msaa); - - v3dv_job_start_frame(job, - framebuffer->width, - framebuffer->height, - framebuffer->layers, - color_attachment_count, - internal_bpp, msaa); - - struct v3dv_cl *rcl = &job->rcl; - v3dv_cl_ensure_space_with_branch(rcl, 200 + - layer_count * 256 * - cl_packet_length(SUPERTILE_COORDINATES)); - v3dv_return_if_oom(cmd_buffer, NULL); - - const struct v3dv_frame_tiling *tiling = &job->frame_tiling; - cl_emit(rcl, TILE_RENDERING_MODE_CFG_COMMON, config) { - config.early_z_disable = true; - config.image_width_pixels = framebuffer->width; - config.image_height_pixels = framebuffer->height; - config.number_of_render_targets = MAX2(color_attachment_count, 1); - config.multisample_mode_4x = false; /* FIXME */ - config.maximum_bpp_of_all_render_targets = tiling->internal_bpp; - config.internal_depth_type = internal_depth_type; - } - - for (uint32_t i = 0; i < color_attachment_count; i++) { - uint32_t rt_idx = color_attachments[i].colorAttachment; - uint32_t attachment_idx = subpass->color_attachments[rt_idx].attachment; - if (attachment_idx == VK_ATTACHMENT_UNUSED) - continue; - - const struct v3dv_render_pass_attachment *attachment = - &state->pass->attachments[attachment_idx]; - - uint32_t internal_type, internal_bpp, internal_size; - const struct v3dv_format *format = - v3dX(get_format)(attachment->desc.format); - v3dX(get_internal_type_bpp_for_output_format)(format->rt_type, &internal_type, - &internal_bpp); - internal_size = 4 << internal_bpp; - - uint32_t clear_color[4] = { 0 }; - v3dX(get_hw_clear_color)(&color_attachments[i].clearValue.color, - internal_type, internal_size, clear_color); - - struct v3dv_image_view *iview = framebuffer->attachments[attachment_idx]; - const struct v3dv_image *image = iview->image; - const struct v3d_resource_slice *slice = &image->slices[iview->base_level]; - - uint32_t clear_pad = 0; - if (slice->tiling == V3D_TILING_UIF_NO_XOR || - slice->tiling == V3D_TILING_UIF_XOR) { - int uif_block_height = v3d_utile_height(image->cpp) * 2; - - uint32_t implicit_padded_height = - align(framebuffer->height, uif_block_height) / uif_block_height; - - if (slice->padded_height_of_output_image_in_uif_blocks - - implicit_padded_height >= 15) { - clear_pad = slice->padded_height_of_output_image_in_uif_blocks; - } - } - - cl_emit(rcl, TILE_RENDERING_MODE_CFG_CLEAR_COLORS_PART1, clear) { - clear.clear_color_low_32_bits = clear_color[0]; - clear.clear_color_next_24_bits = clear_color[1] & 0xffffff; - clear.render_target_number = i; - }; - - if (iview->internal_bpp >= V3D_INTERNAL_BPP_64) { - cl_emit(rcl, TILE_RENDERING_MODE_CFG_CLEAR_COLORS_PART2, clear) { - clear.clear_color_mid_low_32_bits = - ((clear_color[1] >> 24) | (clear_color[2] << 8)); - clear.clear_color_mid_high_24_bits = - ((clear_color[2] >> 24) | ((clear_color[3] & 0xffff) << 8)); - clear.render_target_number = i; - }; - } - - if (iview->internal_bpp >= V3D_INTERNAL_BPP_128 || clear_pad) { - cl_emit(rcl, TILE_RENDERING_MODE_CFG_CLEAR_COLORS_PART3, clear) { - clear.uif_padded_height_in_uif_blocks = clear_pad; - clear.clear_color_high_16_bits = clear_color[3] >> 16; - clear.render_target_number = i; - }; - } - } - - cl_emit(rcl, TILE_RENDERING_MODE_CFG_COLOR, rt) { - v3dX(cmd_buffer_render_pass_setup_render_target) - (cmd_buffer, 0, &rt.render_target_0_internal_bpp, - &rt.render_target_0_internal_type, &rt.render_target_0_clamp); - v3dX(cmd_buffer_render_pass_setup_render_target) - (cmd_buffer, 1, &rt.render_target_1_internal_bpp, - &rt.render_target_1_internal_type, &rt.render_target_1_clamp); - v3dX(cmd_buffer_render_pass_setup_render_target) - (cmd_buffer, 2, &rt.render_target_2_internal_bpp, - &rt.render_target_2_internal_type, &rt.render_target_2_clamp); - v3dX(cmd_buffer_render_pass_setup_render_target) - (cmd_buffer, 3, &rt.render_target_3_internal_bpp, - &rt.render_target_3_internal_type, &rt.render_target_3_clamp); - } - - cl_emit(rcl, TILE_RENDERING_MODE_CFG_ZS_CLEAR_VALUES, clear) { - clear.z_clear_value = ds_clear_value ? ds_clear_value->depth : 1.0f; - clear.stencil_clear_value = ds_clear_value ? ds_clear_value->stencil : 0; - }; - - cl_emit(rcl, TILE_LIST_INITIAL_BLOCK_SIZE, init) { - init.use_auto_chained_tile_lists = true; - init.size_of_first_block_in_chained_tile_lists = - TILE_ALLOCATION_BLOCK_SIZE_64B; - } - - for (int layer = base_layer; layer < base_layer + layer_count; layer++) { - emit_tlb_clear_layer_rcl(cmd_buffer, - attachment_count, - attachments, - layer); - } - - cl_emit(rcl, END_OF_RENDERING, end); -} - -void -v3dX(cmd_buffer_emit_tlb_clear)(struct v3dv_cmd_buffer *cmd_buffer, - uint32_t attachment_count, - const VkClearAttachment *attachments, - uint32_t base_layer, - uint32_t layer_count) -{ - struct v3dv_job *job = - v3dv_cmd_buffer_start_job(cmd_buffer, cmd_buffer->state.subpass_idx, - V3DV_JOB_TYPE_GPU_CL); - - if (!job) - return; - - /* vkCmdClearAttachments runs inside a render pass */ - job->is_subpass_continue = true; - - emit_tlb_clear_job(cmd_buffer, - attachment_count, - attachments, - base_layer, layer_count); - - v3dv_cmd_buffer_subpass_resume(cmd_buffer, cmd_buffer->state.subpass_idx); -} diff --git a/src/broadcom/vulkan/v3dvx_private.h b/src/broadcom/vulkan/v3dvx_private.h index d01f0479f3f..7c73b4de8b8 100644 --- a/src/broadcom/vulkan/v3dvx_private.h +++ b/src/broadcom/vulkan/v3dvx_private.h @@ -170,13 +170,7 @@ void v3dX(pack_texture_shader_state_from_buffer_view)(struct v3dv_device *device, struct v3dv_buffer_view *buffer_view); -/* Used at v3dv_meta_clear */ -void -v3dX(cmd_buffer_emit_tlb_clear)(struct v3dv_cmd_buffer *cmd_buffer, - uint32_t attachment_count, - const VkClearAttachment *attachments, - uint32_t base_layer, - uint32_t layer_count); +/* Used at v3dv_meta_copy */ uint32_t v3dX(zs_buffer_from_aspect_bits)(VkImageAspectFlags aspects); @@ -184,8 +178,6 @@ v3dX(zs_buffer_from_aspect_bits)(VkImageAspectFlags aspects); uint8_t v3dX(get_internal_depth_type)(VkFormat format); - -/* Used at v3dv_meta_copy */ struct framebuffer_data; void