diff options
| author | flacs <tilkax@gmail.com> | 2015-09-11 17:00:13 +0000 |
|---|---|---|
| committer | flacs <tilkax@gmail.com> | 2015-09-11 17:00:13 +0000 |
| commit | c5685ba53a6866cce5c32bf0c3bbbd7aa52dbf6c (patch) | |
| tree | 7886e61f016f7835a7aadf2bb670c82787b94064 /Source/Core/VideoCommon/TextureDecoder_Common.cpp | |
| parent | d7acf065059ae84eda86e3feb27e0d5c2283be0b (diff) | |
| parent | 8ce04f9a65612b7553015428e617ba7c53913175 (diff) | |
Merge pull request #2972 from lioncash/align
General: Replace GC_ALIGN macros with alignas
Diffstat (limited to 'Source/Core/VideoCommon/TextureDecoder_Common.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/TextureDecoder_Common.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/TextureDecoder_Common.cpp b/Source/Core/VideoCommon/TextureDecoder_Common.cpp index 8fc1631b93..a1c7bff0c2 100644 --- a/Source/Core/VideoCommon/TextureDecoder_Common.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_Common.cpp @@ -5,7 +5,9 @@ #include <algorithm> #include <cmath> -#include "Common/Common.h" +#include "Common/CommonFuncs.h" +#include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "VideoCommon/LookUpTables.h" #include "VideoCommon/sfont.inc" @@ -16,7 +18,7 @@ static bool TexFmt_Overlay_Center = false; // TRAM // STATE_TO_SAVE -GC_ALIGNED16(u8 texMem[TMEM_SIZE]); +alignas(16) u8 texMem[TMEM_SIZE]; int TexDecoder_GetTexelSizeInNibbles(int format) { |