projects
/
platform
/
upstream
/
Vulkan-Tools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cc98270
)
Win/C11: Use _align_malloc() on Windows, align_alloc() elsewhere.
author
Ian Elliott
<ian@LunarG.com>
Fri, 6 Mar 2015 21:34:47 +0000
(14:34 -0700)
committer
Ian Elliott
<ian@LunarG.com>
Fri, 6 Mar 2015 21:34:47 +0000
(14:34 -0700)
icd/common/icd-instance.c
patch
|
blob
|
history
diff --git
a/icd/common/icd-instance.c
b/icd/common/icd-instance.c
index 5da4d41d8396fa9d9dd5c79c5418be495bfeaf26..2311b6c055cdd6418a9515b70235cf822646f5be 100644
(file)
--- a/
icd/common/icd-instance.c
+++ b/
icd/common/icd-instance.c
@@
-45,7
+45,11
@@
static void * XGLAPI default_alloc(void *user_data, size_t size,
size = (size + alignment - 1) & ~(alignment - 1);
+#if defined(_WIN32)
+ return _aligned_malloc(alignment, size);
+#else
return aligned_alloc(alignment, size);
+#endif
}
else {
return NULL;