radv: use proper maximum slice for layered view

[mesa.git] / src / amd / vulkan / radv_meta_blit2d.c

diff --git a/src/amd/vulkan/radv_meta_blit2d.c b/src/amd/vulkan/radv_meta_blit2d.c
index 52e142f687b876c2763dfffd7386c8bd6a6ef955..6b622e782815c96d9f2108fb2a85acd03b156cb3 100644 (file)
--- a/src/amd/vulkan/radv_meta_blit2d.c
+++ b/src/amd/vulkan/radv_meta_blit2d.c
@@ -112,7 +112,6 @@ static void
 blit2d_bind_src(struct radv_cmd_buffer *cmd_buffer,
                 struct radv_meta_blit2d_surf *src_img,
                 struct radv_meta_blit2d_buffer *src_buf,
-                struct radv_meta_blit2d_rect *rect,
                 struct blit2d_src_temps *tmp,
                 enum blit2d_src_type src_type, VkFormat depth_format)
 {
@@ -164,7 +163,7 @@ blit2d_bind_src(struct radv_cmd_buffer *cmd_buffer,
                                                                  .descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
                                                                  .pImageInfo = (VkDescriptorImageInfo[]) {
                                                                  {
-                                                                         .sampler = NULL,
+                                                                         .sampler = VK_NULL_HANDLE,
                                                                          .imageView = radv_image_view_to_handle(&tmp->iview),
                                                                          .imageLayout = VK_IMAGE_LAYOUT_GENERAL,
                                                                  },
@@ -287,7 +286,7 @@ radv_meta_blit2d_normal_dst(struct radv_cmd_buffer *cmd_buffer,
                if (dst->aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT)
                        depth_format = dst->image->vk_format;
                struct blit2d_src_temps src_temps;
-               blit2d_bind_src(cmd_buffer, src_img, src_buf, &rects[r], &src_temps, src_type, depth_format);
+               blit2d_bind_src(cmd_buffer, src_img, src_buf, &src_temps, src_type, depth_format);
 
                uint32_t offset = 0;
                struct blit2d_dst_temps dst_temps;
@@ -439,7 +438,7 @@ build_nir_vertex_shader(void)
        nir_builder b;
 
        nir_builder_init_simple_shader(&b, NULL, MESA_SHADER_VERTEX, NULL);
-       b.shader->info.name = ralloc_strdup(b.shader, "meta_blit_vs");
+       b.shader->info->name = ralloc_strdup(b.shader, "meta_blit_vs");
 
        nir_variable *pos_in = nir_variable_create(b.shader, nir_var_shader_in,
                                                   vec4, "a_pos");
@@ -574,7 +573,7 @@ build_nir_copy_fragment_shader(struct radv_device *device,
        nir_builder b;
 
        nir_builder_init_simple_shader(&b, NULL, MESA_SHADER_FRAGMENT, NULL);
-       b.shader->info.name = ralloc_strdup(b.shader, name);
+       b.shader->info->name = ralloc_strdup(b.shader, name);
 
        nir_variable *tex_pos_in = nir_variable_create(b.shader, nir_var_shader_in,
                                                       vec2, "v_tex_pos");
@@ -603,7 +602,7 @@ build_nir_copy_fragment_shader_depth(struct radv_device *device,
        nir_builder b;
 
        nir_builder_init_simple_shader(&b, NULL, MESA_SHADER_FRAGMENT, NULL);
-       b.shader->info.name = ralloc_strdup(b.shader, name);
+       b.shader->info->name = ralloc_strdup(b.shader, name);
 
        nir_variable *tex_pos_in = nir_variable_create(b.shader, nir_var_shader_in,
                                                       vec2, "v_tex_pos");
@@ -632,7 +631,7 @@ build_nir_copy_fragment_shader_stencil(struct radv_device *device,
        nir_builder b;
 
        nir_builder_init_simple_shader(&b, NULL, MESA_SHADER_FRAGMENT, NULL);
-       b.shader->info.name = ralloc_strdup(b.shader, name);
+       b.shader->info->name = ralloc_strdup(b.shader, name);
 
        nir_variable *tex_pos_in = nir_variable_create(b.shader, nir_var_shader_in,
                                                       vec2, "v_tex_pos");