From 465f5eefb1935edc6aef8dd6eba24e040d22f14f Mon Sep 17 00:00:00 2001
From: Jon Ashburn <jon@lunarg.com>
Date: Thu, 7 Jan 2016 15:21:14 -0700
Subject: misc:  make sure host memory alignment is a power of two

Use sizeof(int) as a default generally.  Is that reasonable?
---
 loader/debug_report.c | 2 +-
 loader/loader.c       | 6 ++++--
 loader/trampoline.c   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'loader')

diff --git a/loader/debug_report.c b/loader/debug_report.c
index ebb1ae29..4065fb03 100644
--- a/loader/debug_report.c
+++ b/loader/debug_report.c
@@ -74,7 +74,7 @@ VkResult util_CreateDebugReportCallback(
 {
     VkLayerDbgFunctionNode *pNewDbgFuncNode;
     if (pAllocator != NULL) {
-        pNewDbgFuncNode = (VkLayerDbgFunctionNode *) pAllocator->pfnAllocation(pAllocator->pUserData, sizeof(VkLayerDbgFunctionNode), sizeof(uint32_t), VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
+        pNewDbgFuncNode = (VkLayerDbgFunctionNode *) pAllocator->pfnAllocation(pAllocator->pUserData, sizeof(VkLayerDbgFunctionNode), sizeof(int *), VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
     } else {
         pNewDbgFuncNode = (VkLayerDbgFunctionNode *) loader_heap_alloc(inst, sizeof(VkLayerDbgFunctionNode), VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
     }
diff --git a/loader/loader.c b/loader/loader.c
index 79ed84ba..81c805ab 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -152,7 +152,7 @@ void* loader_heap_alloc(
 {
     if (instance && instance->alloc_callbacks.pfnAllocation) {
         /* TODO: What should default alignment be? 1, 4, 8, other? */
-        return instance->alloc_callbacks.pfnAllocation(instance->alloc_callbacks.pUserData, size, 4, alloc_scope);
+        return instance->alloc_callbacks.pfnAllocation(instance->alloc_callbacks.pUserData, size, sizeof(int), alloc_scope);
     }
     return malloc(size);
 }
@@ -182,12 +182,14 @@ void* loader_heap_realloc(
         loader_heap_free(instance, pMemory);
         return NULL;
     }
+    //TODO use the callback realloc function
     if (instance && instance->alloc_callbacks.pfnAllocation) {
         if (size <= orig_size) {
             memset(((uint8_t *)pMemory) + size,  0, orig_size - size);
             return pMemory;
         }
-        void *new_ptr = instance->alloc_callbacks.pfnAllocation(instance->alloc_callbacks.pUserData, size, 4, alloc_scope);
+        /* TODO: What should default alignment be? 1, 4, 8, other? */
+        void *new_ptr = instance->alloc_callbacks.pfnAllocation(instance->alloc_callbacks.pUserData, size, sizeof(int), alloc_scope);
         if (!new_ptr)
             return NULL;
         memcpy(new_ptr, pMemory, orig_size);
diff --git a/loader/trampoline.c b/loader/trampoline.c
index 6d68166e..6a81cafd 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -53,7 +53,7 @@ LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance(
         ptr_instance = (struct loader_instance *) pAllocator->pfnAllocation(
                            pAllocator->pUserData,
                            sizeof(struct loader_instance),
-                           sizeof(VkInstance),
+                           sizeof(int *),
                            VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
     } else {
         ptr_instance = (struct loader_instance *) malloc(sizeof(struct loader_instance));
-- 
cgit v1.2.3