X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2Fvulkan%2Fradv_meta.c;h=56b72d1c99ba32131c7fbbb41a0d46cbdc0150cb;hb=f89d3874fb9744dff2e699ca9414ed9dea4febe7;hp=4a45f083f6993f2101797b604272b6c9f77dc34e;hpb=807f2d4f338f456fdf662546ac4a2ae30172a5c0;p=mesa.git diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c index 4a45f083f69..56b72d1c99b 100644 --- a/src/amd/vulkan/radv_meta.c +++ b/src/amd/vulkan/radv_meta.c @@ -30,14 +30,25 @@ #include #include -static void -radv_meta_save_novertex(struct radv_meta_saved_state *state, - const struct radv_cmd_buffer *cmd_buffer, - uint32_t flags) +void +radv_meta_save(struct radv_meta_saved_state *state, + struct radv_cmd_buffer *cmd_buffer, uint32_t flags) { + VkPipelineBindPoint bind_point = + flags & RADV_META_SAVE_GRAPHICS_PIPELINE ? + VK_PIPELINE_BIND_POINT_GRAPHICS : + VK_PIPELINE_BIND_POINT_COMPUTE; + struct radv_descriptor_state *descriptors_state = + radv_get_descriptors_state(cmd_buffer, bind_point); + + assert(flags & (RADV_META_SAVE_GRAPHICS_PIPELINE | + RADV_META_SAVE_COMPUTE_PIPELINE)); + state->flags = flags; if (state->flags & RADV_META_SAVE_GRAPHICS_PIPELINE) { + assert(!(state->flags & RADV_META_SAVE_COMPUTE_PIPELINE)); + state->old_pipeline = cmd_buffer->state.pipeline; /* Save all viewports. */ @@ -51,22 +62,53 @@ radv_meta_save_novertex(struct radv_meta_saved_state *state, typed_memcpy(state->scissor.scissors, cmd_buffer->state.dynamic.scissor.scissors, MAX_SCISSORS); + + /* The most common meta operations all want to have the + * viewport reset and any scissors disabled. The rest of the + * dynamic state should have no effect. + */ + cmd_buffer->state.dynamic.viewport.count = 0; + cmd_buffer->state.dynamic.scissor.count = 0; + cmd_buffer->state.dirty |= 1 << VK_DYNAMIC_STATE_VIEWPORT | + 1 << VK_DYNAMIC_STATE_SCISSOR; + } + + if (state->flags & RADV_META_SAVE_COMPUTE_PIPELINE) { + assert(!(state->flags & RADV_META_SAVE_GRAPHICS_PIPELINE)); + + state->old_pipeline = cmd_buffer->state.compute_pipeline; } if (state->flags & RADV_META_SAVE_DESCRIPTORS) { - state->old_descriptor_set0 = cmd_buffer->state.descriptors[0]; + if (descriptors_state->valid & (1 << 0)) + state->old_descriptor_set0 = descriptors_state->sets[0]; + else + state->old_descriptor_set0 = NULL; } if (state->flags & RADV_META_SAVE_CONSTANTS) { memcpy(state->push_constants, cmd_buffer->push_constants, MAX_PUSH_CONSTANTS_SIZE); } + + if (state->flags & RADV_META_SAVE_PASS) { + state->pass = cmd_buffer->state.pass; + state->subpass = cmd_buffer->state.subpass; + state->framebuffer = cmd_buffer->state.framebuffer; + state->attachments = cmd_buffer->state.attachments; + state->render_area = cmd_buffer->state.render_area; + } } void radv_meta_restore(const struct radv_meta_saved_state *state, struct radv_cmd_buffer *cmd_buffer) { + VkPipelineBindPoint bind_point = + state->flags & RADV_META_SAVE_GRAPHICS_PIPELINE ? + VK_PIPELINE_BIND_POINT_GRAPHICS : + VK_PIPELINE_BIND_POINT_COMPUTE; + if (state->flags & RADV_META_SAVE_GRAPHICS_PIPELINE) { radv_CmdBindPipeline(radv_cmd_buffer_to_handle(cmd_buffer), VK_PIPELINE_BIND_POINT_GRAPHICS, @@ -90,71 +132,35 @@ radv_meta_restore(const struct radv_meta_saved_state *state, 1 << VK_DYNAMIC_STATE_SCISSOR; } + if (state->flags & RADV_META_SAVE_COMPUTE_PIPELINE) { + radv_CmdBindPipeline(radv_cmd_buffer_to_handle(cmd_buffer), + VK_PIPELINE_BIND_POINT_COMPUTE, + radv_pipeline_to_handle(state->old_pipeline)); + } + if (state->flags & RADV_META_SAVE_DESCRIPTORS) { - cmd_buffer->state.descriptors[0] = state->old_descriptor_set0; - cmd_buffer->state.descriptors_dirty |= (1 << 0); + radv_set_descriptor_set(cmd_buffer, bind_point, + state->old_descriptor_set0, 0); } if (state->flags & RADV_META_SAVE_CONSTANTS) { memcpy(cmd_buffer->push_constants, state->push_constants, MAX_PUSH_CONSTANTS_SIZE); - cmd_buffer->push_constant_stages |= VK_SHADER_STAGE_ALL_GRAPHICS | - VK_SHADER_STAGE_COMPUTE_BIT; - } -} - -void -radv_meta_save_pass(struct radv_meta_saved_pass_state *state, - const struct radv_cmd_buffer *cmd_buffer) -{ - state->pass = cmd_buffer->state.pass; - state->subpass = cmd_buffer->state.subpass; - state->framebuffer = cmd_buffer->state.framebuffer; - state->attachments = cmd_buffer->state.attachments; - state->render_area = cmd_buffer->state.render_area; -} - -void -radv_meta_restore_pass(const struct radv_meta_saved_pass_state *state, - struct radv_cmd_buffer *cmd_buffer) -{ - cmd_buffer->state.pass = state->pass; - cmd_buffer->state.subpass = state->subpass; - cmd_buffer->state.framebuffer = state->framebuffer; - cmd_buffer->state.attachments = state->attachments; - cmd_buffer->state.render_area = state->render_area; - if (state->subpass) - radv_emit_framebuffer_state(cmd_buffer); -} - -void -radv_meta_save_compute(struct radv_meta_saved_compute_state *state, - const struct radv_cmd_buffer *cmd_buffer, - unsigned push_constant_size) -{ - state->old_pipeline = cmd_buffer->state.compute_pipeline; - state->old_descriptor_set0 = cmd_buffer->state.descriptors[0]; - state->push_constant_size = push_constant_size; + cmd_buffer->push_constant_stages |= VK_SHADER_STAGE_COMPUTE_BIT; - if (state->push_constant_size) { - memcpy(state->push_constants, cmd_buffer->push_constants, - state->push_constant_size); + if (state->flags & RADV_META_SAVE_GRAPHICS_PIPELINE) { + cmd_buffer->push_constant_stages |= VK_SHADER_STAGE_ALL_GRAPHICS; + } } -} - -void -radv_meta_restore_compute(const struct radv_meta_saved_compute_state *state, - struct radv_cmd_buffer *cmd_buffer) -{ - radv_CmdBindPipeline(radv_cmd_buffer_to_handle(cmd_buffer), VK_PIPELINE_BIND_POINT_COMPUTE, - radv_pipeline_to_handle(state->old_pipeline)); - cmd_buffer->state.descriptors[0] = state->old_descriptor_set0; - - if (state->push_constant_size) { - memcpy(cmd_buffer->push_constants, state->push_constants, - state->push_constant_size); - cmd_buffer->push_constant_stages |= VK_SHADER_STAGE_COMPUTE_BIT; + if (state->flags & RADV_META_SAVE_PASS) { + cmd_buffer->state.pass = state->pass; + cmd_buffer->state.subpass = state->subpass; + cmd_buffer->state.framebuffer = state->framebuffer; + cmd_buffer->state.attachments = state->attachments; + cmd_buffer->state.render_area = state->render_area; + if (state->subpass) + cmd_buffer->state.dirty |= RADV_CMD_DIRTY_FRAMEBUFFER; } } @@ -386,9 +392,9 @@ fail_resolve_fragment: fail_resolve_compute: radv_device_finish_meta_fast_clear_flush_state(device); fail_fast_clear: - radv_device_finish_meta_buffer_state(device); -fail_query: radv_device_finish_meta_query_state(device); +fail_query: + radv_device_finish_meta_buffer_state(device); fail_buffer: radv_device_finish_meta_depth_decomp_state(device); fail_depth_decomp: @@ -425,23 +431,6 @@ radv_device_finish_meta(struct radv_device *device) radv_pipeline_cache_finish(&device->meta_state.cache); } -/* - * The most common meta operations all want to have the viewport - * reset and any scissors disabled. The rest of the dynamic state - * should have no effect. - */ -void -radv_meta_save_graphics_reset_vport_scissor_novertex(struct radv_meta_saved_state *saved_state, - struct radv_cmd_buffer *cmd_buffer, - uint32_t flags) -{ - radv_meta_save_novertex(saved_state, cmd_buffer, flags); - cmd_buffer->state.dynamic.viewport.count = 0; - cmd_buffer->state.dynamic.scissor.count = 0; - cmd_buffer->state.dirty |= 1 << VK_DYNAMIC_STATE_VIEWPORT | - 1 << VK_DYNAMIC_STATE_SCISSOR; -} - nir_ssa_def *radv_meta_gen_rect_vertices_comp2(nir_builder *vs_b, nir_ssa_def *comp2) { @@ -559,7 +548,7 @@ void radv_meta_build_resolve_shader_core(nir_builder *b, nir_ssa_dest_init(&tex_all_same->instr, &tex_all_same->dest, 1, 32, "tex"); nir_builder_instr_insert(b, &tex_all_same->instr); - nir_ssa_def *all_same = nir_ine(b, &tex_all_same->dest.ssa, nir_imm_int(b, 0)); + nir_ssa_def *all_same = nir_ieq(b, &tex_all_same->dest.ssa, nir_imm_int(b, 0)); nir_if *if_stmt = nir_if_create(b->shader); if_stmt->condition = nir_src_for_ssa(all_same); nir_cf_node_insert(b->cursor, &if_stmt->cf_node);