radv: initialize the per-queue descriptor BO only once

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

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 0bb2dcdcc203d988ff17fb9f94273c90e61a8660..c2de61c935d1bd26b7a3ea5c8d31db4248385b9d 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -2456,6 +2456,29 @@ radv_get_preamble_cs(struct radv_queue *queue,
        } else
                descriptor_bo = queue->descriptor_bo;
 
+       if (descriptor_bo != queue->descriptor_bo) {
+               uint32_t *map = (uint32_t*)queue->device->ws->buffer_map(descriptor_bo);
+
+               if (scratch_bo) {
+                       uint64_t scratch_va = radv_buffer_get_va(scratch_bo);
+                       uint32_t rsrc1 = S_008F04_BASE_ADDRESS_HI(scratch_va >> 32) |
+                                        S_008F04_SWIZZLE_ENABLE(1);
+                       map[0] = scratch_va;
+                       map[1] = rsrc1;
+               }
+
+               if (esgs_ring_bo || gsvs_ring_bo || tess_rings_bo || add_sample_positions)
+                       fill_geom_tess_rings(queue, map, add_sample_positions,
+                                            esgs_ring_size, esgs_ring_bo,
+                                            gsvs_ring_size, gsvs_ring_bo,
+                                            tess_factor_ring_size,
+                                            tess_offchip_ring_offset,
+                                            tess_offchip_ring_size,
+                                            tess_rings_bo);
+
+               queue->device->ws->buffer_unmap(descriptor_bo);
+       }
+
        for(int i = 0; i < 3; ++i) {
                struct radeon_cmdbuf *cs = NULL;
                cs = queue->device->ws->cs_create(queue->device->ws,
@@ -2480,30 +2503,6 @@ radv_get_preamble_cs(struct radv_queue *queue,
                        break;
                }
 
-               if (descriptor_bo != queue->descriptor_bo) {
-                       uint32_t *map = (uint32_t*)queue->device->ws->buffer_map(descriptor_bo);
-
-                       if (scratch_bo) {
-                               uint64_t scratch_va = radv_buffer_get_va(scratch_bo);
-                               uint32_t rsrc1 = S_008F04_BASE_ADDRESS_HI(scratch_va >> 32) |
-                                                S_008F04_SWIZZLE_ENABLE(1);
-                               map[0] = scratch_va;
-                               map[1] = rsrc1;
-                       }
-
-                       if (esgs_ring_bo || gsvs_ring_bo || tess_rings_bo ||
-                           add_sample_positions)
-                               fill_geom_tess_rings(queue, map, add_sample_positions,
-                                                    esgs_ring_size, esgs_ring_bo,
-                                                    gsvs_ring_size, gsvs_ring_bo,
-                                                    tess_factor_ring_size,
-                                                    tess_offchip_ring_offset,
-                                                    tess_offchip_ring_size,
-                                                    tess_rings_bo);
-
-                       queue->device->ws->buffer_unmap(descriptor_bo);
-               }
-
                if (esgs_ring_bo || gsvs_ring_bo || tess_rings_bo)  {
                        radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
                        radeon_emit(cs, EVENT_TYPE(V_028A90_VS_PARTIAL_FLUSH) | EVENT_INDEX(4));