diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-02-26 13:49:00 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-02-26 13:49:00 -0600 |
| commit | 717b9768750dfef39120d4457a832ce7558bd879 (patch) | |
| tree | 4353d8ee51af2b19b0726de81fbc118fa8d62d19 /Source/Core/Common/Src/MemoryUtil.cpp | |
| parent | 46adbfa9ede116aaed876ecf1d3a21002e399910 (diff) | |
ARM Support without GLSL
Diffstat (limited to 'Source/Core/Common/Src/MemoryUtil.cpp')
| -rw-r--r-- | Source/Core/Common/Src/MemoryUtil.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp index 0888746d42..ff50347799 100644 --- a/Source/Core/Common/Src/MemoryUtil.cpp +++ b/Source/Core/Common/Src/MemoryUtil.cpp @@ -117,9 +117,12 @@ void* AllocateAlignedMemory(size_t size,size_t alignment) void* ptr = _aligned_malloc(size,alignment);
#else
void* ptr = NULL;
+#ifdef ANDROID
+ ptr = memalign(alignment, size);
+#else
if (posix_memalign(&ptr, alignment, size) != 0)
ERROR_LOG(MEMMAP, "Failed to allocate aligned memory");
-;
+#endif
#endif
// printf("Mapped memory at %p (size %ld)\n", ptr,
|
