[magma] Use renamed interfaces
Bug:108279
Change-Id: Ibff4114f61c801824d1b883889d5d5d9c3937735
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/mesa/+/816692
Reviewed-by: John Bauman <jbauman@google.com>
diff --git a/src/gbm/backends/magma/gbm_magma.c b/src/gbm/backends/magma/gbm_magma.c
index abc41f7..05ff49d 100644
--- a/src/gbm/backends/magma/gbm_magma.c
+++ b/src/gbm/backends/magma/gbm_magma.c
@@ -126,7 +126,7 @@
magma_buffer_t image;
uint64_t size;
magma_buffer_id_t buffer_id;
- magma_status_t status = magma_virt_connection_create_image2(
+ magma_status_t status = magma_virt_connection_create_image(
magma_device(device)->connection, &create_info, &size, &image, &buffer_id);
if (status != MAGMA_STATUS_OK) {
LOG_VERBOSE("magma_virt_create_image failed: %d", status);
@@ -203,7 +203,7 @@
magma_buffer_t image;
uint64_t size;
magma_buffer_id_t buffer_id;
- magma_status_t status = magma_connection_import_buffer2(
+ magma_status_t status = magma_connection_import_buffer(
magma_device(device)->connection, import_data.fds[0], &size, &image, &buffer_id);
if (status != MAGMA_STATUS_OK) {
LOG_VERBOSE("magma_import failed: %d", status);
diff --git a/src/intel/vulkan/anv_magma.c b/src/intel/vulkan/anv_magma.c
index 0f6757a..042ffd5 100644
--- a/src/intel/vulkan/anv_magma.c
+++ b/src/intel/vulkan/anv_magma.c
@@ -111,10 +111,10 @@
magma_buffer_t buffer;
uint64_t magma_size = size;
magma_buffer_id_t buffer_id;
- magma_status_t status = magma_connection_create_buffer2(magma_connection(device), magma_size,
- &magma_size, &buffer, &buffer_id);
+ magma_status_t status = magma_connection_create_buffer(magma_connection(device), magma_size,
+ &magma_size, &buffer, &buffer_id);
if (status != MAGMA_STATUS_OK) {
- mesa_logd("magma_create_buffer failed (%d) size 0x%" PRIx64, status, magma_size);
+ mesa_logd("magma_connection_create_buffer failed (%d) size 0x%" PRIx64, status, magma_size);
return 0;
}
@@ -364,8 +364,8 @@
magma_buffer_t buffer;
uint64_t size;
magma_buffer_id_t buffer_id;
- magma_status_t result = magma_connection_import_buffer2(magma_connection(device), handle, &size,
- &buffer, &buffer_id);
+ magma_status_t result = magma_connection_import_buffer(magma_connection(device), handle, &size,
+ &buffer, &buffer_id);
assert(result == MAGMA_STATUS_OK);
struct anv_connection* connection = get_anv_connection(device->vk.magma_connection);
@@ -391,10 +391,10 @@
magma_buffer_t buffer;
uint64_t size;
magma_buffer_id_t buffer_id;
- magma_status_t status = magma_connection_import_buffer2(magma_connection(device), handle, &size,
- &buffer, &buffer_id);
+ magma_status_t status = magma_connection_import_buffer(magma_connection(device), handle, &size,
+ &buffer, &buffer_id);
if (status != MAGMA_STATUS_OK) {
- mesa_logd("magma_import failed: %d", status);
+ mesa_logd("magma_connection_import_buffer failed: %d", status);
return -EINVAL;
}
@@ -521,10 +521,10 @@
magma_buffer_t image;
uint64_t size;
magma_buffer_id_t buffer_id;
- magma_status_t status = magma_virt_connection_create_image2(magma_connection(device), &info,
- &size, &image, &buffer_id);
+ magma_status_t status = magma_virt_connection_create_image(magma_connection(device), &info,
+ &size, &image, &buffer_id);
if (status != MAGMA_STATUS_OK) {
- mesa_logd("magma_virt_create_image failed (%d)", status);
+ mesa_logd("magma_virt_connection_create_image failed (%d)", status);
return 0;
}
diff --git a/src/util/tests/magma_wait/test_magma_wait.cpp b/src/util/tests/magma_wait/test_magma_wait.cpp
index 05aa8e1..b4d29f1 100644
--- a/src/util/tests/magma_wait/test_magma_wait.cpp
+++ b/src/util/tests/magma_wait/test_magma_wait.cpp
@@ -91,7 +91,7 @@
for (uint32_t i = 0; i < kSemaphoreCount; i++) {
magma_semaphore_id_t id;
- ASSERT_EQ(MAGMA_STATUS_OK, magma_connection_create_semaphore2(connection_, &semaphores[i], &id));
+ ASSERT_EQ(MAGMA_STATUS_OK, magma_connection_create_semaphore(connection_, &semaphores[i], &id));
}
auto start = gettime_ns();
diff --git a/src/vulkan/runtime/vk_magma_syncobj.c b/src/vulkan/runtime/vk_magma_syncobj.c
index 2135f46..4462f69 100644
--- a/src/vulkan/runtime/vk_magma_syncobj.c
+++ b/src/vulkan/runtime/vk_magma_syncobj.c
@@ -51,11 +51,11 @@
magma_status_t status;
if (initial_value && initial_value != 1) {
assert((initial_value >> 32) == 0);
- status = magma_connection_import_semaphore2(
+ status = magma_connection_import_semaphore(
device->magma_connection->connection,
(uint32_t)initial_value, &sobj->semaphore, &sobj->id);
} else {
- status = magma_connection_create_semaphore2(
+ status = magma_connection_create_semaphore(
device->magma_connection->connection, &sobj->semaphore, &sobj->id);
}
@@ -163,12 +163,12 @@
magma_semaphore_t semaphore;
magma_semaphore_id_t id;
- magma_status_t status = magma_connection_import_semaphore2(
+ magma_status_t status = magma_connection_import_semaphore(
device->magma_connection->connection, handle, &semaphore, &id);
if (status != MAGMA_STATUS_OK) {
return vk_errorf(device, VK_ERROR_UNKNOWN,
- "magma_import_semaphore failed: %m");
+ "magma_connection_import_semaphore failed: %m");
}
magma_connection_release_semaphore(device->magma_connection->connection,
