diff --git a/src/amd/vulkan/meta/radv_meta.h b/src/amd/vulkan/meta/radv_meta.h index e10ddaf734a..f0ce7ecc2ea 100644 --- a/src/amd/vulkan/meta/radv_meta.h +++ b/src/amd/vulkan/meta/radv_meta.h @@ -159,14 +159,10 @@ struct radv_meta_blit2d_rect { uint32_t width, height; }; -void radv_meta_begin_blit2d(struct radv_cmd_buffer *cmd_buffer, struct radv_meta_saved_state *save); - void radv_meta_blit2d(struct radv_cmd_buffer *cmd_buffer, struct radv_meta_blit2d_surf *src_img, struct radv_meta_blit2d_buffer *src_buf, struct radv_meta_blit2d_surf *dst, struct radv_meta_blit2d_rect *rect); -void radv_meta_end_blit2d(struct radv_cmd_buffer *cmd_buffer, struct radv_meta_saved_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, struct radv_meta_blit2d_rect *rect); diff --git a/src/amd/vulkan/nir/radv_meta_nir.c b/src/amd/vulkan/nir/radv_meta_nir.c index 032987b64be..be524e08932 100644 --- a/src/amd/vulkan/nir/radv_meta_nir.c +++ b/src/amd/vulkan/nir/radv_meta_nir.c @@ -95,13 +95,6 @@ radv_meta_nir_build_resolve_shader_core(struct radv_device *device, nir_builder } } -nir_def * -radv_meta_nir_load_descriptor(nir_builder *b, unsigned desc_set, unsigned binding) -{ - nir_def *rsrc = nir_vulkan_resource_index(b, 3, 32, nir_imm_int(b, 0), .desc_set = desc_set, .binding = binding); - return nir_trim_vector(b, rsrc, 2); -} - nir_def * radv_meta_nir_get_global_ids(nir_builder *b, unsigned num_components) { diff --git a/src/amd/vulkan/nir/radv_meta_nir.h b/src/amd/vulkan/nir/radv_meta_nir.h index 892a579f081..d4141336620 100644 --- a/src/amd/vulkan/nir/radv_meta_nir.h +++ b/src/amd/vulkan/nir/radv_meta_nir.h @@ -50,7 +50,6 @@ nir_shader *radv_meta_nir_build_cleari_r32g32b32_compute_shader(struct radv_devi typedef nir_def *(*radv_meta_nir_texel_fetch_build_func)(struct nir_builder *, struct radv_device *, nir_def *, bool, bool); -nir_def *radv_meta_nir_load_descriptor(nir_builder *b, unsigned desc_set, unsigned binding); nir_def *radv_meta_nir_build_blit2d_texel_fetch(struct nir_builder *b, struct radv_device *device, nir_def *tex_pos, bool is_3d, bool is_multisampled); nir_def *radv_meta_nir_build_blit2d_buffer_fetch(struct nir_builder *b, struct radv_device *device, nir_def *tex_pos,