radv/wsi: Compute correct row_pitch for GFX9.

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

diff --git a/src/amd/vulkan/radv_meta_buffer.c b/src/amd/vulkan/radv_meta_buffer.c
index cb13f2f288f1cb118c0e8ea4bd328f5a91c4ebf4..a8a41e05fa359533a1809740a04bc074c77fb9bc 100644 (file)
--- a/src/amd/vulkan/radv_meta_buffer.c
+++ b/src/amd/vulkan/radv_meta_buffer.c
@@ -10,17 +10,17 @@ build_buffer_fill_shader(struct radv_device *dev)
        nir_builder b;
 
        nir_builder_init_simple_shader(&b, NULL, MESA_SHADER_COMPUTE, NULL);
-       b.shader->info->name = ralloc_strdup(b.shader, "meta_buffer_fill");
-       b.shader->info->cs.local_size[0] = 64;
-       b.shader->info->cs.local_size[1] = 1;
-       b.shader->info->cs.local_size[2] = 1;
+       b.shader->info.name = ralloc_strdup(b.shader, "meta_buffer_fill");
+       b.shader->info.cs.local_size[0] = 64;
+       b.shader->info.cs.local_size[1] = 1;
+       b.shader->info.cs.local_size[2] = 1;
 
        nir_ssa_def *invoc_id = nir_load_system_value(&b, nir_intrinsic_load_local_invocation_id, 0);
        nir_ssa_def *wg_id = nir_load_system_value(&b, nir_intrinsic_load_work_group_id, 0);
        nir_ssa_def *block_size = nir_imm_ivec4(&b,
-                                               b.shader->info->cs.local_size[0],
-                                               b.shader->info->cs.local_size[1],
-                                               b.shader->info->cs.local_size[2], 0);
+                                               b.shader->info.cs.local_size[0],
+                                               b.shader->info.cs.local_size[1],
+                                               b.shader->info.cs.local_size[2], 0);
 
        nir_ssa_def *global_id = nir_iadd(&b, nir_imul(&b, wg_id, block_size), invoc_id);
 
@@ -36,6 +36,8 @@ build_buffer_fill_shader(struct radv_device *dev)
        nir_builder_instr_insert(&b, &dst_buf->instr);
 
        nir_intrinsic_instr *load = nir_intrinsic_instr_create(b.shader, nir_intrinsic_load_push_constant);
+       nir_intrinsic_set_base(load, 0);
+       nir_intrinsic_set_range(load, 4);
        load->src[0] = nir_src_for_ssa(nir_imm_int(&b, 0));
        load->num_components = 1;
        nir_ssa_dest_init(&load->instr, &load->dest, 1, 32, "fill_value");
@@ -60,17 +62,17 @@ build_buffer_copy_shader(struct radv_device *dev)
        nir_builder b;
 
        nir_builder_init_simple_shader(&b, NULL, MESA_SHADER_COMPUTE, NULL);
-       b.shader->info->name = ralloc_strdup(b.shader, "meta_buffer_copy");
-       b.shader->info->cs.local_size[0] = 64;
-       b.shader->info->cs.local_size[1] = 1;
-       b.shader->info->cs.local_size[2] = 1;
+       b.shader->info.name = ralloc_strdup(b.shader, "meta_buffer_copy");
+       b.shader->info.cs.local_size[0] = 64;
+       b.shader->info.cs.local_size[1] = 1;
+       b.shader->info.cs.local_size[2] = 1;
 
        nir_ssa_def *invoc_id = nir_load_system_value(&b, nir_intrinsic_load_local_invocation_id, 0);
        nir_ssa_def *wg_id = nir_load_system_value(&b, nir_intrinsic_load_work_group_id, 0);
        nir_ssa_def *block_size = nir_imm_ivec4(&b,
-                                               b.shader->info->cs.local_size[0],
-                                               b.shader->info->cs.local_size[1],
-                                               b.shader->info->cs.local_size[2], 0);
+                                               b.shader->info.cs.local_size[0],
+                                               b.shader->info.cs.local_size[1],
+                                               b.shader->info.cs.local_size[2], 0);
 
        nir_ssa_def *global_id = nir_iadd(&b, nir_imul(&b, wg_id, block_size), invoc_id);
 
@@ -126,6 +128,7 @@ VkResult radv_device_init_meta_buffer_state(struct radv_device *device)
 
        VkDescriptorSetLayoutCreateInfo fill_ds_create_info = {
                .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
+               .flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR,
                .bindingCount = 1,
                .pBindings = (VkDescriptorSetLayoutBinding[]) {
                        {
@@ -147,6 +150,7 @@ VkResult radv_device_init_meta_buffer_state(struct radv_device *device)
 
        VkDescriptorSetLayoutCreateInfo copy_ds_create_info = {
                .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
+               .flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR,
                .bindingCount = 2,
                .pBindings = (VkDescriptorSetLayoutBinding[]) {
                        {
@@ -297,46 +301,37 @@ static void fill_buffer_shader(struct radv_cmd_buffer *cmd_buffer,
        struct radv_device *device = cmd_buffer->device;
        uint64_t block_count = round_up_u64(size, 1024);
        struct radv_meta_saved_compute_state saved_state;
-       VkDescriptorSet ds;
 
        radv_meta_save_compute(&saved_state, cmd_buffer, 4);
 
-       radv_temp_descriptor_set_create(device, cmd_buffer,
-                                       device->meta_state.buffer.fill_ds_layout,
-                                       &ds);
-
        struct radv_buffer dst_buffer = {
                .bo = bo,
                .offset = offset,
                .size = size
        };
 
-       radv_UpdateDescriptorSets(radv_device_to_handle(device),
-                                 1, /* writeCount */
-                                 (VkWriteDescriptorSet[]) {
-                                         {
-                                                 .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
-                                                 .dstSet = ds,
-                                                 .dstBinding = 0,
-                                                 .dstArrayElement = 0,
-                                                 .descriptorCount = 1,
-                                                 .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
-                                                 .pBufferInfo = &(VkDescriptorBufferInfo) {
-                                                       .buffer = radv_buffer_to_handle(&dst_buffer),
-                                                       .offset = 0,
-                                                       .range = size
-                                                 }
-                                         }
-                                 }, 0, NULL);
-
        radv_CmdBindPipeline(radv_cmd_buffer_to_handle(cmd_buffer),
                             VK_PIPELINE_BIND_POINT_COMPUTE,
                             device->meta_state.buffer.fill_pipeline);
 
-       radv_CmdBindDescriptorSets(radv_cmd_buffer_to_handle(cmd_buffer),
-                                  VK_PIPELINE_BIND_POINT_COMPUTE,
-                                  device->meta_state.buffer.fill_p_layout, 0, 1,
-                                  &ds, 0, NULL);
+       radv_meta_push_descriptor_set(cmd_buffer, VK_PIPELINE_BIND_POINT_COMPUTE,
+                                     device->meta_state.buffer.fill_p_layout,
+                                     0, /* set */
+                                     1, /* descriptorWriteCount */
+                                     (VkWriteDescriptorSet[]) {
+                                             {
+                                                     .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
+                                                     .dstBinding = 0,
+                                                     .dstArrayElement = 0,
+                                                     .descriptorCount = 1,
+                                                     .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+                                                     .pBufferInfo = &(VkDescriptorBufferInfo) {
+                                                             .buffer = radv_buffer_to_handle(&dst_buffer),
+                                                             .offset = 0,
+                                                             .range = size
+                                                     }
+                                             }
+                                     });
 
        radv_CmdPushConstants(radv_cmd_buffer_to_handle(cmd_buffer),
                              device->meta_state.buffer.fill_p_layout,
@@ -345,8 +340,6 @@ static void fill_buffer_shader(struct radv_cmd_buffer *cmd_buffer,
 
        radv_CmdDispatch(radv_cmd_buffer_to_handle(cmd_buffer), block_count, 1, 1);
 
-       radv_temp_descriptor_set_destroy(device, ds);
-
        radv_meta_restore_compute(&saved_state, cmd_buffer, 4);
 }
 
@@ -359,14 +352,9 @@ static void copy_buffer_shader(struct radv_cmd_buffer *cmd_buffer,
        struct radv_device *device = cmd_buffer->device;
        uint64_t block_count = round_up_u64(size, 1024);
        struct radv_meta_saved_compute_state saved_state;
-       VkDescriptorSet ds;
 
        radv_meta_save_compute(&saved_state, cmd_buffer, 0);
 
-       radv_temp_descriptor_set_create(device, cmd_buffer,
-                                       device->meta_state.buffer.copy_ds_layout,
-                                       &ds);
-
        struct radv_buffer dst_buffer = {
                .bo = dst_bo,
                .offset = dst_offset,
@@ -379,51 +367,43 @@ static void copy_buffer_shader(struct radv_cmd_buffer *cmd_buffer,
                .size = size
        };
 
-       radv_UpdateDescriptorSets(radv_device_to_handle(device),
-                                 2, /* writeCount */
-                                 (VkWriteDescriptorSet[]) {
-                                         {
-                                                 .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
-                                                 .dstSet = ds,
-                                                 .dstBinding = 0,
-                                                 .dstArrayElement = 0,
-                                                 .descriptorCount = 1,
-                                                 .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
-                                                 .pBufferInfo = &(VkDescriptorBufferInfo) {
-                                                       .buffer = radv_buffer_to_handle(&dst_buffer),
-                                                       .offset = 0,
-                                                       .range = size
-                                                 }
-                                         },
-                                         {
-                                                 .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
-                                                 .dstSet = ds,
-                                                 .dstBinding = 1,
-                                                 .dstArrayElement = 0,
-                                                 .descriptorCount = 1,
-                                                 .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
-                                                 .pBufferInfo = &(VkDescriptorBufferInfo) {
-                                                       .buffer = radv_buffer_to_handle(&src_buffer),
-                                                       .offset = 0,
-                                                       .range = size
-                                                 }
-                                         }
-                                 }, 0, NULL);
-
        radv_CmdBindPipeline(radv_cmd_buffer_to_handle(cmd_buffer),
                             VK_PIPELINE_BIND_POINT_COMPUTE,
                             device->meta_state.buffer.copy_pipeline);
 
-       radv_CmdBindDescriptorSets(radv_cmd_buffer_to_handle(cmd_buffer),
-                                  VK_PIPELINE_BIND_POINT_COMPUTE,
-                                  device->meta_state.buffer.copy_p_layout, 0, 1,
-                                  &ds, 0, NULL);
-
+       radv_meta_push_descriptor_set(cmd_buffer, VK_PIPELINE_BIND_POINT_COMPUTE,
+                                     device->meta_state.buffer.copy_p_layout,
+                                     0, /* set */
+                                     2, /* descriptorWriteCount */
+                                     (VkWriteDescriptorSet[]) {
+                                             {
+                                                     .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
+                                                     .dstBinding = 0,
+                                                     .dstArrayElement = 0,
+                                                     .descriptorCount = 1,
+                                                     .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+                                                     .pBufferInfo = &(VkDescriptorBufferInfo) {
+                                                             .buffer = radv_buffer_to_handle(&dst_buffer),
+                                                             .offset = 0,
+                                                             .range = size
+                                                     }
+                                             },
+                                             {
+                                                     .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
+                                                     .dstBinding = 1,
+                                                     .dstArrayElement = 0,
+                                                     .descriptorCount = 1,
+                                                     .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+                                                     .pBufferInfo = &(VkDescriptorBufferInfo) {
+                                                             .buffer = radv_buffer_to_handle(&src_buffer),
+                                                             .offset = 0,
+                                                             .range = size
+                                                     }
+                                             }
+                                     });
 
        radv_CmdDispatch(radv_cmd_buffer_to_handle(cmd_buffer), block_count, 1, 1);
 
-       radv_temp_descriptor_set_destroy(device, ds);
-
        radv_meta_restore_compute(&saved_state, cmd_buffer, 0);
 }