From 3eb795a305614d2b9544b31dea4eca31fa9801f4 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Fri, 20 Aug 2021 18:40:20 -0700 Subject: [PATCH] alignment mismatches Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Code/Legacy/CryCommon/Cry_Camera.h | 2 +- Code/Legacy/CryCommon/IShader.h | 2 +- Code/Legacy/CryCommon/platform_impl.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Code/Legacy/CryCommon/Cry_Camera.h b/Code/Legacy/CryCommon/Cry_Camera.h index 851611c8a6..9db4340fcb 100644 --- a/Code/Legacy/CryCommon/Cry_Camera.h +++ b/Code/Legacy/CryCommon/Cry_Camera.h @@ -2146,7 +2146,7 @@ inline uint8 CCamera::IsOBBVisible_EH(const Vec3& wpos, const OBB& obb, f32 usca //--- ADDITIONAL-TEST --- //------------------------------------------------------------------------------ -extern _MS_ALIGN(64) uint32 BoxSides[]; +extern _MS_ALIGN(64) uint32 BoxSides[] _ALIGN(64); // Description: // A box can easily straddle one of the view-frustum planes far diff --git a/Code/Legacy/CryCommon/IShader.h b/Code/Legacy/CryCommon/IShader.h index 6ae3bd73df..da7b64e96b 100644 --- a/Code/Legacy/CryCommon/IShader.h +++ b/Code/Legacy/CryCommon/IShader.h @@ -770,7 +770,7 @@ _MS_ALIGN(16) struct SSkinningData SSkinningData* pNextSkinningData; // List to the next element which needs SW-Skinning } _ALIGN(16); -struct SRenderObjData +struct _MS_ALIGN(16) SRenderObjData { uintptr_t m_uniqueObjectId; diff --git a/Code/Legacy/CryCommon/platform_impl.cpp b/Code/Legacy/CryCommon/platform_impl.cpp index ecc196a49f..a89df5471a 100644 --- a/Code/Legacy/CryCommon/platform_impl.cpp +++ b/Code/Legacy/CryCommon/platform_impl.cpp @@ -404,7 +404,7 @@ _MS_ALIGN(64) uint32 BoxSides[0x40 * 8] = { 0, 0, 0, 0, 0, 0, 0, 0, //3d 0, 0, 0, 0, 0, 0, 0, 0, //3e 0, 0, 0, 0, 0, 0, 0, 0, //3f -}; +} _ALIGN(64); //////////////////////////////////////////////////////////////////////////////////////////////////////////// #if defined(AZ_RESTRICTED_PLATFORM)