mirror of
https://github.com/Xaymar/obs-StreamFX
synced 2024-10-24 05:42:39 +00:00
e0e2d9fe80
While Linux was not an original goal of the project, it should still be supported out of the box. Therefore a number of changes are contained in this changeset: - All C++ .h files were renamed to .hpp. - All C includes (<....h>) were replaced with C++ includes (<c...>) and missing includes were added. - std::memset and std::memcpy was replaced with memset and memcpy. - All anonymous structs were removed where necessary. - `extern "C"` was removed where it wasn't needed. - #pragma warning was placed behind an #ifdef _MSC_VER - The macros for `min`, `max` and `clamp` were removed as they were not used. - `-fpedantic` was added to the GCC flags for bitmask support. - `gs::rendertarget_op` is now declared before use. - std::exception(const char*) was replaced with std::runtime_error(const char*). - Added aligned_alloc and aligned_free macros for GCC and MSVC support. - Replaced use of `sprintf_s` with `snprintf`. - Placed additional guards around windows only code. Additonally some changes were made that do not affect Linux: - `NOMINMAX` and `NOINOUT` were removed. Fixes: #27 Fixes: #13
55 lines
1.7 KiB
C++
55 lines
1.7 KiB
C++
/*
|
|
* Modern effects for a modern Streamer
|
|
* Copyright (C) 2017 Michael Fabian Dirks
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
|
*/
|
|
|
|
#include "util-memory.hpp"
|
|
#include <cstdlib>
|
|
|
|
#define USE_STD_ALLOC_FREE
|
|
|
|
void* util::malloc_aligned(size_t align, size_t size)
|
|
{
|
|
#ifdef USE_STD_ALLOC_FREE
|
|
return aligned_alloc(align, size);
|
|
#else
|
|
// Ensure that we have space for the pointer and the data.
|
|
size_t asize = aligned_offset(align, size + (sizeof(void*) * 2));
|
|
|
|
// Allocate memory and store integer representation of pointer.
|
|
void* ptr = malloc(asize);
|
|
|
|
// Calculate actual aligned position
|
|
intptr_t ptr_off = aligned_offset(align, reinterpret_cast<size_t>(ptr) + sizeof(void*));
|
|
|
|
// Store actual pointer at ptr_off - sizeof(void*).
|
|
*reinterpret_cast<intptr_t*>(ptr_off - sizeof(void*)) = reinterpret_cast<intptr_t>(ptr);
|
|
|
|
// Return aligned pointer
|
|
return reinterpret_cast<void*>(ptr_off);
|
|
#endif
|
|
}
|
|
|
|
void util::free_aligned(void* mem)
|
|
{
|
|
#ifdef USE_STD_ALLOC_FREE
|
|
aligned_free(mem);
|
|
#else
|
|
void* ptr = reinterpret_cast<void*>(*reinterpret_cast<intptr_t*>(static_cast<char*>(mem) - sizeof(void*)));
|
|
free(ptr);
|
|
#endif
|
|
}
|