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

VertexLoaderX64: fix a bunch of stuff 

Suggestions by @degasus and @FioraAeterna.
This commit is contained in:
Tillmann Karras 2015-01-18 05:13:00 +01:00
parent dc01e261d1
commit 1855d56f1a
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/VideoCommon/CPMemory.h
View File

@ -26,7 +26,6 @@ enum
INDEX16 = 3, INDEX16 = 3,
MASK_INDEXED = 2, MASK_INDEXED = 2,
MASK_ALL = 3,
}; };
enum enum

7
Source/Core/VideoCommon/VertexLoaderX64.cpp
View File

@ -153,6 +153,7 @@ void VertexLoaderX64::ReadColor(OpArg data, u64 attribute, int format, int eleme
case FORMAT_32B_888x: case FORMAT_32B_888x:
case FORMAT_32B_8888: case FORMAT_32B_8888:
MOV(32, R(scratch1), data); MOV(32, R(scratch1), data);
// See VertexLoader_Color.cpp for a comment on this condition.
if (format != FORMAT_32B_8888 || !elements) if (format != FORMAT_32B_8888 || !elements)
OR(32, R(scratch1), Imm32(0xFF000000)); OR(32, R(scratch1), Imm32(0xFF000000));
MOV(32, MDisp(dst_reg, m_dst_ofs), R(scratch1)); MOV(32, MDisp(dst_reg, m_dst_ofs), R(scratch1));
@ -327,7 +328,7 @@ void VertexLoaderX64::GenerateVertexLoader()
if (m_VtxDesc.Normal) if (m_VtxDesc.Normal)
{ {
static const u8 map[] = {7, 6, 15, 14, 30}; static const u8 map[] = {7, 6, 15, 14, 0};
u8 scaling_exponent = map[m_VtxAttr.NormalFormat]; u8 scaling_exponent = map[m_VtxAttr.NormalFormat];
for (int i = 0; i < (m_VtxAttr.NormalElements ? 3 : 1); i++) for (int i = 0; i < (m_VtxAttr.NormalElements ? 3 : 1); i++)
@ -385,8 +386,6 @@ void VertexLoaderX64::GenerateVertexLoader()
m_native_vtx_decl.texcoords[i].type = VAR_FLOAT; m_native_vtx_decl.texcoords[i].type = VAR_FLOAT;
m_native_vtx_decl.texcoords[i].integer = false; m_native_vtx_decl.texcoords[i].integer = false;
MOVZX(64, 8, scratch1, MDisp(src_reg, texmatidx_ofs[i])); MOVZX(64, 8, scratch1, MDisp(src_reg, texmatidx_ofs[i]));
PXOR(XMM0, R(XMM0));
CVTSI2SS(XMM0, R(scratch1));
if (tc[i]) if (tc[i])
{ {
CVTSI2SS(XMM0, R(scratch1)); CVTSI2SS(XMM0, R(scratch1));
@ -422,7 +421,7 @@ void VertexLoaderX64::GenerateVertexLoader()
RET(); RET();
SetJumpTarget(m_skip_vertex); SetJumpTarget(m_skip_vertex);
ADD(32, R(skipped_reg), Imm8(m_VtxDesc.Position == INDEX8 ? 1 : 2)); ADD(32, R(skipped_reg), Imm8(1));
JMP(cont); JMP(cont);
} }
else else