diff --git a/stepmania/src/SDL_utils.cpp b/stepmania/src/SDL_utils.cpp index f937453259..c96833c801 100644 --- a/stepmania/src/SDL_utils.cpp +++ b/stepmania/src/SDL_utils.cpp @@ -2,11 +2,11 @@ #include "SDL.h" #include "SDL_utils.h" -#include "SDL_endian.h" #include "SDL_rotozoom.h" // for setting icon #include "RageSurface_Load.h" #include "RageFile.h" #include "RageLog.h" +#include "RageUtil.h" /* Pull in all of our SDL libraries here. */ #ifdef _XBOX @@ -23,12 +23,6 @@ #endif #endif - -Uint32 mySDL_Swap24(Uint32 x) -{ - return SDL_Swap32(x) >> 8; // xx223344 -> 443322xx -> 00443322 -} - /* These conditionals in the inner loop are slow. Templates? */ inline Uint32 decodepixel(const Uint8 *p, int bpp) { diff --git a/stepmania/src/SDL_utils.h b/stepmania/src/SDL_utils.h index f22abcf08f..12e24da8fe 100644 --- a/stepmania/src/SDL_utils.h +++ b/stepmania/src/SDL_utils.h @@ -11,15 +11,6 @@ #undef Font #undef Screen -Uint32 mySDL_Swap24(Uint32 x); -#if SDL_BYTEORDER == SDL_LIL_ENDIAN -#define mySDL_SwapLE24(n) (n) -#define mySDL_SwapBE24(n) (mySDL_Swap24(n)) -#else -#define mySDL_SwapLE24(n) (mySDL_Swap24(n)) -#define mySDL_SwapBE24(n) (n) -#endif - Uint32 decodepixel(const Uint8 *p, int bpp); void encodepixel(Uint8 *p, int bpp, Uint32 pixel);