wsi: Basic memory allocation functions

In vulkan, users can give custom host memory allocation functions. In order
to handle this specification correctly, we should be able to know allocator
of an ICD object. (such as VkInstance, VkDevice, ...) To achieve this, ICD
can provide access functions for the allocator or WSI should track
creation/destruction of required vulkan objects. At this time, we simply
ignore user provided allocator and just use standard system allocation
functions from libc.

Change-Id: Ic75050e2a3f8ebc71737b7f83b87aaff451d0b2d

diff --git a/src/wsi/Makefile.am b/src/wsi/Makefile.am
index 11afee0..aca54b5 100644 (file)
--- a/src/wsi/Makefile.am
+++ b/src/wsi/Makefile.am
@@ -14,7 +14,8 @@ vulkan_wsi_tizen_la_SOURCES = wsi.h                           \
                                                          entry-points.c        \
                                                          surface.c                     \
                                                          swapchain.c           \
-                                                         display.c
+                                                         display.c                     \
+                                                         allocator.c
 
 manifestdir = /etc/vulkan/icd.d
 manifest_DATA = vulkan-wsi-tizen.json

diff --git a/src/wsi/allocator.c b/src/wsi/allocator.c
new file mode 100644 (file)
index 0000000..2c364a0
--- /dev/null
+++ b/src/wsi/allocator.c
@@ -0,0 +1,82 @@
+/*
+ * Copyright © 2016 S-Core Corporation
+ * Copyright © 2016-2017 Samsung Electronics co., Ltd. All Rights Reserved.
+ *
+ * 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.
+ */
+
+#include "wsi.h"
+#include <stdlib.h>
+
+static void *
+default_alloc(void *data, size_t size, size_t align, VkSystemAllocationScope allocationScope)
+{
+       return malloc(size);
+}
+
+static void *
+default_realloc(void *data, void *mem, size_t size, size_t align, VkSystemAllocationScope scope)
+{
+       return realloc(mem, size);
+}
+
+static void
+default_free(void *data, void *mem)
+{
+       free(mem);
+}
+
+static const VkAllocationCallbacks default_allocator = {
+       .pUserData = NULL,
+       .pfnAllocation = default_alloc,
+       .pfnReallocation = default_realloc,
+       .pfnFree = default_free,
+};
+
+const VkAllocationCallbacks *
+vk_get_allocator(void                                                  *parent,
+                                const VkAllocationCallbacks    *allocator)
+{
+       return &default_allocator;
+}
+
+void *
+vk_alloc(const VkAllocationCallbacks   *allocator,
+                size_t                                                  size,
+                VkSystemAllocationScope                 scope)
+{
+       return allocator->pfnAllocation(allocator->pUserData, size, 1, scope);
+}
+
+void *
+vk_realloc(const VkAllocationCallbacks *allocator,
+                  void                                                 *mem,
+                  size_t                                                size,
+                  VkSystemAllocationScope               scope)
+{
+       return allocator->pfnReallocation(allocator->pUserData, mem, size, 1, scope);
+}
+
+void
+vk_free(const VkAllocationCallbacks            *allocator,
+               void                                                    *mem)
+{
+       allocator->pfnFree(allocator->pUserData, mem);
+}

diff --git a/src/wsi/wsi.h b/src/wsi/wsi.h
index 3ba5b93..00d4c7b 100644 (file)
--- a/src/wsi/wsi.h
+++ b/src/wsi/wsi.h
@@ -32,6 +32,19 @@
 VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL
 vk_icdGetInstanceProcAddr(VkInstance instance, const char *name);
 
+const VkAllocationCallbacks *
+vk_get_allocator(void *parent, const VkAllocationCallbacks *allocator);
+
+void *
+vk_alloc(const VkAllocationCallbacks *allocator, size_t size, VkSystemAllocationScope scope);
+
+void *
+vk_realloc(const VkAllocationCallbacks *allocator, void *mem, size_t size,
+                  VkSystemAllocationScope scope);
+
+void
+vk_free(const VkAllocationCallbacks *allocator, void *mem);
+
 /* Entry point proto types. */
 VKAPI_ATTR void VKAPI_CALL
 vk_DestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface,