ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GPU: 

- Reorder some functions to fix building on older compilers.
This commit is contained in:
rogerman 2016-06-23 01:32:53 +00:00
parent 314bb2130d
commit 051e58a4fd
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
desmume/src/GPU.h
View File

@ -1689,15 +1689,6 @@ FORCEINLINE u32 ConvertColor555To6665Opaque(const u16 src)
return (SWAP_RB) ? COLOR555TO6665_OPAQUE_SWAP_RB(src & 0x7FFF) : COLOR555TO6665_OPAQUE(src & 0x7FFF); return (SWAP_RB) ? COLOR555TO6665_OPAQUE_SWAP_RB(src & 0x7FFF) : COLOR555TO6665_OPAQUE(src & 0x7FFF);
} }
template <bool SWAP_RB>
FORCEINLINE u32 ConvertColor8888To6665(u32 srcColor)
{
FragmentColor srcColorComponent;
srcColorComponent.color = srcColor;
return ConvertColor8888To6665<SWAP_RB>(srcColorComponent);
}
template <bool SWAP_RB> template <bool SWAP_RB>
FORCEINLINE u32 ConvertColor8888To6665(FragmentColor srcColor) FORCEINLINE u32 ConvertColor8888To6665(FragmentColor srcColor)
{ {
@ -1711,12 +1702,12 @@ FORCEINLINE u32 ConvertColor8888To6665(FragmentColor srcColor)
} }
template <bool SWAP_RB> template <bool SWAP_RB>
FORCEINLINE u32 ConvertColor6665To8888(u32 srcColor) FORCEINLINE u32 ConvertColor8888To6665(u32 srcColor)
{ {
FragmentColor srcColorComponent; FragmentColor srcColorComponent;
srcColorComponent.color = srcColor; srcColorComponent.color = srcColor;
return ConvertColor6665To8888<SWAP_RB>(srcColorComponent); return ConvertColor8888To6665<SWAP_RB>(srcColorComponent);
} }
template <bool SWAP_RB> template <bool SWAP_RB>
@ -1732,12 +1723,12 @@ FORCEINLINE u32 ConvertColor6665To8888(FragmentColor srcColor)
} }
template <bool SWAP_RB> template <bool SWAP_RB>
FORCEINLINE u16 ConvertColor8888To5551(u32 srcColor) FORCEINLINE u32 ConvertColor6665To8888(u32 srcColor)
{ {
FragmentColor srcColorComponent; FragmentColor srcColorComponent;
srcColorComponent.color = srcColor; srcColorComponent.color = srcColor;
return ConvertColor8888To5551<SWAP_RB>(srcColorComponent); return ConvertColor6665To8888<SWAP_RB>(srcColorComponent);
} }
template <bool SWAP_RB> template <bool SWAP_RB>
@ -1747,12 +1738,12 @@ FORCEINLINE u16 ConvertColor8888To5551(FragmentColor srcColor)
} }
template <bool SWAP_RB> template <bool SWAP_RB>
FORCEINLINE u16 ConvertColor6665To5551(u32 srcColor) FORCEINLINE u16 ConvertColor8888To5551(u32 srcColor)
{ {
FragmentColor srcColorComponent; FragmentColor srcColorComponent;
srcColorComponent.color = srcColor; srcColorComponent.color = srcColor;
return ConvertColor6665To5551<SWAP_RB>(srcColorComponent); return ConvertColor8888To5551<SWAP_RB>(srcColorComponent);
} }
template <bool SWAP_RB> template <bool SWAP_RB>
@ -1761,6 +1752,15 @@ FORCEINLINE u16 ConvertColor6665To5551(FragmentColor srcColor)
return R6G6B6TORGB15( ((SWAP_RB) ? srcColor.b : srcColor.r), srcColor.g, ((SWAP_RB) ? srcColor.r : srcColor.b)) | ((srcColor.a == 0) ? 0x0000 : 0x8000); return R6G6B6TORGB15( ((SWAP_RB) ? srcColor.b : srcColor.r), srcColor.g, ((SWAP_RB) ? srcColor.r : srcColor.b)) | ((srcColor.a == 0) ? 0x0000 : 0x8000);
} }
template <bool SWAP_RB>
FORCEINLINE u16 ConvertColor6665To5551(u32 srcColor)
{
FragmentColor srcColorComponent;
srcColorComponent.color = srcColor;
return ConvertColor6665To5551<SWAP_RB>(srcColorComponent);
}
#ifdef ENABLE_SSE2 #ifdef ENABLE_SSE2
template <bool SWAP_RB> template <bool SWAP_RB>