kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix line duplications in byteswap.cpp

Browse source
This commit is contained in:
dbalatoni13 2025-04-14 18:19:01 +02:00 • committed by Dávid Balatoni
parent 34cf507e3f
commit b88a660255
1 changed files with 1 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

142
src/port/byteswap.cpp
View file

@ -7,7 +7,6 @@
#include <ext_math.h> #include <ext_math.h>
#include <unordered_set> #include <unordered_set>
extern "C" {
extern "C" { extern "C" {
#include "port/byteswap.h" #include "port/byteswap.h"
} }
@ -19,7 +18,6 @@ template <typename T> [[nodiscard]] constexpr T bswap16(T val) noexcept
u16 u; u16 u;
T t; T t;
} v { .t = val }; } v { .t = val };
} v { .t = val };
#if __GNUC__ #if __GNUC__
v.u = __builtin_bswap16(v.u); v.u = __builtin_bswap16(v.u);
#elif _WIN32 #elif _WIN32
@ -37,7 +35,6 @@ template <typename T> [[nodiscard]] constexpr T bswap32(T val) noexcept
u32 u; u32 u;
T t; T t;
} v { .t = val }; } v { .t = val };
} v { .t = val };
#if __GNUC__ #if __GNUC__
v.u = __builtin_bswap32(v.u); v.u = __builtin_bswap32(v.u);
#elif _WIN32 #elif _WIN32
@ -123,7 +120,6 @@ template <typename B, typename T> T *offset_ptr(B &base, T *ptr, void *extra)
template <typename B, typename T> void bswap_flat(B &base, T *start, s32 count) template <typename B, typename T> void bswap_flat(B &base, T *start, s32 count)
{ {
T *objBase = start; T *objBase = start;
for (s32 i = 0; i < count; ++i) {
for (s32 i = 0; i < count; ++i) { for (s32 i = 0; i < count; ++i) {
bswap(base, objBase[i]); bswap(base, objBase[i]);
} }
@ -185,13 +181,6 @@ template <typename B> void bswap(B &base, HsfVector3f &vec)
bswap(base, vec.z); bswap(base, vec.z);
} }
template <typename B> void bswap(B &base, HsfVector3f &vec)
{
bswap(base, vec.x);
bswap(base, vec.y);
bswap(base, vec.z);
}
template <typename B> void bswap(B &base, AnimData32b &obj, AnimData &dest) template <typename B> void bswap(B &base, AnimData32b &obj, AnimData &dest)
{ {
bswap(base, obj.bankNum); bswap(base, obj.bankNum);
@ -767,19 +756,6 @@ void byteswap_hsfvec2f(HsfVector2f *src)
sVisitedPtrs.clear(); sVisitedPtrs.clear();
} }
void byteswap_hsfvec3f(HsfVector3f *src)
{
bswap(*src, *src);
sVisitedPtrs.clear();
}
void byteswap_hsfvec2f(HsfVector2f *src)
{
auto *vec = reinterpret_cast<Vec2f *>(src);
bswap(*vec, *vec);
sVisitedPtrs.clear();
}
void byteswap_animdata(void *src, AnimData *dest) void byteswap_animdata(void *src, AnimData *dest)
{ {
auto *anim = reinterpret_cast<AnimData32b *>(src); auto *anim = reinterpret_cast<AnimData32b *>(src);
@ -937,120 +913,4 @@ void byteswap_hsfface(HsfFace32b *src, HsfFace *dest)
{ {
bswap(*src, *src, *dest); bswap(*src, *src, *dest);
sVisitedPtrs.clear(); sVisitedPtrs.clear();
} }
void byteswap_hsfcluster(HsfCluster32b *src, HsfCluster *dest)
{
bswap(*src, *src, *dest);
sVisitedPtrs.clear();
}
void byteswap_hsfattribute(HsfAttribute32b *src, HsfAttribute *dest)
{
bswap(*src, *src, *dest);
sVisitedPtrs.clear();
}
void byteswap_hsfmaterial(HsfMaterial32b *src, HsfMaterial *dest)
{
bswap(*src, *src, *dest);
sVisitedPtrs.clear();
}
void byteswap_hsfscene(HsfScene *src)
{
bswap(*src, *src);
sVisitedPtrs.clear();
}
void byteswap_hsfbuffer(HsfBuffer32b *src, HsfBuffer *dest)
{
bswap(*src, *src, *dest);
sVisitedPtrs.clear();
}
void byteswap_hsfmatrix(HsfMatrix *src)
{
bswap(*src, *src);
sVisitedPtrs.clear();
}
void byteswap_hsfpalette(HsfPalette32b *src, HsfPalette *dest)
{
bswap(*src, *src, *dest);
sVisitedPtrs.clear();
}
void byteswap_hsfpart(HsfPart32b *src, HsfPart *dest)
{
bswap(*src, *src, *dest);
sVisitedPtrs.clear();
}
void byteswap_hsfbitmap(HsfBitmap32b *src, HsfBitmap *dest)
{
bswap(*src, *src, *dest);
sVisitedPtrs.clear();
}
void byteswap_hsfmapattr(HsfMapAttr32b *src, HsfMapAttr *dest)
{
bswap(*src, *src, *dest);
sVisitedPtrs.clear();
}
void byteswap_hsfskeleton(HsfSkeleton32b *src, HsfSkeleton *dest)
{
bswap(*src, *src, *dest);
sVisitedPtrs.clear();
}
void byteswap_hsfshape(HsfShape32b *src, HsfShape *dest)
{
bswap(*src, *src, *dest);
sVisitedPtrs.clear();
}
void byteswap_hsfcenv_single(HsfCenvSingle *src)
{
bswap(*src, *src);
sVisitedPtrs.clear();
}
void byteswap_hsfcenv(HsfCenv32b *src, HsfCenv *dest)
{
bswap(*src, *src, *dest);
sVisitedPtrs.clear();
}
void byteswap_hsfobject(HsfObject32b *src, HsfObject *dest)
{
bswap(*src, *src, *dest);
sVisitedPtrs.clear();
}
void byteswap_hsfbitmapkey(HsfBitmapKey32b *src, HsfBitmapKey *dest)
{
bswap(*src, *src, *dest);
sVisitedPtrs.clear();
}
void byteswap_hsftrack(HsfTrack32b *src, HsfTrack *dest)
{
bswap(*src, *src, *dest);
sVisitedPtrs.clear();
}
void byteswap_hsfmotion(HsfMotion32b *src, HsfMotion *dest)
{
bswap(*src, *src, *dest);
sVisitedPtrs.clear();
}
void byteswap_hsfface(HsfFace32b *src, HsfFace *dest)
{
bswap(*src, *src, *dest);
sVisitedPtrs.clear();
}