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

VertexLoader_Color: clean up

This commit is contained in:
Tillmann Karras 2015-01-12 21:01:28 +01:00
parent 6a26771cd5
commit d86957944a
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Source/Core/VideoCommon/VertexLoader_Color.cpp
View File

@ -10,10 +10,6 @@
#include "VideoCommon/VertexManagerBase.h" #include "VideoCommon/VertexManagerBase.h"
#include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoCommon.h"
#define RSHIFT 0
#define GSHIFT 8
#define BSHIFT 16
#define ASHIFT 24
#define AMASK 0xFF000000 #define AMASK 0xFF000000
__forceinline void _SetCol(VertexLoader* loader, u32 val) __forceinline void _SetCol(VertexLoader* loader, u32 val)
@ -24,13 +20,14 @@ __forceinline void _SetCol(VertexLoader* loader, u32 val)
//color comes in format BARG in 16 bits //color comes in format BARG in 16 bits
//BARG -> AABBGGRR //BARG -> AABBGGRR
__forceinline void _SetCol4444(VertexLoader* loader, u16 val) __forceinline void _SetCol4444(VertexLoader* loader, u16 val_)
{ {
u32 col = (val & 0xF0); // col = 000000R0; u32 col, val = val_;
col |= (val & 0xF ) << 12; // col |= 0000G000; col = val & 0x00F0; // col = 000000R0;
col |= (((u32)val) & 0xF000) << 8; // col |= 00B00000; col |= (val & 0x000F) << 12; // col |= 0000G000;
col |= (((u32)val) & 0x0F00) << 20; // col |= A0000000; col |= (val & 0xF000) << 8; // col |= 00B00000;
col |= col >> 4; // col = A0B0G0R0 | 0A0B0G0R; col |= (val & 0x0F00) << 20; // col |= A0000000;
col |= col >> 4; // col = A0B0G0R0 | 0A0B0G0R;
_SetCol(loader, col); _SetCol(loader, col);
} }
@ -38,9 +35,9 @@ __forceinline void _SetCol4444(VertexLoader* loader, u16 val)
//RRRRRRGG GGGGBBBB BBAAAAAA //RRRRRRGG GGGGBBBB BBAAAAAA
__forceinline void _SetCol6666(VertexLoader* loader, u32 val) __forceinline void _SetCol6666(VertexLoader* loader, u32 val)
{ {
u32 col = (val >> 16) & 0xFC; u32 col = (val >> 16) & 0x000000FC;
col |= (val >> 2) & 0xFC00; col |= (val >> 2) & 0x0000FC00;
col |= (val << 12) & 0xFC0000; col |= (val << 12) & 0x00FC0000;
col |= (val << 26) & 0xFC000000; col |= (val << 26) & 0xFC000000;
col |= (col >> 6) & 0x03030303; col |= (col >> 6) & 0x03030303;
_SetCol(loader, col); _SetCol(loader, col);
@ -48,13 +45,14 @@ __forceinline void _SetCol6666(VertexLoader* loader, u32 val)
//color comes in RGB //color comes in RGB
//RRRRRGGG GGGBBBBB //RRRRRGGG GGGBBBBB
__forceinline void _SetCol565(VertexLoader* loader, u16 val) __forceinline void _SetCol565(VertexLoader* loader, u16 val_)
{ {
u32 col = (val >> 8) & 0xF8; u32 col, val = val_;
col |= (val << 5) & 0xFC00; col = (val >> 8) & 0x0000F8;
col |=(((u32)val) << 19) & 0xF80000; col |= (val << 5) & 0x00FC00;
col |= (col >> 5) & 0x070007; col |= (val << 19) & 0xF80000;
col |= (col >> 6) & 0x000300; col |= (col >> 5) & 0x070007;
col |= (col >> 6) & 0x000300;
_SetCol(loader, col | AMASK); _SetCol(loader, col | AMASK);
} }
@ -96,11 +94,6 @@ void LOADERDECL Color_ReadDirect_24b_6666(VertexLoader* loader)
} }
// F|RES: i am not 100 percent sure, but the colElements seems to be important for rendering only // F|RES: i am not 100 percent sure, but the colElements seems to be important for rendering only
// at least it fixes mario party 4 // at least it fixes mario party 4
//
// if (colElements[colIndex])
// else
// col |= 0xFF<<ASHIFT;
//
void LOADERDECL Color_ReadDirect_32b_8888(VertexLoader* loader) void LOADERDECL Color_ReadDirect_32b_8888(VertexLoader* loader)
{ {
// TODO (mb2): check this // TODO (mb2): check this
@ -108,7 +101,7 @@ void LOADERDECL Color_ReadDirect_32b_8888(VertexLoader* loader)
// "kill" the alpha // "kill" the alpha
if (!loader->m_colElements[loader->m_colIndex]) if (!loader->m_colElements[loader->m_colIndex])
col |= 0xFF << ASHIFT; col |= AMASK;
_SetCol(loader, col); _SetCol(loader, col);
} }