X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2Fvulkan%2Fradv_meta.h;h=5880064ff30ed307db72ec0d1725b98fb42f6d75;hb=203f60ebf2f64dab3dc77ce9c098a6ae3d2aca43;hp=12b873ff7cadf540cc4d4dd7853d8cb4fad972a2;hpb=2408f616e80f4b5dc022a1ed650778c312f15997;p=mesa.git diff --git a/src/amd/vulkan/radv_meta.h b/src/amd/vulkan/radv_meta.h index 12b873ff7ca..5880064ff30 100644 --- a/src/amd/vulkan/radv_meta.h +++ b/src/amd/vulkan/radv_meta.h @@ -27,27 +27,32 @@ #define RADV_META_H #include "radv_private.h" +#include "radv_shader.h" #ifdef __cplusplus extern "C" { #endif -#define RADV_META_VERTEX_BINDING_COUNT 2 +enum radv_meta_save_flags { + RADV_META_SAVE_PASS = (1 << 0), + RADV_META_SAVE_CONSTANTS = (1 << 1), + RADV_META_SAVE_DESCRIPTORS = (1 << 2), + RADV_META_SAVE_GRAPHICS_PIPELINE = (1 << 3), + RADV_META_SAVE_COMPUTE_PIPELINE = (1 << 4), + RADV_META_SAVE_SAMPLE_LOCATIONS = (1 << 5), +}; struct radv_meta_saved_state { - /** - * Bitmask of (1 << VK_DYNAMIC_STATE_*). Defines the set of saved dynamic - * state. - */ - uint32_t dynamic_mask; - struct radv_dynamic_state dynamic; + uint32_t flags; + struct radv_descriptor_set *old_descriptor_set0; struct radv_pipeline *old_pipeline; + struct radv_viewport_state viewport; + struct radv_scissor_state scissor; + struct radv_sample_locations_state sample_location; char push_constants[128]; -}; -struct radv_meta_saved_pass_state { struct radv_render_pass *pass; const struct radv_subpass *subpass; struct radv_attachment_state *attachments; @@ -55,59 +60,44 @@ struct radv_meta_saved_pass_state { VkRect2D render_area; }; -struct radv_meta_saved_compute_state { - struct radv_descriptor_set *old_descriptor_set0; - struct radv_pipeline *old_pipeline; - - char push_constants[128]; -}; - -VkResult radv_device_init_meta_clear_state(struct radv_device *device); +VkResult radv_device_init_meta_clear_state(struct radv_device *device, bool on_demand); void radv_device_finish_meta_clear_state(struct radv_device *device); -VkResult radv_device_init_meta_resolve_state(struct radv_device *device); +VkResult radv_device_init_meta_resolve_state(struct radv_device *device, bool on_demand); void radv_device_finish_meta_resolve_state(struct radv_device *device); -VkResult radv_device_init_meta_depth_decomp_state(struct radv_device *device); +VkResult radv_device_init_meta_depth_decomp_state(struct radv_device *device, bool on_demand); void radv_device_finish_meta_depth_decomp_state(struct radv_device *device); -VkResult radv_device_init_meta_fast_clear_flush_state(struct radv_device *device); +VkResult radv_device_init_meta_fast_clear_flush_state(struct radv_device *device, bool on_demand); void radv_device_finish_meta_fast_clear_flush_state(struct radv_device *device); -VkResult radv_device_init_meta_blit_state(struct radv_device *device); +VkResult radv_device_init_meta_blit_state(struct radv_device *device, bool on_demand); void radv_device_finish_meta_blit_state(struct radv_device *device); -VkResult radv_device_init_meta_blit2d_state(struct radv_device *device); +VkResult radv_device_init_meta_blit2d_state(struct radv_device *device, bool on_demand); void radv_device_finish_meta_blit2d_state(struct radv_device *device); VkResult radv_device_init_meta_buffer_state(struct radv_device *device); void radv_device_finish_meta_buffer_state(struct radv_device *device); -VkResult radv_device_init_meta_query_state(struct radv_device *device); +VkResult radv_device_init_meta_query_state(struct radv_device *device, bool on_demand); void radv_device_finish_meta_query_state(struct radv_device *device); -VkResult radv_device_init_meta_resolve_compute_state(struct radv_device *device); +VkResult radv_device_init_meta_resolve_compute_state(struct radv_device *device, bool on_demand); void radv_device_finish_meta_resolve_compute_state(struct radv_device *device); -VkResult radv_device_init_meta_resolve_fragment_state(struct radv_device *device); +VkResult radv_device_init_meta_resolve_fragment_state(struct radv_device *device, bool on_demand); void radv_device_finish_meta_resolve_fragment_state(struct radv_device *device); -void radv_meta_restore(const struct radv_meta_saved_state *state, - struct radv_cmd_buffer *cmd_buffer); +VkResult radv_device_init_meta_fmask_expand_state(struct radv_device *device); +void radv_device_finish_meta_fmask_expand_state(struct radv_device *device); -void radv_meta_save_pass(struct radv_meta_saved_pass_state *state, - const struct radv_cmd_buffer *cmd_buffer); +void radv_meta_save(struct radv_meta_saved_state *saved_state, + struct radv_cmd_buffer *cmd_buffer, uint32_t flags); -void radv_meta_restore_pass(const struct radv_meta_saved_pass_state *state, - struct radv_cmd_buffer *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); - -void radv_meta_restore_compute(const struct radv_meta_saved_compute_state *state, - struct radv_cmd_buffer *cmd_buffer, - unsigned push_constant_size); +void radv_meta_restore(const struct radv_meta_saved_state *state, + struct radv_cmd_buffer *cmd_buffer); VkImageViewType radv_meta_get_view_type(const struct radv_image *image); @@ -124,6 +114,7 @@ struct radv_meta_blit2d_surf { unsigned level; unsigned layer; VkImageAspectFlags aspect_mask; + VkImageLayout current_layout; }; struct radv_meta_blit2d_buffer { @@ -156,18 +147,6 @@ void radv_meta_end_blit2d(struct radv_cmd_buffer *cmd_buffer, VkResult radv_device_init_meta_bufimage_state(struct radv_device *device); void radv_device_finish_meta_bufimage_state(struct radv_device *device); -void radv_meta_begin_bufimage(struct radv_cmd_buffer *cmd_buffer, - struct radv_meta_saved_compute_state *save); -void radv_meta_end_bufimage(struct radv_cmd_buffer *cmd_buffer, - struct radv_meta_saved_compute_state *save); -void radv_meta_begin_itoi(struct radv_cmd_buffer *cmd_buffer, - struct radv_meta_saved_compute_state *save); -void radv_meta_end_itoi(struct radv_cmd_buffer *cmd_buffer, - struct radv_meta_saved_compute_state *save); -void radv_meta_begin_cleari(struct radv_cmd_buffer *cmd_buffer, - struct radv_meta_saved_compute_state *save); -void radv_meta_end_cleari(struct radv_cmd_buffer *cmd_buffer, - struct radv_meta_saved_compute_state *save); void radv_meta_image_to_buffer(struct radv_cmd_buffer *cmd_buffer, struct radv_meta_blit2d_surf *src, struct radv_meta_blit2d_buffer *dst, @@ -190,21 +169,28 @@ void radv_meta_clear_image_cs(struct radv_cmd_buffer *cmd_buffer, void radv_decompress_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer, struct radv_image *image, - VkImageSubresourceRange *subresourceRange); + VkImageSubresourceRange *subresourceRange, + struct radv_sample_locations_state *sample_locs); void radv_resummarize_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer, struct radv_image *image, - VkImageSubresourceRange *subresourceRange); + VkImageSubresourceRange *subresourceRange, + struct radv_sample_locations_state *sample_locs); void radv_fast_clear_flush_image_inplace(struct radv_cmd_buffer *cmd_buffer, struct radv_image *image, const VkImageSubresourceRange *subresourceRange); - -void radv_meta_save_graphics_reset_vport_scissor_novertex(struct radv_meta_saved_state *saved_state, - struct radv_cmd_buffer *cmd_buffer); +void radv_decompress_dcc(struct radv_cmd_buffer *cmd_buffer, + struct radv_image *image, + const VkImageSubresourceRange *subresourceRange); +void radv_expand_fmask_image_inplace(struct radv_cmd_buffer *cmd_buffer, + struct radv_image *image, + const VkImageSubresourceRange *subresourceRange); void radv_meta_resolve_compute_image(struct radv_cmd_buffer *cmd_buffer, struct radv_image *src_image, + VkFormat src_format, VkImageLayout src_image_layout, struct radv_image *dest_image, + VkFormat dest_format, VkImageLayout dest_image_layout, uint32_t region_count, const VkImageResolve *regions); @@ -217,9 +203,53 @@ void radv_meta_resolve_fragment_image(struct radv_cmd_buffer *cmd_buffer, uint32_t region_count, const VkImageResolve *regions); -void radv_blit_to_prime_linear(struct radv_cmd_buffer *cmd_buffer, - struct radv_image *image, - struct radv_image *linear_image); +void radv_decompress_resolve_subpass_src(struct radv_cmd_buffer *cmd_buffer); + +void radv_decompress_resolve_src(struct radv_cmd_buffer *cmd_buffer, + struct radv_image *src_image, + VkImageLayout src_image_layout, + uint32_t region_count, + const VkImageResolve *regions); + +uint32_t radv_clear_cmask(struct radv_cmd_buffer *cmd_buffer, + struct radv_image *image, uint32_t value); +uint32_t radv_clear_fmask(struct radv_cmd_buffer *cmd_buffer, + struct radv_image *image, uint32_t value); +uint32_t radv_clear_dcc(struct radv_cmd_buffer *cmd_buffer, + struct radv_image *image, + const VkImageSubresourceRange *range, uint32_t value); +uint32_t radv_dcc_clear_level(struct radv_cmd_buffer *cmd_buffer, + const struct radv_image *image, + uint32_t level, uint32_t value); +uint32_t radv_clear_htile(struct radv_cmd_buffer *cmd_buffer, + struct radv_image *image, + const VkImageSubresourceRange *range, uint32_t value); + +/** + * Return whether the bound pipeline is the FMASK decompress pass. + */ +static inline bool +radv_is_fmask_decompress_pipeline(struct radv_cmd_buffer *cmd_buffer) +{ + struct radv_meta_state *meta_state = &cmd_buffer->device->meta_state; + struct radv_pipeline *pipeline = cmd_buffer->state.pipeline; + + return radv_pipeline_to_handle(pipeline) == + meta_state->fast_clear_flush.fmask_decompress_pipeline; +} + +/** + * Return whether the bound pipeline is the DCC decompress pass. + */ +static inline bool +radv_is_dcc_decompress_pipeline(struct radv_cmd_buffer *cmd_buffer) +{ + struct radv_meta_state *meta_state = &cmd_buffer->device->meta_state; + struct radv_pipeline *pipeline = cmd_buffer->state.pipeline; + + return radv_pipeline_to_handle(pipeline) == + meta_state->fast_clear_flush.dcc_decompress_pipeline; +} /* common nir builder helpers */ #include "nir/nir_builder.h"