radv: Add occlusion query shader.
[mesa.git] / src / amd / vulkan / radv_private.h
index cfdda365480147604470cc12b933c45a0619166e..a03c24c24ac50c61eb322aa081cb327d3f6e1719 100644 (file)
@@ -53,6 +53,7 @@
 #include "radv_radeon_winsys.h"
 #include "ac_binary.h"
 #include "ac_nir_to_llvm.h"
+#include "radv_debug.h"
 #include "radv_descriptor_set.h"
 
 #include <llvm-c/TargetMachine.h>
@@ -78,14 +79,29 @@ typedef uint32_t xcb_window_t;
 #define MAX_VIEWPORTS   16
 #define MAX_SCISSORS    16
 #define MAX_PUSH_CONSTANTS_SIZE 128
+#define MAX_PUSH_DESCRIPTORS 32
 #define MAX_DYNAMIC_BUFFERS 16
-#define MAX_IMAGES 8
-#define MAX_SAMPLES_LOG2 4 /* SKL supports 16 samples */
+#define MAX_SAMPLES_LOG2 4
 #define NUM_META_FS_KEYS 11
+#define RADV_MAX_DRM_DEVICES 8
 
 #define NUM_DEPTH_CLEAR_PIPELINES 3
 
-#define radv_noreturn __attribute__((__noreturn__))
+enum radv_mem_heap {
+       RADV_MEM_HEAP_VRAM,
+       RADV_MEM_HEAP_VRAM_CPU_ACCESS,
+       RADV_MEM_HEAP_GTT,
+       RADV_MEM_HEAP_COUNT
+};
+
+enum radv_mem_type {
+       RADV_MEM_TYPE_VRAM,
+       RADV_MEM_TYPE_GTT_WRITE_COMBINE,
+       RADV_MEM_TYPE_VRAM_CPU_ACCESS,
+       RADV_MEM_TYPE_GTT_CACHED,
+       RADV_MEM_TYPE_COUNT
+};
+
 #define radv_printflike(a, b) __attribute__((__format__(__printf__, a, b)))
 
 static inline uint32_t
@@ -173,20 +189,12 @@ radv_clear_mask(uint32_t *inout_mask, uint32_t clear_mask)
             __dword &= ~(1 << (b)))
 
 #define typed_memcpy(dest, src, count) ({                              \
-                       static_assert(sizeof(*src) == sizeof(*dest), ""); \
+                       STATIC_ASSERT(sizeof(*src) == sizeof(*dest)); \
                        memcpy((dest), (src), (count) * sizeof(*(src))); \
                })
 
 #define zero(x) (memset(&(x), 0, sizeof(x)))
 
-/* Define no kernel as 1, since that's an illegal offset for a kernel */
-#define NO_KERNEL 1
-
-struct radv_common {
-       VkStructureType                             sType;
-       const void*                                 pNext;
-};
-
 /* Whenever we generate an error, pass it through this function. Useful for
  * debugging, where we can break on it. Only call at error site, not when
  * propagating errors. Might be useful to plug in a stack trace here.
@@ -211,7 +219,13 @@ void radv_loge_v(const char *format, va_list va);
  * Print a FINISHME message, including its source location.
  */
 #define radv_finishme(format, ...)                                     \
-       __radv_finishme(__FILE__, __LINE__, format, ##__VA_ARGS__);
+       do { \
+               static bool reported = false; \
+               if (!reported) { \
+                       __radv_finishme(__FILE__, __LINE__, format, ##__VA_ARGS__); \
+                       reported = true; \
+               } \
+       } while (0)
 
 /* A non-fatal assert.  Useful for debugging. */
 #ifdef DEBUG
@@ -223,9 +237,6 @@ void radv_loge_v(const char *format, va_list va);
 #define radv_assert(x)
 #endif
 
-void radv_abortf(const char *format, ...) radv_noreturn radv_printflike(1, 2);
-void radv_abortfv(const char *format, va_list va) radv_noreturn;
-
 #define stub_return(v)                                 \
        do {                                            \
                radv_finishme("stub %s", __func__);     \
@@ -238,10 +249,12 @@ void radv_abortfv(const char *format, va_list va) radv_noreturn;
                return;                                 \
        } while (0)
 
-void *radv_resolve_entrypoint(uint32_t index);
 void *radv_lookup_entrypoint(const char *name);
 
-extern struct radv_dispatch_table dtable;
+struct radv_extensions {
+       VkExtensionProperties       *ext_array;
+       uint32_t                    num_ext;
+};
 
 struct radv_physical_device {
        VK_LOADER_DATA                              _loader_data;
@@ -250,15 +263,13 @@ struct radv_physical_device {
 
        struct radeon_winsys *ws;
        struct radeon_info rad_info;
-       uint32_t                                    chipset_id;
        char                                        path[20];
        const char *                                name;
-       uint64_t                                    aperture_size;
-       int                                         cmd_parser_version;
-       uint32_t                    pci_vendor_id;
-       uint32_t                    pci_device_id;
+       uint8_t                                     uuid[VK_UUID_SIZE];
 
+       int local_fd;
        struct wsi_device                       wsi_device;
+       struct radv_extensions                      extensions;
 };
 
 struct radv_instance {
@@ -268,7 +279,9 @@ struct radv_instance {
 
        uint32_t                                    apiVersion;
        int                                         physicalDeviceCount;
-       struct radv_physical_device                  physicalDevice;
+       struct radv_physical_device                 physicalDevices[RADV_MAX_DRM_DEVICES];
+
+       uint64_t debug_flags;
 };
 
 VkResult radv_init_wsi(struct radv_physical_device *physical_device);
@@ -324,11 +337,9 @@ struct radv_meta_state {
                VkRenderPass render_pass[NUM_META_FS_KEYS];
                struct radv_pipeline *color_pipelines[NUM_META_FS_KEYS];
 
-               VkRenderPass depth_only_rp[NUM_DEPTH_CLEAR_PIPELINES];
+               VkRenderPass depthstencil_rp;
                struct radv_pipeline *depth_only_pipeline[NUM_DEPTH_CLEAR_PIPELINES];
-               VkRenderPass stencil_only_rp[NUM_DEPTH_CLEAR_PIPELINES];
                struct radv_pipeline *stencil_only_pipeline[NUM_DEPTH_CLEAR_PIPELINES];
-               VkRenderPass depthstencil_rp[NUM_DEPTH_CLEAR_PIPELINES];
                struct radv_pipeline *depthstencil_pipeline[NUM_DEPTH_CLEAR_PIPELINES];
        } clear[1 + MAX_SAMPLES_LOG2];
 
@@ -382,6 +393,16 @@ struct radv_meta_state {
                VkDescriptorSetLayout                     img_ds_layout;
                VkPipeline pipeline;
        } btoi;
+       struct {
+               VkPipelineLayout                          img_p_layout;
+               VkDescriptorSetLayout                     img_ds_layout;
+               VkPipeline pipeline;
+       } itoi;
+       struct {
+               VkPipelineLayout                          img_p_layout;
+               VkDescriptorSetLayout                     img_ds_layout;
+               VkPipeline pipeline;
+       } cleari;
 
        struct {
                VkPipeline                                pipeline;
@@ -417,14 +438,46 @@ struct radv_meta_state {
                VkPipeline fill_pipeline;
                VkPipeline copy_pipeline;
        } buffer;
+
+       struct {
+               VkDescriptorSetLayout occlusion_query_ds_layout;
+               VkPipelineLayout occlusion_query_p_layout;
+               VkPipeline occlusion_query_pipeline;
+       } query;
 };
 
+/* queue types */
+#define RADV_QUEUE_GENERAL 0
+#define RADV_QUEUE_COMPUTE 1
+#define RADV_QUEUE_TRANSFER 2
+
+#define RADV_MAX_QUEUE_FAMILIES 3
+
+enum ring_type radv_queue_family_to_ring(int f);
+
 struct radv_queue {
        VK_LOADER_DATA                              _loader_data;
-
        struct radv_device *                         device;
-
-       struct radv_state_pool *                     pool;
+       struct radeon_winsys_ctx                    *hw_ctx;
+       int queue_family_index;
+       int queue_idx;
+
+       uint32_t scratch_size;
+       uint32_t compute_scratch_size;
+       uint32_t esgs_ring_size;
+       uint32_t gsvs_ring_size;
+       bool has_tess_rings;
+       bool has_sample_positions;
+
+       struct radeon_winsys_bo *scratch_bo;
+       struct radeon_winsys_bo *descriptor_bo;
+       struct radeon_winsys_bo *compute_scratch_bo;
+       struct radeon_winsys_bo *esgs_ring_bo;
+       struct radeon_winsys_bo *gsvs_ring_bo;
+       struct radeon_winsys_bo *tess_factor_ring_bo;
+       struct radeon_winsys_bo *tess_offchip_ring_bo;
+       struct radeon_winsys_cs *initial_preamble_cs;
+       struct radeon_winsys_cs *continue_preamble_cs;
 };
 
 struct radv_device {
@@ -434,14 +487,22 @@ struct radv_device {
 
        struct radv_instance *                       instance;
        struct radeon_winsys *ws;
-       struct radeon_winsys_ctx *hw_ctx;
 
        struct radv_meta_state                       meta_state;
-       struct radv_queue                            queue;
-       struct radeon_winsys_cs *empty_cs;
 
-       bool allow_fast_clears;
-       bool allow_dcc;
+       struct radv_queue *queues[RADV_MAX_QUEUE_FAMILIES];
+       int queue_count[RADV_MAX_QUEUE_FAMILIES];
+       struct radeon_winsys_cs *empty_cs[RADV_MAX_QUEUE_FAMILIES];
+       struct radeon_winsys_cs *flush_cs[RADV_MAX_QUEUE_FAMILIES];
+
+       uint64_t debug_flags;
+
+       bool llvm_supports_spill;
+       bool has_distributed_tess;
+       uint32_t tess_offchip_block_dw_size;
+       uint32_t scratch_waves;
+
+       uint32_t gs_table_depth;
 
        /* MSAA sample locations.
         * The first index is the sample index.
@@ -451,12 +512,25 @@ struct radv_device {
        float sample_locations_4x[4][2];
        float sample_locations_8x[8][2];
        float sample_locations_16x[16][2];
-};
 
-void radv_device_get_cache_uuid(void *uuid);
+       /* CIK and later */
+       uint32_t gfx_init_size_dw;
+       struct radeon_winsys_bo                      *gfx_init;
+
+       struct radeon_winsys_bo                      *trace_bo;
+       uint32_t                                     *trace_id_ptr;
+
+       struct radv_physical_device                  *physical_device;
+
+       /* Backup in-memory cache to be used if the app doesn't provide one */
+       struct radv_pipeline_cache *                mem_cache;
+};
 
 struct radv_device_memory {
        struct radeon_winsys_bo                      *bo;
+       /* for dedicated allocations */
+       struct radv_image                            *image;
+       struct radv_buffer                           *buffer;
        uint32_t                                     type_index;
        VkDeviceSize                                 map_size;
        void *                                       map;
@@ -470,35 +544,62 @@ struct radv_descriptor_range {
 
 struct radv_descriptor_set {
        const struct radv_descriptor_set_layout *layout;
-       struct list_head descriptor_pool;
        uint32_t size;
 
-       struct radv_buffer_view *buffer_views;
        struct radeon_winsys_bo *bo;
        uint64_t va;
        uint32_t *mapped_ptr;
        struct radv_descriptor_range *dynamic_descriptors;
+
+       struct list_head vram_list;
+
        struct radeon_winsys_bo *descriptors[0];
 };
 
-struct radv_descriptor_pool_free_node {
-       int next;
-       uint32_t offset;
-       uint32_t size;
+struct radv_push_descriptor_set
+{
+       struct radv_descriptor_set set;
+       uint32_t capacity;
 };
 
 struct radv_descriptor_pool {
-       struct list_head descriptor_sets;
-
        struct radeon_winsys_bo *bo;
        uint8_t *mapped_ptr;
        uint64_t current_offset;
        uint64_t size;
 
-       int free_list;
-       int full_list;
-       uint32_t max_sets;
-       struct radv_descriptor_pool_free_node free_nodes[];
+       struct list_head vram_list;
+};
+
+struct radv_descriptor_update_template_entry {
+       VkDescriptorType descriptor_type;
+
+       /* The number of descriptors to update */
+       uint16_t descriptor_count;
+
+       /* Into mapped_ptr or dynamic_descriptors, in units of the respective array */
+       uint16_t dst_offset;
+
+       /* In dwords. Not valid/used for dynamic descriptors */
+       uint16_t dst_stride;
+
+       uint16_t buffer_offset;
+       uint16_t buffer_count;
+
+       /* Only valid for combined image samplers and samplers */
+       uint16_t has_sampler;
+
+       /* In bytes */
+       size_t src_offset;
+       size_t src_stride;
+
+       /* For push descriptors */
+       uint32_t *immutable_samplers;
+};
+
+struct radv_descriptor_update_template {
+       uint32_t entry_count;
+       struct radv_descriptor_update_template_entry entry[0];
 };
 
 struct radv_buffer {
@@ -506,6 +607,7 @@ struct radv_buffer {
        VkDeviceSize                                 size;
 
        VkBufferUsageFlags                           usage;
+       VkBufferCreateFlags                          flags;
 
        /* Set when bound */
        struct radeon_winsys_bo *                      bo;
@@ -538,16 +640,18 @@ enum radv_cmd_flush_bits {
        RADV_CMD_FLAG_INV_VMEM_L1 = 1 << 2,
        /* Used by everything except CB/DB, can be bypassed (SLC=1). Other names: TC L2 */
        RADV_CMD_FLAG_INV_GLOBAL_L2 = 1 << 3,
+       /* Same as above, but only writes back and doesn't invalidate */
+       RADV_CMD_FLAG_WRITEBACK_GLOBAL_L2 = 1 << 4,
        /* Framebuffer caches */
-       RADV_CMD_FLAG_FLUSH_AND_INV_CB_META = 1 << 4,
-       RADV_CMD_FLAG_FLUSH_AND_INV_DB_META = 1 << 5,
-       RADV_CMD_FLAG_FLUSH_AND_INV_DB = 1 << 6,
-       RADV_CMD_FLAG_FLUSH_AND_INV_CB = 1 << 7,
+       RADV_CMD_FLAG_FLUSH_AND_INV_CB_META = 1 << 5,
+       RADV_CMD_FLAG_FLUSH_AND_INV_DB_META = 1 << 6,
+       RADV_CMD_FLAG_FLUSH_AND_INV_DB = 1 << 7,
+       RADV_CMD_FLAG_FLUSH_AND_INV_CB = 1 << 8,
        /* Engine synchronization. */
-       RADV_CMD_FLAG_VS_PARTIAL_FLUSH = 1 << 8,
-       RADV_CMD_FLAG_PS_PARTIAL_FLUSH = 1 << 9,
-       RADV_CMD_FLAG_CS_PARTIAL_FLUSH = 1 << 10,
-       RADV_CMD_FLAG_VGT_FLUSH        = 1 << 11,
+       RADV_CMD_FLAG_VS_PARTIAL_FLUSH = 1 << 9,
+       RADV_CMD_FLAG_PS_PARTIAL_FLUSH = 1 << 10,
+       RADV_CMD_FLAG_CS_PARTIAL_FLUSH = 1 << 11,
+       RADV_CMD_FLAG_VGT_FLUSH        = 1 << 12,
 
        RADV_CMD_FLUSH_AND_INV_FRAMEBUFFER = (RADV_CMD_FLAG_FLUSH_AND_INV_CB |
                                              RADV_CMD_FLAG_FLUSH_AND_INV_CB_META |
@@ -620,8 +724,9 @@ struct radv_attachment_state {
 
 struct radv_cmd_state {
        uint32_t                                      vb_dirty;
-       bool                                          vertex_descriptors_dirty;
        radv_cmd_dirty_mask_t                         dirty;
+       bool                                          vertex_descriptors_dirty;
+       bool                                          push_descriptors_dirty;
 
        struct radv_pipeline *                        pipeline;
        struct radv_pipeline *                        emitted_pipeline;
@@ -642,10 +747,16 @@ struct radv_cmd_state {
        enum radv_cmd_flush_bits                     flush_bits;
        unsigned                                     active_occlusion_queries;
        float                                        offset_scale;
+       uint32_t                                      descriptors_dirty;
+       uint32_t                                      trace_id;
+       uint32_t                                      last_ia_multi_vgt_param;
 };
+
 struct radv_cmd_pool {
        VkAllocationCallbacks                        alloc;
        struct list_head                             cmd_buffers;
+       struct list_head                             free_cmd_buffers;
+       uint32_t queue_family_index;
 };
 
 struct radv_cmd_buffer_upload {
@@ -668,25 +779,52 @@ struct radv_cmd_buffer {
        VkCommandBufferLevel                         level;
        struct radeon_winsys_cs *cs;
        struct radv_cmd_state state;
+       uint32_t queue_family_index;
 
        uint8_t push_constants[MAX_PUSH_CONSTANTS_SIZE];
-       uint32_t dynamic_buffers[16 * MAX_DYNAMIC_BUFFERS];
+       uint32_t dynamic_buffers[4 * MAX_DYNAMIC_BUFFERS];
        VkShaderStageFlags push_constant_stages;
+       struct radv_push_descriptor_set push_descriptors;
 
        struct radv_cmd_buffer_upload upload;
 
        bool record_fail;
+
+       uint32_t scratch_size_needed;
+       uint32_t compute_scratch_size_needed;
+       uint32_t esgs_ring_size_needed;
+       uint32_t gsvs_ring_size_needed;
+       bool tess_rings_needed;
+       bool sample_positions_needed;
+
+       int ring_offsets_idx; /* just used for verification */
 };
 
 struct radv_image;
 
-void si_init_config(struct radv_physical_device *physical_device,
-                   struct radv_cmd_buffer *cmd_buffer);
+bool radv_cmd_buffer_uses_mec(struct radv_cmd_buffer *cmd_buffer);
+
+void si_init_compute(struct radv_cmd_buffer *cmd_buffer);
+void si_init_config(struct radv_cmd_buffer *cmd_buffer);
+
+void cik_create_gfx_config(struct radv_device *device);
+
 void si_write_viewport(struct radeon_winsys_cs *cs, int first_vp,
                       int count, const VkViewport *viewports);
 void si_write_scissors(struct radeon_winsys_cs *cs, int first,
-                      int count, const VkRect2D *scissors);
-uint32_t si_get_ia_multi_vgt_param(struct radv_cmd_buffer *cmd_buffer);
+                      int count, const VkRect2D *scissors,
+                      const VkViewport *viewports, bool can_use_guardband);
+uint32_t si_get_ia_multi_vgt_param(struct radv_cmd_buffer *cmd_buffer,
+                                  bool instanced_draw, bool indirect_draw,
+                                  uint32_t draw_vertex_count);
+void si_cs_emit_cache_flush(struct radeon_winsys_cs *cs,
+                            enum chip_class chip_class,
+                            bool is_mec,
+                            enum radv_cmd_flush_bits flush_bits);
+void si_cs_emit_cache_flush(struct radeon_winsys_cs *cs,
+                            enum chip_class chip_class,
+                            bool is_mec,
+                            enum radv_cmd_flush_bits flush_bits);
 void si_emit_cache_flush(struct radv_cmd_buffer *cmd_buffer);
 void si_cp_dma_buffer_copy(struct radv_cmd_buffer *cmd_buffer,
                           uint64_t src_va, uint64_t dest_va,
@@ -729,7 +867,10 @@ void radv_set_color_clear_regs(struct radv_cmd_buffer *cmd_buffer,
 void radv_fill_buffer(struct radv_cmd_buffer *cmd_buffer,
                      struct radeon_winsys_bo *bo,
                      uint64_t offset, uint64_t size, uint32_t value);
-
+void radv_cmd_buffer_trace_emit(struct radv_cmd_buffer *cmd_buffer);
+bool radv_get_memory_fd(struct radv_device *device,
+                       struct radv_device_memory *memory,
+                       int *pFD);
 /*
  * Takes x,y,z as exact numbers of invocations, instead of blocks.
  *
@@ -763,7 +904,8 @@ radv_hash_shader(unsigned char *hash, struct radv_shader_module *module,
                 const char *entrypoint,
                 const VkSpecializationInfo *spec_info,
                 const struct radv_pipeline_layout *layout,
-                const union ac_shader_variant_key *key);
+                const union ac_shader_variant_key *key,
+                uint32_t is_geom_copy_shader);
 
 static inline gl_shader_stage
 vk_to_mesa_shader_stage(VkShaderStageFlagBits vk_stage)
@@ -794,6 +936,7 @@ struct radv_shader_variant {
        struct ac_shader_variant_info info;
        unsigned rsrc1;
        unsigned rsrc2;
+       uint32_t code_size;
 };
 
 struct radv_depth_stencil_state {
@@ -818,7 +961,6 @@ unsigned radv_format_meta_fs_key(VkFormat format);
 
 struct radv_raster_state {
        uint32_t pa_cl_clip_cntl;
-       uint32_t pa_cl_vs_out_cntl;
        uint32_t spi_interp_control;
        uint32_t pa_su_point_size;
        uint32_t pa_su_point_minmax;
@@ -837,6 +979,23 @@ struct radv_multisample_state {
        unsigned num_samples;
 };
 
+struct radv_prim_vertex_count {
+       uint8_t min;
+       uint8_t incr;
+};
+
+struct radv_tessellation_state {
+       uint32_t ls_hs_config;
+       uint32_t tcs_in_layout;
+       uint32_t tcs_out_layout;
+       uint32_t tcs_out_offsets;
+       uint32_t offchip_layout;
+       unsigned num_patches;
+       unsigned lds_size;
+       unsigned num_tcs_input_cp;
+       uint32_t tf_param;
+};
+
 struct radv_pipeline {
        struct radv_device *                          device;
        uint32_t                                     dynamic_state_mask;
@@ -847,6 +1006,7 @@ struct radv_pipeline {
        bool                                         needs_data_cache;
 
        struct radv_shader_variant *                 shaders[MESA_SHADER_STAGES];
+       struct radv_shader_variant *gs_copy_shader;
        VkShaderStageFlags                           active_stages;
 
        uint32_t va_rsrc_word3[MAX_VERTEX_ATTRIBS];
@@ -862,13 +1022,38 @@ struct radv_pipeline {
                        struct radv_depth_stencil_state ds;
                        struct radv_raster_state raster;
                        struct radv_multisample_state ms;
+                       struct radv_tessellation_state tess;
+                       uint32_t db_shader_control;
+                       uint32_t shader_z_format;
                        unsigned prim;
                        unsigned gs_out;
+                       uint32_t vgt_gs_mode;
                        bool prim_restart_enable;
+                       unsigned esgs_ring_size;
+                       unsigned gsvs_ring_size;
+                       uint32_t ps_input_cntl[32];
+                       uint32_t ps_input_cntl_num;
+                       uint32_t pa_cl_vs_out_cntl;
+                       uint32_t vgt_shader_stages_en;
+                       struct radv_prim_vertex_count prim_vertex_count;
+                       bool can_use_guardband;
                } graphics;
        };
+
+       unsigned max_waves;
+       unsigned scratch_bytes_per_wave;
 };
 
+static inline bool radv_pipeline_has_gs(struct radv_pipeline *pipeline)
+{
+       return pipeline->shaders[MESA_SHADER_GEOMETRY] ? true : false;
+}
+
+static inline bool radv_pipeline_has_tess(struct radv_pipeline *pipeline)
+{
+       return pipeline->shaders[MESA_SHADER_TESS_EVAL] ? true : false;
+}
+
 struct radv_graphics_pipeline_create_info {
        bool use_rectlist;
        bool db_depth_clear;
@@ -933,10 +1118,6 @@ struct radv_cmask_info {
        uint64_t offset;
        uint64_t size;
        unsigned alignment;
-       unsigned pitch;
-       unsigned height;
-       unsigned xalign;
-       unsigned yalign;
        unsigned slice_tile_max;
        unsigned base_address_reg;
 };
@@ -963,22 +1144,24 @@ struct radv_image {
        uint32_t samples; /**< VkImageCreateInfo::samples */
        VkImageUsageFlags usage; /**< Superset of VkImageCreateInfo::usage. */
        VkImageTiling tiling; /** VkImageCreateInfo::tiling */
+       VkImageCreateFlags flags; /** VkImageCreateInfo::flags */
 
        VkDeviceSize size;
        uint32_t alignment;
 
+       bool exclusive;
+       unsigned queue_family_mask;
+
        /* Set when bound */
        struct radeon_winsys_bo *bo;
        VkDeviceSize offset;
        uint32_t dcc_offset;
+       uint32_t htile_offset;
        struct radeon_surf surface;
 
        struct radv_fmask_info fmask;
        struct radv_cmask_info cmask;
        uint32_t clear_value_offset;
-
-       /* Depth buffer compression and fast clear. */
-       struct r600_htile_info htile;
 };
 
 bool radv_layout_has_htile(const struct radv_image *image,
@@ -987,8 +1170,13 @@ bool radv_layout_is_htile_compressed(const struct radv_image *image,
                                      VkImageLayout layout);
 bool radv_layout_can_expclear(const struct radv_image *image,
                               VkImageLayout layout);
-bool radv_layout_has_cmask(const struct radv_image *image,
-                          VkImageLayout layout);
+bool radv_layout_can_fast_clear(const struct radv_image *image,
+                               VkImageLayout layout,
+                               unsigned queue_mask);
+
+
+unsigned radv_image_queue_family_mask(const struct radv_image *image, uint32_t family, uint32_t queue_family);
+
 static inline uint32_t
 radv_get_layerCount(const struct radv_image *image,
                    const VkImageSubresourceRange *range)
@@ -1202,6 +1390,23 @@ radv_temp_descriptor_set_create(struct radv_device *device,
 void
 radv_temp_descriptor_set_destroy(struct radv_device *device,
                                 VkDescriptorSet _set);
+
+void
+radv_update_descriptor_sets(struct radv_device *device,
+                            struct radv_cmd_buffer *cmd_buffer,
+                            VkDescriptorSet overrideSet,
+                            uint32_t descriptorWriteCount,
+                            const VkWriteDescriptorSet *pDescriptorWrites,
+                            uint32_t descriptorCopyCount,
+                            const VkCopyDescriptorSet *pDescriptorCopies);
+
+void
+radv_update_descriptor_set_with_template(struct radv_device *device,
+                                         struct radv_cmd_buffer *cmd_buffer,
+                                         struct radv_descriptor_set *set,
+                                         VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate,
+                                         const void *pData);
+
 void radv_initialise_cmask(struct radv_cmd_buffer *cmd_buffer,
                           struct radv_image *image, uint32_t value);
 void radv_initialize_dcc(struct radv_cmd_buffer *cmd_buffer,
@@ -1213,6 +1418,8 @@ struct radv_fence {
        bool signalled;
 };
 
+struct radeon_winsys_sem;
+
 #define RADV_DEFINE_HANDLE_CASTS(__radv_type, __VkType)                \
                                                                \
        static inline struct __radv_type *                      \
@@ -1256,6 +1463,7 @@ RADV_DEFINE_NONDISP_HANDLE_CASTS(radv_buffer_view, VkBufferView)
 RADV_DEFINE_NONDISP_HANDLE_CASTS(radv_descriptor_pool, VkDescriptorPool)
 RADV_DEFINE_NONDISP_HANDLE_CASTS(radv_descriptor_set, VkDescriptorSet)
 RADV_DEFINE_NONDISP_HANDLE_CASTS(radv_descriptor_set_layout, VkDescriptorSetLayout)
+RADV_DEFINE_NONDISP_HANDLE_CASTS(radv_descriptor_update_template, VkDescriptorUpdateTemplateKHR)
 RADV_DEFINE_NONDISP_HANDLE_CASTS(radv_device_memory, VkDeviceMemory)
 RADV_DEFINE_NONDISP_HANDLE_CASTS(radv_fence, VkFence)
 RADV_DEFINE_NONDISP_HANDLE_CASTS(radv_event, VkEvent)
@@ -1269,21 +1477,6 @@ RADV_DEFINE_NONDISP_HANDLE_CASTS(radv_query_pool, VkQueryPool)
 RADV_DEFINE_NONDISP_HANDLE_CASTS(radv_render_pass, VkRenderPass)
 RADV_DEFINE_NONDISP_HANDLE_CASTS(radv_sampler, VkSampler)
 RADV_DEFINE_NONDISP_HANDLE_CASTS(radv_shader_module, VkShaderModule)
-
-#define RADV_DEFINE_STRUCT_CASTS(__radv_type, __VkType)                        \
-                                                                       \
-       static inline const __VkType *                                  \
-       __radv_type ## _to_ ## __VkType(const struct __radv_type *__radv_obj) \
-       {                                                               \
-               return (const __VkType *) __radv_obj;                   \
-       }
-
-#define RADV_COMMON_TO_STRUCT(__VkType, __vk_name, __common_name)      \
-       const __VkType *__vk_name = radv_common_to_ ## __VkType(__common_name)
-
-RADV_DEFINE_STRUCT_CASTS(radv_common, VkMemoryBarrier)
-RADV_DEFINE_STRUCT_CASTS(radv_common, VkBufferMemoryBarrier)
-RADV_DEFINE_STRUCT_CASTS(radv_common, VkImageMemoryBarrier)
-
+RADV_DEFINE_NONDISP_HANDLE_CASTS(radeon_winsys_sem, VkSemaphore)
 
 #endif /* RADV_PRIVATE_H */