Merge pull request #54 from lioncash/cleanup

Cleanup mismatching struct/enum indentations.

1 files changed, 32 insertions, 32 deletions

diff --git a/Source/Core/VideoCommon/PixelEngine.cpp b/Source/Core/VideoCommon/PixelEngine.cpp
index 32d91f4310..b075a296d9 100644
--- a/Source/Core/VideoCommon/PixelEngine.cpp
+++ b/Source/Core/VideoCommon/PixelEngine.cpp
@@ -27,10 +27,10 @@ union UPEZConfReg
 	u16 Hex;
 	struct
 	{
-		u16 ZCompEnable		: 1; // Z Comparator Enable
-		u16 Function		: 3;
-		u16 ZUpdEnable		: 1;
-		u16					: 11;
+		u16 ZCompEnable : 1; // Z Comparator Enable
+		u16 Function    : 3;
+		u16 ZUpdEnable  : 1;
+		u16             : 11;
 	};
 };
 
@@ -39,15 +39,15 @@ union UPEAlphaConfReg
 	u16 Hex;
 	struct
 	{
-		u16 BMMath			: 1; // GX_BM_BLEND || GX_BM_SUBSTRACT
-		u16 BMLogic			: 1; // GX_BM_LOGIC
-		u16 Dither			: 1;
-		u16 ColorUpdEnable	: 1;
-		u16 AlphaUpdEnable	: 1;
-		u16 DstFactor		: 3;
-		u16 SrcFactor		: 3;
-		u16 Substract		: 1; // Additive mode by default
-		u16 BlendOperator	: 4;
+		u16 BMMath         : 1; // GX_BM_BLEND || GX_BM_SUBSTRACT
+		u16 BMLogic        : 1; // GX_BM_LOGIC
+		u16 Dither         : 1;
+		u16 ColorUpdEnable : 1;
+		u16 AlphaUpdEnable : 1;
+		u16 DstFactor      : 3;
+		u16 SrcFactor      : 3;
+		u16 Substract      : 1; // Additive mode by default
+		u16 BlendOperator  : 4;
 	};
 };
 
@@ -56,9 +56,9 @@ union UPEDstAlphaConfReg
 	u16 Hex;
 	struct
 	{
-		u16 DstAlpha		: 8;
-		u16 Enable			: 1;
-		u16					: 7;
+		u16 DstAlpha : 8;
+		u16 Enable   : 1;
+		u16          : 7;
 	};
 };
 
@@ -67,8 +67,8 @@ union UPEAlphaModeConfReg
 	u16 Hex;
 	struct
 	{
-		u16 Threshold		: 8;
-		u16 CompareMode		: 8;
+		u16 Threshold   : 8;
+		u16 CompareMode : 8;
 	};
 };
 
@@ -77,11 +77,11 @@ union UPECtrlReg
 {
 	struct
 	{
-		u16 PETokenEnable	:	1;
-		u16 PEFinishEnable	:	1;
-		u16 PEToken			:	1; // write only
-		u16 PEFinish		:	1; // write only
-		u16					:	12;
+		u16 PETokenEnable  : 1;
+		u16 PEFinishEnable : 1;
+		u16 PEToken        : 1; // write only
+		u16 PEFinish       : 1; // write only
+		u16                : 12;
 	};
 	u16 Hex;
 	UPECtrlReg() {Hex = 0; }
@@ -89,13 +89,13 @@ union UPECtrlReg
 };
 
 // STATE_TO_SAVE
-static UPEZConfReg			m_ZConf;
-static UPEAlphaConfReg		m_AlphaConf;
-static UPEDstAlphaConfReg	m_DstAlphaConf;
-static UPEAlphaModeConfReg	m_AlphaModeConf;
-static UPEAlphaReadReg		m_AlphaRead;
-static UPECtrlReg			m_Control;
-//static u16					m_Token; // token value most recently encountered
+static UPEZConfReg         m_ZConf;
+static UPEAlphaConfReg     m_AlphaConf;
+static UPEDstAlphaConfReg  m_DstAlphaConf;
+static UPEAlphaModeConfReg m_AlphaModeConf;
+static UPEAlphaReadReg     m_AlphaRead;
+static UPECtrlReg          m_Control;
+//static u16                 m_Token; // token value most recently encountered
 
 volatile u32 g_bSignalTokenInterrupt;
 volatile u32 g_bSignalFinishInterrupt;
@@ -111,8 +111,8 @@ bool bbox_active;
 
 enum
 {
-	INT_CAUSE_PE_TOKEN    =  0x200, // GP Token
-	INT_CAUSE_PE_FINISH   =  0x400, // GP Finished
+	INT_CAUSE_PE_TOKEN  = 0x200, // GP Token
+	INT_CAUSE_PE_FINISH = 0x400, // GP Finished
 };
 
 void DoState(PointerWrap &p)