From 7fa124eeabac7def2103768840f091890feb7ede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Mon, 13 Oct 2014 21:31:18 -0700
Subject: [PATCH] Fixed alignment macro.

---
 examples/14-shadowvolumes/shadowvolumes.cpp | 2 +-
 src/bgfx_p.h                                | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/examples/14-shadowvolumes/shadowvolumes.cpp b/examples/14-shadowvolumes/shadowvolumes.cpp
index ab11e001..c2314c90 100644
--- a/examples/14-shadowvolumes/shadowvolumes.cpp
+++ b/examples/14-shadowvolumes/shadowvolumes.cpp
@@ -1641,7 +1641,7 @@ void shadowVolumeCreate(ShadowVolume& _shadowVolume
 			const float4_t onei = float4_isplat(1);
 			const float4_t tmp4 = float4_isub(tmp3, onei);
 
-			BX_ALIGN_STRUCT_16(int32_t res[4]);
+			BX_ALIGN_DECL_16(int32_t res[4]);
 			float4_st(&res, tmp4);
 
 			for (uint16_t jj = 0; jj < 2; ++jj)
diff --git a/src/bgfx_p.h b/src/bgfx_p.h
index 1c16962b..5bef41c0 100644
--- a/src/bgfx_p.h
+++ b/src/bgfx_p.h
@@ -717,7 +717,7 @@ namespace bgfx
 	};
 #undef SORT_KEY_RENDER_DRAW
 
-	BX_ALIGN_STRUCT_16(struct) Matrix4
+	BX_ALIGN_DECL_16(struct) Matrix4
 	{
 		union
 		{
@@ -1137,10 +1137,8 @@ namespace bgfx
 		VertexDeclHandle m_decl;
 	};
 
-	struct Frame
+	BX_ALIGN_DECL_CACHE_LINE(struct) Frame
 	{
-		BX_CACHE_LINE_ALIGN_MARKER();
-
 		Frame()
 			: m_waitSubmit(0)
 			, m_waitRender(0)
@@ -3054,9 +3052,8 @@ namespace bgfx
 		bool m_rendererInitialized;
 		bool m_exit;
 
-		BX_CACHE_LINE_ALIGN_MARKER();
 		typedef UpdateBatchT<256> TextureUpdateBatch;
-		TextureUpdateBatch m_textureUpdateBatch;
+		BX_ALIGN_DECL_CACHE_LINE(TextureUpdateBatch m_textureUpdateBatch);
 	};
 
 #undef BGFX_API_FUNC