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

clean a little my last commit and improve accuracy. 

thanks to hrydgard and neobrain for the comments

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6876 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Rodolfo Osvaldo Bogado 2011-01-18 17:48:49 +00:00
parent 974670e6bd
commit b1c6f959d9
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Source/Core/VideoCommon/Src/VertexLoader_Normal.cpp
View File

@ -145,6 +145,13 @@ TPipelineFunction VertexLoader_Normal::GetFunction(unsigned int _type, unsigned
return pFunc; return pFunc;
} }
// --- Expand s8 to s16
inline s16 Expands8Tos16(s8 input)
{
return (s16)((((s32)input) * 32767) / 127);
}
// --- Direct --- // --- Direct ---
@ -159,12 +166,9 @@ void LOADERDECL VertexLoader_Normal::Normal_DirectByte()
void LOADERDECL VertexLoader_Normal::Normal_DirectByte_Expand16() void LOADERDECL VertexLoader_Normal::Normal_DirectByte_Expand16()
{ {
s8 temp = DataReadS8(); ((s16*)VertexManager::s_pCurBufferPointer)[0] = Expands8Tos16(DataReadS8());
((s16*)VertexManager::s_pCurBufferPointer)[0] = (((s16)temp) << 8) | (temp & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[1] = Expands8Tos16(DataReadS8());
temp = DataReadS8(); ((s16*)VertexManager::s_pCurBufferPointer)[2] = Expands8Tos16(DataReadS8());
((s16*)VertexManager::s_pCurBufferPointer)[1] = (((s16)temp) << 8) | (temp & 0x7F);
temp = DataReadS8();
((s16*)VertexManager::s_pCurBufferPointer)[2] = (((s16)temp) << 8) | (temp & 0x7F);
((s16*)VertexManager::s_pCurBufferPointer)[3] = 0; ((s16*)VertexManager::s_pCurBufferPointer)[3] = 0;
VertexManager::s_pCurBufferPointer += 8; VertexManager::s_pCurBufferPointer += 8;
LOG_NORM16(); LOG_NORM16();
@ -205,12 +209,9 @@ void LOADERDECL VertexLoader_Normal::Normal_DirectByte3_Expand16()
{ {
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
s8 temp = DataReadS8(); ((u16*)VertexManager::s_pCurBufferPointer)[0] = Expands8Tos16(DataReadS8());
((u16*)VertexManager::s_pCurBufferPointer)[0] = (((s16)temp) << 8) | (temp & 0x7F); ((u16*)VertexManager::s_pCurBufferPointer)[1] = Expands8Tos16(DataReadS8());
temp = DataReadS8(); ((u16*)VertexManager::s_pCurBufferPointer)[2] = Expands8Tos16(DataReadS8());
((u16*)VertexManager::s_pCurBufferPointer)[1] = (((s16)temp) << 8) | (temp & 0x7F);
temp = DataReadS8();
((u16*)VertexManager::s_pCurBufferPointer)[2] = (((s16)temp) << 8) | (temp & 0x7F);
((u16*)VertexManager::s_pCurBufferPointer)[3] = 0; ((u16*)VertexManager::s_pCurBufferPointer)[3] = 0;
VertexManager::s_pCurBufferPointer += 8; VertexManager::s_pCurBufferPointer += 8;
LOG_NORM16(); LOG_NORM16();
@ -260,9 +261,9 @@ void LOADERDECL VertexLoader_Normal::Normal_Index8_Byte_Expand16()
{ {
u8 Index = DataReadU8(); u8 Index = DataReadU8();
const s8* pData = (const s8 *)(cached_arraybases[ARRAY_NORMAL] + (Index * arraystrides[ARRAY_NORMAL])); const s8* pData = (const s8 *)(cached_arraybases[ARRAY_NORMAL] + (Index * arraystrides[ARRAY_NORMAL]));
((s16*)VertexManager::s_pCurBufferPointer)[0] = (((s16)pData[0]) << 8) | (pData[0] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[0] = Expands8Tos16(pData[0]);
((s16*)VertexManager::s_pCurBufferPointer)[1] = (((s16)pData[1]) << 8) | (pData[1] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[1] = Expands8Tos16(pData[1]);
((s16*)VertexManager::s_pCurBufferPointer)[2] = (((s16)pData[2]) << 8) | (pData[2] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[2] = Expands8Tos16(pData[2]);
((s16*)VertexManager::s_pCurBufferPointer)[3] = 0; ((s16*)VertexManager::s_pCurBufferPointer)[3] = 0;
VertexManager::s_pCurBufferPointer += 8; VertexManager::s_pCurBufferPointer += 8;
LOG_NORM16(); LOG_NORM16();
@ -311,9 +312,9 @@ void LOADERDECL VertexLoader_Normal::Normal_Index8_Byte3_Indices1_Expand16()
const s8* pData = (const s8*)(cached_arraybases[ARRAY_NORMAL] + (Index * arraystrides[ARRAY_NORMAL])); const s8* pData = (const s8*)(cached_arraybases[ARRAY_NORMAL] + (Index * arraystrides[ARRAY_NORMAL]));
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
((s16*)VertexManager::s_pCurBufferPointer)[0] = (((s16)pData[3 * i]) << 8) | (pData[3 * i] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[0] = Expands8Tos16(pData[3 * i]);
((s16*)VertexManager::s_pCurBufferPointer)[1] = (((s16)pData[3 * i + 1]) << 8) | (pData[3 * i + 1] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[1] = Expands8Tos16(pData[3 * i + 1]);
((s16*)VertexManager::s_pCurBufferPointer)[2] = (((s16)pData[3 * i + 2]) << 8) | (pData[3 * i + 2] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[2] = Expands8Tos16(pData[3 * i + 2]);
((s16*)VertexManager::s_pCurBufferPointer)[3] = 0; ((s16*)VertexManager::s_pCurBufferPointer)[3] = 0;
VertexManager::s_pCurBufferPointer += 8; VertexManager::s_pCurBufferPointer += 8;
LOG_NORM16(); LOG_NORM16();
@ -369,9 +370,9 @@ void LOADERDECL VertexLoader_Normal::Normal_Index8_Byte3_Indices3_Expand16()
{ {
u8 Index = DataReadU8(); u8 Index = DataReadU8();
const s8* pData = (const s8 *)(cached_arraybases[ARRAY_NORMAL] + (Index * arraystrides[ARRAY_NORMAL]) + 2*3*i); const s8* pData = (const s8 *)(cached_arraybases[ARRAY_NORMAL] + (Index * arraystrides[ARRAY_NORMAL]) + 2*3*i);
((s16*)VertexManager::s_pCurBufferPointer)[0] = (((s16)pData[0]) << 8) | (pData[0] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[0] = Expands8Tos16(pData[0]);
((s16*)VertexManager::s_pCurBufferPointer)[1] = (((s16)pData[1]) << 8) | (pData[1] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[1] = Expands8Tos16(pData[1]);
((s16*)VertexManager::s_pCurBufferPointer)[2] = (((s16)pData[2]) << 8) | (pData[2] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[2] = Expands8Tos16(pData[2]);
((s16*)VertexManager::s_pCurBufferPointer)[3] = 0; ((s16*)VertexManager::s_pCurBufferPointer)[3] = 0;
VertexManager::s_pCurBufferPointer += 8; VertexManager::s_pCurBufferPointer += 8;
LOG_NORM16(); LOG_NORM16();
@ -426,9 +427,9 @@ void LOADERDECL VertexLoader_Normal::Normal_Index16_Byte_Expand16()
{ {
u16 Index = DataReadU16(); u16 Index = DataReadU16();
const s8* pData = (const s8 *)(cached_arraybases[ARRAY_NORMAL] + (Index * arraystrides[ARRAY_NORMAL])); const s8* pData = (const s8 *)(cached_arraybases[ARRAY_NORMAL] + (Index * arraystrides[ARRAY_NORMAL]));
((s16*)VertexManager::s_pCurBufferPointer)[0] = (((s16)pData[0]) << 8) | (pData[0] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[0] = Expands8Tos16(pData[0]);
((s16*)VertexManager::s_pCurBufferPointer)[1] = (((s16)pData[1]) << 8) | (pData[1] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[1] = Expands8Tos16(pData[1]);
((s16*)VertexManager::s_pCurBufferPointer)[2] = (((s16)pData[2]) << 8) | (pData[3] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[2] = Expands8Tos16(pData[2]);
((s16*)VertexManager::s_pCurBufferPointer)[3] = 0; ((s16*)VertexManager::s_pCurBufferPointer)[3] = 0;
VertexManager::s_pCurBufferPointer += 8; VertexManager::s_pCurBufferPointer += 8;
LOG_NORM16(); LOG_NORM16();
@ -493,9 +494,9 @@ void LOADERDECL VertexLoader_Normal::Normal_Index16_Byte3_Indices1_Expand16()
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
((s16*)VertexManager::s_pCurBufferPointer)[0] = (((s16)pData[3 * i]) << 8) | (pData[3 * i] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[0] = Expands8Tos16(pData[3 * i]);
((s16*)VertexManager::s_pCurBufferPointer)[1] = (((s16)pData[3 * i + 1]) << 8) | (pData[3 * i + 1] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[1] = Expands8Tos16(pData[3 * i + 1]);
((s16*)VertexManager::s_pCurBufferPointer)[2] = (((s16)pData[3 * i + 2]) << 8) | (pData[3 * i + 2] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[2] = Expands8Tos16(pData[3 * i + 2]);
((s16*)VertexManager::s_pCurBufferPointer)[3] = 0; ((s16*)VertexManager::s_pCurBufferPointer)[3] = 0;
VertexManager::s_pCurBufferPointer += 8; VertexManager::s_pCurBufferPointer += 8;
LOG_NORM16(); LOG_NORM16();
@ -553,9 +554,9 @@ void LOADERDECL VertexLoader_Normal::Normal_Index16_Byte3_Indices3_Expand16()
{ {
u16 Index = DataReadU16(); u16 Index = DataReadU16();
const s8* pData = (const s8 *)(cached_arraybases[ARRAY_NORMAL] + (Index * arraystrides[ARRAY_NORMAL]) + 2*3*i); const s8* pData = (const s8 *)(cached_arraybases[ARRAY_NORMAL] + (Index * arraystrides[ARRAY_NORMAL]) + 2*3*i);
((s16*)VertexManager::s_pCurBufferPointer)[0] = (((s16)pData[0]) << 8) | (pData[0] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[0] = Expands8Tos16(pData[0]);
((s16*)VertexManager::s_pCurBufferPointer)[1] = (((s16)pData[1]) << 8) | (pData[1] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[1] = Expands8Tos16(pData[1]);
((s16*)VertexManager::s_pCurBufferPointer)[2] = (((s16)pData[2]) << 8) | (pData[3] & 0x7F); ((s16*)VertexManager::s_pCurBufferPointer)[2] = Expands8Tos16(pData[2]);
((s16*)VertexManager::s_pCurBufferPointer)[3] = 0; ((s16*)VertexManager::s_pCurBufferPointer)[3] = 0;
VertexManager::s_pCurBufferPointer += 8; VertexManager::s_pCurBufferPointer += 8;
LOG_NORM16(); LOG_NORM16();