vulkan: add vk_alloc.h shared allocation inlines.

vulkan allocation allows for overriding the allocator used,
add some macros for anv/radv to share for this.

Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index b7b1e913c9480bd625d06ecbf92b8fe808431229..c5531c82d8a489560e026cfddc52cbcb91433be6 100644 (file)
--- a/src/util/Makefile.sources
+++ b/src/util/Makefile.sources
@@ -37,7 +37,8 @@ MESA_UTIL_FILES :=    \
        u_atomic.h \
        u_endian.h \
        u_vector.c \
-       u_vector.h
+       u_vector.h \
+       vk_alloc.h
 
 MESA_UTIL_GENERATED_FILES = \
        format_srgb.c

diff --git a/src/util/vk_alloc.h b/src/util/vk_alloc.h
new file mode 100644 (file)
index 0000000..a8e21ca
--- /dev/null
+++ b/src/util/vk_alloc.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2015 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+#ifndef VK_ALLOC_H
+#define VK_ALLOC_H
+
+/* common allocation inlines for vulkan drivers */
+
+#include <vulkan/vulkan.h>
+
+static inline void *
+vk_alloc(const VkAllocationCallbacks *alloc,
+         size_t size, size_t align,
+         VkSystemAllocationScope scope)
+{
+   return alloc->pfnAllocation(alloc->pUserData, size, align, scope);
+}
+
+static inline void *
+vk_realloc(const VkAllocationCallbacks *alloc,
+           void *ptr, size_t size, size_t align,
+           VkSystemAllocationScope scope)
+{
+   return alloc->pfnReallocation(alloc->pUserData, ptr, size, align, scope);
+}
+
+static inline void
+vk_free(const VkAllocationCallbacks *alloc, void *data)
+{
+   alloc->pfnFree(alloc->pUserData, data);
+}
+
+static inline void *
+vk_alloc2(const VkAllocationCallbacks *parent_alloc,
+          const VkAllocationCallbacks *alloc,
+          size_t size, size_t align,
+          VkSystemAllocationScope scope)
+{
+   if (alloc)
+      return vk_alloc(alloc, size, align, scope);
+   else
+      return vk_alloc(parent_alloc, size, align, scope);
+}
+
+static inline void
+vk_free2(const VkAllocationCallbacks *parent_alloc,
+         const VkAllocationCallbacks *alloc,
+         void *data)
+{
+   if (alloc)
+      vk_free(alloc, data);
+   else
+      vk_free(parent_alloc, data);
+}
+
+#endif