Merge commit 'f070e484cdac8a6d6a2e6f039aa69555e0739133'
This commit is contained in:
Vendored
+13
-13
@@ -35,14 +35,14 @@ template <typename T>
|
||||
static constexpr inline T read_access(const u8 *data, const u32 index);
|
||||
template <typename T>
|
||||
static constexpr inline T read_access(const std::vector<u8> &data, const u32 index);
|
||||
template <typename T, size_t Size>
|
||||
template <typename T, u32 Size>
|
||||
static constexpr inline T read_access(const std::array<u8, Size> &data, const u32 index);
|
||||
|
||||
template <typename T>
|
||||
static constexpr inline void write_access(u8 *data, const u32 index, const T val);
|
||||
template <typename T>
|
||||
static constexpr inline void write_access(std::vector<u8> &data, const u32 index, const T val);
|
||||
template <typename T, size_t Size>
|
||||
template <typename T, u32 Size>
|
||||
static constexpr inline void write_access(std::array<u8, Size> &data, const u32 index, const T val);
|
||||
|
||||
template <>
|
||||
@@ -70,19 +70,19 @@ static constexpr inline T read_access(const std::vector<u8> &data, const u32 ind
|
||||
return *reinterpret_cast<const T *>(&data[index]);
|
||||
}
|
||||
|
||||
template <size_t Size>
|
||||
template <u32 Size>
|
||||
constexpr inline u64 read_access(const std::array<u8, Size> &data, const u32 index) {
|
||||
u32 hi = *reinterpret_cast<const u32 *>(&data[index + 0]);
|
||||
u32 lo = *reinterpret_cast<const u32 *>(&data[index + 4]);
|
||||
return static_cast<u64>(hi) << 32 | static_cast<u64>(lo);
|
||||
}
|
||||
|
||||
template <typename T, size_t Size>
|
||||
template <typename T, u32 Size>
|
||||
static constexpr inline T read_access(const std::array<u8, Size> &data, const u32 index) {
|
||||
return *reinterpret_cast<const T *>(&data[index]);
|
||||
}
|
||||
|
||||
template <size_t Size>
|
||||
template <u32 Size>
|
||||
constexpr inline void write_access(std::array<u8, Size> &data, const u32 index, const u64 val) {
|
||||
const u32 hi = val >> 32;
|
||||
const u32 lo = val;
|
||||
@@ -91,7 +91,7 @@ constexpr inline void write_access(std::array<u8, Size> &data, const u32 index,
|
||||
*reinterpret_cast<u32 *>(&data[index + 4]) = lo;
|
||||
}
|
||||
|
||||
template <typename T, size_t Size>
|
||||
template <typename T, u32 Size>
|
||||
static constexpr inline void write_access(std::array<u8, Size> &data, const u32 index, const T val) {
|
||||
*reinterpret_cast<T *>(&data[index]) = val;
|
||||
}
|
||||
@@ -126,34 +126,34 @@ static constexpr inline void write_access(u8 *data, const u32 index, const T val
|
||||
|
||||
template <typename T>
|
||||
static constexpr inline void swap_buffer(std::vector<u8> &data) {
|
||||
for (size_t i = 0; i < data.size(); i += sizeof(T)) {
|
||||
for (u32 i = 0; i < data.size(); i += sizeof(T)) {
|
||||
const T original = *reinterpret_cast<T *>(&data[i]);
|
||||
*reinterpret_cast<T *>(&data[i]) = std::byteswap(original);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T, size_t Size>
|
||||
template <typename T, u32 Size>
|
||||
static constexpr inline void swap_buffer(std::array<u8, Size> &data) {
|
||||
for (size_t i = 0; i < data.size(); i += sizeof(T)) {
|
||||
for (u32 i = 0; i < data.size(); i += sizeof(T)) {
|
||||
const T original = *reinterpret_cast<T *>(&data[i]);
|
||||
*reinterpret_cast<T *>(&data[i]) = std::byteswap(original);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
static constexpr inline void swap_buffer(u8 *data, size_t size) {
|
||||
for (size_t i = 0; i < size; i += sizeof(T)) {
|
||||
static constexpr inline void swap_buffer(u8 *data, u32 size) {
|
||||
for (u32 i = 0; i < size; i += sizeof(T)) {
|
||||
const T original = *reinterpret_cast<T *>(&data[i]);
|
||||
*reinterpret_cast<T *>(&data[i]) = std::byteswap(original);
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef _WIN32
|
||||
inline void *aligned_alloc(const size_t alignment, const size_t size) { return _aligned_malloc(size, alignment); }
|
||||
inline void *aligned_alloc(const u32 alignment, const u32 size) { return _aligned_malloc(size, alignment); }
|
||||
|
||||
inline void aligned_free(void *ptr) { _aligned_free(ptr); }
|
||||
#else
|
||||
inline void *aligned_alloc(const size_t alignment, const size_t size) { return std::aligned_alloc(alignment, size); }
|
||||
inline void *aligned_alloc(const u32 alignment, const u32 size) { return std::aligned_alloc(alignment, size); }
|
||||
|
||||
inline void aligned_free(void *ptr) { std::free(ptr); }
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user