commit b9f6c516c05d05733a967bdfda8be61fb2d2727e
author Craig Stout <cstout@google.com> Thu Aug 13 09:52:33 2020 -0700
committer Craig Stout <cstout@google.com> Fri Aug 14 17:30:31 2020 +0000
tree 3b85ad1cd330cd763b196c597752f163d8b94a52
parent cebbe4e59ba368382bc54858c8b27b038ce8d88e

Adapt to updated magma_system_command_buffer

Change-Id: If7cedced1c5ac50df175f45bb98c4e6913c60245
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/mesa/+/416756
Reviewed-by: John Bauman <jbauman@google.com>

src/intel/vulkan/anv_magma_connection.cc

diff --git a/src/intel/vulkan/anv_magma_connection.cc b/src/intel/vulkan/anv_magma_connection.cc
index 31bc20f..43d7a94 100644
--- a/src/intel/vulkan/anv_magma_connection.cc
+++ b/src/intel/vulkan/anv_magma_connection.cc
@@ -252,9 +252,14 @@
    }
 
    magma_system_command_buffer command_buffer = {
+#ifdef MAGMA_TEMP_USE_RESOURCE_COUNT
+       .resource_count = execbuf->buffer_count,
+#endif
        .batch_buffer_resource_index = execbuf->buffer_count - 1, // by drm convention
        .batch_start_offset = execbuf->batch_start_offset,
+#ifndef MAGMA_TEMP_USE_RESOURCE_COUNT
        .num_resources = execbuf->buffer_count,
+#endif
        .wait_semaphore_count = wait_semaphore_count,
        .signal_semaphore_count =
            static_cast<uint32_t>(semaphore_ids.size()) - wait_semaphore_count};