From: Dave Airlie <airl...@redhat.com>

This just moves some calcs from the emission to the binding.

Probably won't affect much, just reduced some time spent in binding
---
 src/amd/vulkan/radv_cmd_buffer.c | 11 ++++++-----
 src/amd/vulkan/radv_private.h    |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 60f19fb12b7..6d1af3c0aec 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -1876,10 +1876,9 @@ radv_cmd_buffer_update_vertex_descriptors(struct 
radv_cmd_buffer *cmd_buffer, bo
                        struct radv_buffer *buffer = 
cmd_buffer->vertex_bindings[vb].buffer;
                        uint32_t stride = 
cmd_buffer->state.pipeline->binding_stride[vb];
 
-                       va = radv_buffer_get_va(buffer->bo);
-
+                       va = cmd_buffer->vertex_bindings[vb].va;
                        offset = cmd_buffer->vertex_bindings[vb].offset + 
velems->offset[i];
-                       va += offset + buffer->offset;
+                       va += velems->offset[i];
                        desc[0] = va;
                        desc[1] = S_008F04_BASE_ADDRESS_HI(va >> 32) | 
S_008F04_STRIDE(stride);
                        if 
(cmd_buffer->device->physical_device->rad_info.chip_class <= CIK && stride)
@@ -2374,15 +2373,17 @@ void radv_CmdBindVertexBuffers(
        assert(firstBinding + bindingCount <= MAX_VBS);
        for (uint32_t i = 0; i < bindingCount; i++) {
                uint32_t idx = firstBinding + i;
+               struct radv_buffer *buffer = 
radv_buffer_from_handle(pBuffers[i]);
 
                if (!changed &&
-                   (vb[idx].buffer != radv_buffer_from_handle(pBuffers[i]) ||
+                   (vb[idx].buffer != buffer ||
                     vb[idx].offset != pOffsets[i])) {
                        changed = true;
                }
 
-               vb[idx].buffer = radv_buffer_from_handle(pBuffers[i]);
+               vb[idx].buffer = buffer;
                vb[idx].offset = pOffsets[i];
+               vb[idx].va = radv_buffer_get_va(buffer->bo) + buffer->offset + 
pOffsets[i];
 
                radv_cs_add_buffer(cmd_buffer->device->ws, cmd_buffer->cs,
                                   vb[idx].buffer->bo, 8);
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 77f8cbc8358..30732182b9f 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -794,6 +794,7 @@ enum radv_cmd_flush_bits {
 struct radv_vertex_binding {
        struct radv_buffer *                          buffer;
        VkDeviceSize                                 offset;
+       uint64_t va;
 };
 
 struct radv_viewport_state {
-- 
2.14.3

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to