summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/Src/PixelEngine.cpp
diff options
context:
space:
mode:
authorShawn Hoffman <godisgovernment@gmail.com>2010-09-27 05:16:11 +0000
committerShawn Hoffman <godisgovernment@gmail.com>2010-09-27 05:16:11 +0000
commit73f4bc45980398ee8244f4e5ad20ec538da6e814 (patch)
tree1112b8a240e3904e0681b35f2edb902a84b29cb9 /Source/Core/VideoCommon/Src/PixelEngine.cpp
parent986939f31aa268731a572a636d3fb2f9c0f868de (diff)
Some more cleanup which should've been in r6232. Thanks Billiard.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6234 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon/Src/PixelEngine.cpp')
-rw-r--r--Source/Core/VideoCommon/Src/PixelEngine.cpp50
1 files changed, 25 insertions, 25 deletions
diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp
index 06ceeef88e..2785d66826 100644
--- a/Source/Core/VideoCommon/Src/PixelEngine.cpp
+++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp
@@ -36,10 +36,10 @@ union UPEZConfReg
u16 Hex;
struct
{
- unsigned ZCompEnable : 1; // Z Comparator Enable
- unsigned Function : 3;
- unsigned ZUpdEnable : 1;
- unsigned : 11;
+ u16 ZCompEnable : 1; // Z Comparator Enable
+ u16 Function : 3;
+ u16 ZUpdEnable : 1;
+ u16 : 11;
};
};
@@ -48,15 +48,15 @@ union UPEAlphaConfReg
u16 Hex;
struct
{
- unsigned BMMath : 1; // GX_BM_BLEND || GX_BM_SUBSTRACT
- unsigned BMLogic : 1; // GX_BM_LOGIC
- unsigned Dither : 1;
- unsigned ColorUpdEnable : 1;
- unsigned AlphaUpdEnable : 1;
- unsigned DstFactor : 3;
- unsigned SrcFactor : 3;
- unsigned Substract : 1; // Additive mode by default
- unsigned 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;
};
};
@@ -65,9 +65,9 @@ union UPEDstAlphaConfReg
u16 Hex;
struct
{
- unsigned DstAlpha : 8;
- unsigned Enable : 1;
- unsigned : 7;
+ u16 DstAlpha : 8;
+ u16 Enable : 1;
+ u16 : 7;
};
};
@@ -76,8 +76,8 @@ union UPEAlphaModeConfReg
u16 Hex;
struct
{
- unsigned Threshold : 8;
- unsigned CompareMode : 8;
+ u16 Threshold : 8;
+ u16 CompareMode : 8;
};
};
@@ -87,8 +87,8 @@ union UPEAlphaReadReg
u16 Hex;
struct
{
- unsigned ReadMode : 3;
- unsigned : 13;
+ u16 ReadMode : 3;
+ u16 : 13;
};
};
@@ -97,11 +97,11 @@ union UPECtrlReg
{
struct
{
- unsigned PETokenEnable : 1;
- unsigned PEFinishEnable : 1;
- unsigned PEToken : 1; // write only
- unsigned PEFinish : 1; // write only
- unsigned : 12;
+ u16 PETokenEnable : 1;
+ u16 PEFinishEnable : 1;
+ u16 PEToken : 1; // write only
+ u16 PEFinish : 1; // write only
+ u16 : 12;
};
u16 Hex;
UPECtrlReg() {Hex = 0; }