Brecht Van Lommel
fd25e883e2
Remove prefix of filenames that is the same as the folder name. This used to help when #includes were using individual files, but now they are always relative to the cycles root directory and so the prefixes are redundant. For patches and branches, git merge and rebase should be able to detect the renames and move over code to the right file.
77 lines
2.0 KiB
C++
77 lines
2.0 KiB
C++
/*
|
|
* Copyright 2011-2015 Blender Foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "util/aligned_malloc.h"
|
|
#include "util/guarded_allocator.h"
|
|
|
|
#include <cassert>
|
|
|
|
/* Adopted from Libmv. */
|
|
|
|
#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
|
|
/* Needed for memalign on Linux and _aligned_alloc on Windows. */
|
|
# ifdef FREE_WINDOWS
|
|
/* Make sure _aligned_malloc is included. */
|
|
# ifdef __MSVCRT_VERSION__
|
|
# undef __MSVCRT_VERSION__
|
|
# endif
|
|
# define __MSVCRT_VERSION__ 0x0700
|
|
# endif /* FREE_WINDOWS */
|
|
# include <malloc.h>
|
|
#else
|
|
/* Apple's malloc is 16-byte aligned, and does not have malloc.h, so include
|
|
* stdilb instead.
|
|
*/
|
|
# include <cstdlib>
|
|
#endif
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
void *util_aligned_malloc(size_t size, int alignment)
|
|
{
|
|
#ifdef WITH_BLENDER_GUARDEDALLOC
|
|
return MEM_mallocN_aligned(size, alignment, "Cycles Aligned Alloc");
|
|
#elif defined(_WIN32)
|
|
return _aligned_malloc(size, alignment);
|
|
#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
|
void *result;
|
|
if (posix_memalign(&result, alignment, size)) {
|
|
/* Non-zero means allocation error
|
|
* either no allocation or bad alignment value.
|
|
*/
|
|
return NULL;
|
|
}
|
|
return result;
|
|
#else /* This is for Linux. */
|
|
return memalign(alignment, size);
|
|
#endif
|
|
}
|
|
|
|
void util_aligned_free(void *ptr)
|
|
{
|
|
#if defined(WITH_BLENDER_GUARDEDALLOC)
|
|
if (ptr != NULL) {
|
|
MEM_freeN(ptr);
|
|
}
|
|
#elif defined(_WIN32)
|
|
_aligned_free(ptr);
|
|
#else
|
|
free(ptr);
|
|
#endif
|
|
}
|
|
|
|
CCL_NAMESPACE_END
|