commit 464c15b1ae11d2f11e0d62fb9f9f1ef6146e9765
author John Bauman <jbauman@google.com> Wed Jan 18 19:09:38 2023 +0000
committer John Bauman <jbauman@google.com> Wed Jan 18 19:25:42 2023 +0000
tree 074d68a3dc925a879ccba9d310127e1da06e0234
parent c1089ed8a50c2f3dd05e6297834505c490d5f7d1

Remove magma_buffer_constraints_add_additional usage

magma_buffer_format_additional_constraints_t has been merged into
magma_buffer_format_constraints_t.

Change-Id: I1739229f1fa6f820740b2ff293331951fa3b3ffe
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/mesa/+/790973
Reviewed-by: Craig Stout <cstout@google.com>

src/intel/vulkan/anv_magma_buffer_collection.c

diff --git a/src/intel/vulkan/anv_magma_buffer_collection.c b/src/intel/vulkan/anv_magma_buffer_collection.c
index fdff873..1bb82f8 100644
--- a/src/intel/vulkan/anv_magma_buffer_collection.c
+++ b/src/intel/vulkan/anv_magma_buffer_collection.c
@@ -256,31 +256,21 @@
        .secure_required = false,
        .ram_domain_supported = true,
        .cpu_domain_supported = true,
-       .min_size_bytes = pConstraints->createInfo.size};
+       .min_size_bytes = pConstraints->createInfo.size,
+       .options = MAGMA_BUFFER_FORMAT_CONSTRAINT_OPTIONS_EXTRA_COUNTS,
+       .min_buffer_count_for_camping =
+           pConstraints->bufferCollectionConstraints.minBufferCountForCamping,
+       .min_buffer_count_for_shared_slack =
+           pConstraints->bufferCollectionConstraints.minBufferCountForSharedSlack,
+       .min_buffer_count_for_dedicated_slack =
+           pConstraints->bufferCollectionConstraints.minBufferCountForDedicatedSlack,
+       .max_buffer_count = pConstraints->bufferCollectionConstraints.maxBufferCount};
 
    magma_sysmem_buffer_constraints_t constraints;
    status = magma_buffer_constraints_create(sysmem_connection, &format_constraints, &constraints);
    if (status != MAGMA_STATUS_OK)
       return VK_ERROR_OUT_OF_HOST_MEMORY;
 
-   // Add additional constraints.
-   {
-      magma_buffer_format_additional_constraints_t additional = {
-          .min_buffer_count_for_camping =
-              pConstraints->bufferCollectionConstraints.minBufferCountForCamping,
-          .min_buffer_count_for_shared_slack =
-              pConstraints->bufferCollectionConstraints.minBufferCountForSharedSlack,
-          .min_buffer_count_for_dedicated_slack =
-              pConstraints->bufferCollectionConstraints.minBufferCountForDedicatedSlack,
-          .max_buffer_count = pConstraints->bufferCollectionConstraints.maxBufferCount};
-
-      status = magma_buffer_constraints_add_additional(sysmem_connection, constraints, &additional);
-      if (status != MAGMA_STATUS_OK) {
-         magma_buffer_constraints_release(sysmem_connection, constraints);
-         return ANV_MAGMA_DRET(VK_ERROR_OUT_OF_HOST_MEMORY);
-      }
-   }
-
    status = magma_buffer_collection_set_constraints(
        sysmem_connection, buffer_collection->buffer_collection, constraints);