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

Merge pull request #928 from delroth/master 

VertexLoader: Change VtxDesc to use u64 instead of u32
This commit is contained in:
shuffle2 2014-09-01 02:57:59 -07:00
parent f8e24de833 494a60e41b
commit 5e9c910256
10 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp
View File

@ -139,7 +139,7 @@ void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory &cpMe
const VAT &vtxAttr = cpMem.vtxAttr[vatIndex]; const VAT &vtxAttr = cpMem.vtxAttr[vatIndex];
// Colors // Colors
const u32 colDesc[2] = {vtxDesc.Color0, vtxDesc.Color1}; const u64 colDesc[2] = {vtxDesc.Color0, vtxDesc.Color1};
const u32 colComp[2] = {vtxAttr.g0.Color0Comp, vtxAttr.g0.Color1Comp}; const u32 colComp[2] = {vtxAttr.g0.Color0Comp, vtxAttr.g0.Color1Comp};
const u32 tcElements[8] = const u32 tcElements[8] =

10
Source/Core/VideoBackends/Software/SWVertexLoader.cpp
View File

@ -52,21 +52,21 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
tcScale[7] = 1.0f / float(1 << m_CurrentVat->g2.Tex7Frac); tcScale[7] = 1.0f / float(1 << m_CurrentVat->g2.Tex7Frac);
//TexMtx //TexMtx
const u32 tmDesc[8] = { const u64 tmDesc[8] = {
g_VtxDesc.Tex0MatIdx, g_VtxDesc.Tex1MatIdx, g_VtxDesc.Tex2MatIdx, g_VtxDesc.Tex3MatIdx, g_VtxDesc.Tex0MatIdx, g_VtxDesc.Tex1MatIdx, g_VtxDesc.Tex2MatIdx, g_VtxDesc.Tex3MatIdx,
g_VtxDesc.Tex4MatIdx, g_VtxDesc.Tex5MatIdx, g_VtxDesc.Tex6MatIdx, g_VtxDesc.Tex7MatIdx g_VtxDesc.Tex4MatIdx, g_VtxDesc.Tex5MatIdx, g_VtxDesc.Tex6MatIdx, g_VtxDesc.Tex7MatIdx
}; };
// Colors // Colors
const u32 colDesc[2] = {g_VtxDesc.Color0, g_VtxDesc.Color1}; const u64 colDesc[2] = {g_VtxDesc.Color0, g_VtxDesc.Color1};
colElements[0] = m_CurrentVat->g0.Color0Elements; colElements[0] = m_CurrentVat->g0.Color0Elements;
colElements[1] = m_CurrentVat->g0.Color1Elements; colElements[1] = m_CurrentVat->g0.Color1Elements;
const u32 colComp[2] = {m_CurrentVat->g0.Color0Comp, m_CurrentVat->g0.Color1Comp}; const u32 colComp[2] = {m_CurrentVat->g0.Color0Comp, m_CurrentVat->g0.Color1Comp};
// TextureCoord // TextureCoord
const u32 tcDesc[8] = { const u64 tcDesc[8] = {
g_VtxDesc.Tex0Coord, g_VtxDesc.Tex1Coord, g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord, g_VtxDesc.Tex0Coord, g_VtxDesc.Tex1Coord, g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord,
g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const u32)((g_VtxDesc.Hex >> 31) & 3) g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, g_VtxDesc.Tex7Coord
}; };
const u32 tcElements[8] = { const u32 tcElements[8] = {
m_CurrentVat->g0.Tex0CoordElements, m_CurrentVat->g1.Tex1CoordElements, m_CurrentVat->g1.Tex2CoordElements, m_CurrentVat->g0.Tex0CoordElements, m_CurrentVat->g1.Tex1CoordElements, m_CurrentVat->g1.Tex2CoordElements,
@ -219,7 +219,7 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
// Texture matrix indices (remove if corresponding texture coordinate isn't enabled) // Texture matrix indices (remove if corresponding texture coordinate isn't enabled)
for (int i = 0; i < 8; i++) for (int i = 0; i < 8; i++)
{ {
const int desc = tcDesc[i]; const int desc = (int)tcDesc[i];
const int format = tcFormat[i]; const int format = tcFormat[i];
const int elements = tcElements[i]; const int elements = tcElements[i];
_assert_msg_(VIDEO, NOT_PRESENT <= desc && desc <= INDEX16, "Invalid texture coordinates description!\n(desc = %d)", desc); _assert_msg_(VIDEO, NOT_PRESENT <= desc && desc <= INDEX16, "Invalid texture coordinates description!\n(desc = %d)", desc);

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

@ -59,33 +59,33 @@ union TVtxDesc
{ {
// 0: not present // 0: not present
// 1: present // 1: present
u32 PosMatIdx : 1; u64 PosMatIdx : 1;
u32 Tex0MatIdx : 1; u64 Tex0MatIdx : 1;
u32 Tex1MatIdx : 1; u64 Tex1MatIdx : 1;
u32 Tex2MatIdx : 1; u64 Tex2MatIdx : 1;
u32 Tex3MatIdx : 1; u64 Tex3MatIdx : 1;
u32 Tex4MatIdx : 1; u64 Tex4MatIdx : 1;
u32 Tex5MatIdx : 1; u64 Tex5MatIdx : 1;
u32 Tex6MatIdx : 1; u64 Tex6MatIdx : 1;
u32 Tex7MatIdx : 1; u64 Tex7MatIdx : 1;
// 00: not present // 00: not present
// 01: direct // 01: direct
// 10: 8 bit index // 10: 8 bit index
// 11: 16 bit index // 11: 16 bit index
u32 Position : 2; u64 Position : 2;
u32 Normal : 2; u64 Normal : 2;
u32 Color0 : 2; u64 Color0 : 2;
u32 Color1 : 2; u64 Color1 : 2;
u32 Tex0Coord : 2; u64 Tex0Coord : 2;
u32 Tex1Coord : 2; u64 Tex1Coord : 2;
u32 Tex2Coord : 2; u64 Tex2Coord : 2;
u32 Tex3Coord : 2; u64 Tex3Coord : 2;
u32 Tex4Coord : 2; u64 Tex4Coord : 2;
u32 Tex5Coord : 2; u64 Tex5Coord : 2;
u32 Tex6Coord : 2; u64 Tex6Coord : 2;
u32 Tex7Coord : 2; u64 Tex7Coord : 2;
u32 :31; u64 :31;
}; };
struct struct

19
Source/Core/VideoCommon/VertexLoader.cpp
View File

@ -518,14 +518,11 @@ void VertexLoader::CompileVertexTranslator()
#endif #endif
// Colors // Colors
const u32 col[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1}; const u64 col[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1};
// TextureCoord // TextureCoord
// Since m_VtxDesc.Text7Coord is broken across a 32 bit word boundary, retrieve its value manually. const u64 tc[8] = {
// If we didn't do this, the vertex format would be read as one bit offset from where it should be, making
// 01 become 00, and 10/11 become 01
const u32 tc[8] = {
m_VtxDesc.Tex0Coord, m_VtxDesc.Tex1Coord, m_VtxDesc.Tex2Coord, m_VtxDesc.Tex3Coord, m_VtxDesc.Tex0Coord, m_VtxDesc.Tex1Coord, m_VtxDesc.Tex2Coord, m_VtxDesc.Tex3Coord,
m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, (const u32)((m_VtxDesc.Hex >> 31) & 3) m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, m_VtxDesc.Tex7Coord
}; };
u32 components = 0; u32 components = 0;
@ -583,7 +580,7 @@ void VertexLoader::CompileVertexTranslator()
{ {
Host_SysMessage( Host_SysMessage(
StringFromFormat("VertexLoader_Normal::GetFunction(%i %i %i %i) returned zero!", StringFromFormat("VertexLoader_Normal::GetFunction(%i %i %i %i) returned zero!",
m_VtxDesc.Normal, m_VtxAttr.NormalFormat, (u32)m_VtxDesc.Normal, m_VtxAttr.NormalFormat,
m_VtxAttr.NormalElements, m_VtxAttr.NormalIndex3).c_str()); m_VtxAttr.NormalElements, m_VtxAttr.NormalIndex3).c_str());
} }
WriteCall(pFunc); WriteCall(pFunc);
@ -677,7 +674,7 @@ void VertexLoader::CompileVertexTranslator()
} }
else else
{ {
_assert_msg_(VIDEO, DIRECT <= tc[i] && tc[i] <= INDEX16, "Invalid texture coordinates!\n(tc[i] = %d)", tc[i]); _assert_msg_(VIDEO, DIRECT <= tc[i] && tc[i] <= INDEX16, "Invalid texture coordinates!\n(tc[i] = %d)", (u32)tc[i]);
_assert_msg_(VIDEO, FORMAT_UBYTE <= format && format <= FORMAT_FLOAT, "Invalid texture coordinates format!\n(format = %d)", format); _assert_msg_(VIDEO, FORMAT_UBYTE <= format && format <= FORMAT_FLOAT, "Invalid texture coordinates format!\n(format = %d)", format);
_assert_msg_(VIDEO, 0 <= elements && elements <= 1, "Invalid number of texture coordinates elements!\n(elements = %d)", elements); _assert_msg_(VIDEO, 0 <= elements && elements <= 1, "Invalid number of texture coordinates elements!\n(elements = %d)", elements);
@ -913,7 +910,7 @@ void VertexLoader::AppendToString(std::string *dest) const
}; };
dest->append(StringFromFormat("%ib skin: %i P: %i %s-%s ", dest->append(StringFromFormat("%ib skin: %i P: %i %s-%s ",
m_VertexSize, m_VtxDesc.PosMatIdx, m_VertexSize, (u32)m_VtxDesc.PosMatIdx,
m_VtxAttr.PosElements ? 3 : 2, posMode[m_VtxDesc.Position], posFormats[m_VtxAttr.PosFormat])); m_VtxAttr.PosElements ? 3 : 2, posMode[m_VtxDesc.Position], posFormats[m_VtxAttr.PosFormat]));
if (m_VtxDesc.Normal) if (m_VtxDesc.Normal)
@ -922,7 +919,7 @@ void VertexLoader::AppendToString(std::string *dest) const
m_VtxAttr.NormalElements, posMode[m_VtxDesc.Normal], posFormats[m_VtxAttr.NormalFormat])); m_VtxAttr.NormalElements, posMode[m_VtxDesc.Normal], posFormats[m_VtxAttr.NormalFormat]));
} }
u32 color_mode[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1}; u64 color_mode[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1};
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
{ {
if (color_mode[i]) if (color_mode[i])
@ -930,7 +927,7 @@ void VertexLoader::AppendToString(std::string *dest) const
dest->append(StringFromFormat("C%i: %i %s-%s ", i, m_VtxAttr.color[i].Elements, posMode[color_mode[i]], colorFormat[m_VtxAttr.color[i].Comp])); dest->append(StringFromFormat("C%i: %i %s-%s ", i, m_VtxAttr.color[i].Elements, posMode[color_mode[i]], colorFormat[m_VtxAttr.color[i].Comp]));
} }
} }
u32 tex_mode[8] = { u64 tex_mode[8] = {
m_VtxDesc.Tex0Coord, m_VtxDesc.Tex1Coord, m_VtxDesc.Tex2Coord, m_VtxDesc.Tex3Coord, m_VtxDesc.Tex0Coord, m_VtxDesc.Tex1Coord, m_VtxDesc.Tex2Coord, m_VtxDesc.Tex3Coord,
m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, m_VtxDesc.Tex7Coord m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, m_VtxDesc.Tex7Coord
}; };

4
Source/Core/VideoCommon/VertexLoader_Normal.cpp
View File

@ -182,13 +182,13 @@ void VertexLoader_Normal::Init()
m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_FLOAT] = Normal_Index_Indices3<u16, float>(); m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_FLOAT] = Normal_Index_Indices3<u16, float>();
} }
unsigned int VertexLoader_Normal::GetSize(unsigned int _type, unsigned int VertexLoader_Normal::GetSize(u64 _type,
unsigned int _format, unsigned int _elements, unsigned int _index3) unsigned int _format, unsigned int _elements, unsigned int _index3)
{ {
return m_Table[_type][_index3][_elements][_format].gc_size; return m_Table[_type][_index3][_elements][_format].gc_size;
} }
TPipelineFunction VertexLoader_Normal::GetFunction(unsigned int _type, TPipelineFunction VertexLoader_Normal::GetFunction(u64 _type,
unsigned int _format, unsigned int _elements, unsigned int _index3) unsigned int _format, unsigned int _elements, unsigned int _index3)
{ {
TPipelineFunction pFunc = m_Table[_type][_index3][_elements][_format].function; TPipelineFunction pFunc = m_Table[_type][_index3][_elements][_format].function;

4
Source/Core/VideoCommon/VertexLoader_Normal.h
View File

@ -14,11 +14,11 @@ public:
static void Init(); static void Init();
// GetSize // GetSize
static unsigned int GetSize(unsigned int _type, unsigned int _format, static unsigned int GetSize(u64 _type, unsigned int _format,
unsigned int _elements, unsigned int _index3); unsigned int _elements, unsigned int _index3);
// GetFunction // GetFunction
static TPipelineFunction GetFunction(unsigned int _type, static TPipelineFunction GetFunction(u64 _type,
unsigned int _format, unsigned int _elements, unsigned int _index3); unsigned int _format, unsigned int _elements, unsigned int _index3);
private: private:

4
Source/Core/VideoCommon/VertexLoader_Position.cpp
View File

@ -182,12 +182,12 @@ void VertexLoader_Position::Init()
} }
unsigned int VertexLoader_Position::GetSize(unsigned int _type, unsigned int _format, unsigned int _elements) unsigned int VertexLoader_Position::GetSize(u64 _type, unsigned int _format, unsigned int _elements)
{ {
return tableReadPositionVertexSize[_type][_format][_elements]; return tableReadPositionVertexSize[_type][_format][_elements];
} }
TPipelineFunction VertexLoader_Position::GetFunction(unsigned int _type, unsigned int _format, unsigned int _elements) TPipelineFunction VertexLoader_Position::GetFunction(u64 _type, unsigned int _format, unsigned int _elements)
{ {
return tableReadPosition[_type][_format][_elements]; return tableReadPosition[_type][_format][_elements];
} }

4
Source/Core/VideoCommon/VertexLoader_Position.h
View File

@ -11,9 +11,9 @@ public:
static void Init(); static void Init();
// GetSize // GetSize
static unsigned int GetSize(unsigned int _type, unsigned int _format, unsigned int _elements); static unsigned int GetSize(u64 _type, unsigned int _format, unsigned int _elements);
// GetFunction // GetFunction
static TPipelineFunction GetFunction(unsigned int _type, unsigned int _format, unsigned int _elements); static TPipelineFunction GetFunction(u64 _type, unsigned int _format, unsigned int _elements);
}; };

4
Source/Core/VideoCommon/VertexLoader_TextCoord.cpp
View File

@ -198,12 +198,12 @@ void VertexLoader_TextCoord::Init()
} }
unsigned int VertexLoader_TextCoord::GetSize(unsigned int _type, unsigned int _format, unsigned int _elements) unsigned int VertexLoader_TextCoord::GetSize(u64 _type, unsigned int _format, unsigned int _elements)
{ {
return tableReadTexCoordVertexSize[_type][_format][_elements]; return tableReadTexCoordVertexSize[_type][_format][_elements];
} }
TPipelineFunction VertexLoader_TextCoord::GetFunction(unsigned int _type, unsigned int _format, unsigned int _elements) TPipelineFunction VertexLoader_TextCoord::GetFunction(u64 _type, unsigned int _format, unsigned int _elements)
{ {
return tableReadTexCoord[_type][_format][_elements]; return tableReadTexCoord[_type][_format][_elements];
} }

4
Source/Core/VideoCommon/VertexLoader_TextCoord.h
View File

@ -14,10 +14,10 @@ public:
static void Init(); static void Init();
// GetSize // GetSize
static unsigned int GetSize(unsigned int _type, unsigned int _format, unsigned int _elements); static unsigned int GetSize(u64 _type, unsigned int _format, unsigned int _elements);
// GetFunction // GetFunction
static TPipelineFunction GetFunction(unsigned int _type, unsigned int _format, unsigned int _elements); static TPipelineFunction GetFunction(u64 _type, unsigned int _format, unsigned int _elements);
// GetDummyFunction // GetDummyFunction
// It is important to synchronize tcIndex. // It is important to synchronize tcIndex.