diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-07-26 02:03:03 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-07-26 02:03:03 +0200 |
| commit | 906b05cb1c1a88c2af3d83c2cd422822abe143fe (patch) | |
| tree | ec61a2703b69dd266d1d2b6274ae0b4d07c45694 /Source/Core/VideoCommon | |
| parent | 5c4e5e9f8a79e932ab0ea96bdbdf12aceac89de0 (diff) | |
| parent | 73f9a22e2ef8af906a116ad67f1054cc964ae3f0 (diff) | |
Merge pull request #672 from delroth/vertex-loader
Vertex loader: reduce dependency on global state
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoader.cpp | 113 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoader.h | 26 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoaderManager.cpp | 43 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoaderManager.h | 2 |
4 files changed, 93 insertions, 91 deletions
diff --git a/Source/Core/VideoCommon/VertexLoader.cpp b/Source/Core/VideoCommon/VertexLoader.cpp index 4087554716..9417b7e78f 100644 --- a/Source/Core/VideoCommon/VertexLoader.cpp +++ b/Source/Core/VideoCommon/VertexLoader.cpp @@ -22,7 +22,6 @@ #include "VideoCommon/VertexLoader_Position.h" #include "VideoCommon/VertexLoader_TextCoord.h" #include "VideoCommon/VertexLoaderManager.h" -#include "VideoCommon/VertexManagerBase.h" #include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" @@ -31,8 +30,6 @@ #define COMPILED_CODE_SIZE 4096 -NativeVertexFormat *g_nativeVertexFmt; - #ifndef _WIN32 #undef inline #define inline @@ -468,7 +465,7 @@ VertexLoader::VertexLoader(const TVtxDesc &vtx_desc, const VAT &vtx_attr) VertexLoader_TextCoord::Init(); m_VtxDesc = vtx_desc; - SetVAT(vtx_attr.g0.Hex, vtx_attr.g1.Hex, vtx_attr.g2.Hex); + SetVAT(vtx_attr); #ifdef USE_VERTEX_LOADER_JIT AllocCodeSpace(COMPILED_CODE_SIZE); @@ -539,8 +536,7 @@ void VertexLoader::CompileVertexTranslator() // Position in pc vertex format. int nat_offset = 0; - PortableVertexDeclaration vtx_decl; - memset(&vtx_decl, 0, sizeof(vtx_decl)); + memset(&m_native_vtx_decl, 0, sizeof(m_native_vtx_decl)); // Position Matrix Index if (m_VtxDesc.PosMatIdx) @@ -572,11 +568,11 @@ void VertexLoader::CompileVertexTranslator() } m_VertexSize += VertexLoader_Position::GetSize(m_VtxDesc.Position, m_VtxAttr.PosFormat, m_VtxAttr.PosElements); nat_offset += 12; - vtx_decl.position.components = 3; - vtx_decl.position.enable = true; - vtx_decl.position.offset = 0; - vtx_decl.position.type = VAR_FLOAT; - vtx_decl.position.integer = false; + m_native_vtx_decl.position.components = 3; + m_native_vtx_decl.position.enable = true; + m_native_vtx_decl.position.offset = 0; + m_native_vtx_decl.position.type = VAR_FLOAT; + m_native_vtx_decl.position.integer = false; // Normals if (m_VtxDesc.Normal != NOT_PRESENT) @@ -598,11 +594,11 @@ void VertexLoader::CompileVertexTranslator() for (int i = 0; i < (vtx_attr.NormalElements ? 3 : 1); i++) { - vtx_decl.normals[i].components = 3; - vtx_decl.normals[i].enable = true; - vtx_decl.normals[i].offset = nat_offset; - vtx_decl.normals[i].type = VAR_FLOAT; - vtx_decl.normals[i].integer = false; + m_native_vtx_decl.normals[i].components = 3; + m_native_vtx_decl.normals[i].enable = true; + m_native_vtx_decl.normals[i].offset = nat_offset; + m_native_vtx_decl.normals[i].type = VAR_FLOAT; + m_native_vtx_decl.normals[i].integer = false; nat_offset += 12; } @@ -613,9 +609,9 @@ void VertexLoader::CompileVertexTranslator() for (int i = 0; i < 2; i++) { - vtx_decl.colors[i].components = 4; - vtx_decl.colors[i].type = VAR_UNSIGNED_BYTE; - vtx_decl.colors[i].integer = false; + m_native_vtx_decl.colors[i].components = 4; + m_native_vtx_decl.colors[i].type = VAR_UNSIGNED_BYTE; + m_native_vtx_decl.colors[i].integer = false; switch (col[i]) { case NOT_PRESENT: @@ -663,8 +659,8 @@ void VertexLoader::CompileVertexTranslator() if (col[i] != NOT_PRESENT) { components |= VB_HAS_COL0 << i; - vtx_decl.colors[i].offset = nat_offset; - vtx_decl.colors[i].enable = true; + m_native_vtx_decl.colors[i].offset = nat_offset; + m_native_vtx_decl.colors[i].enable = true; nat_offset += 4; } } @@ -672,9 +668,9 @@ void VertexLoader::CompileVertexTranslator() // Texture matrix indices (remove if corresponding texture coordinate isn't enabled) for (int i = 0; i < 8; i++) { - vtx_decl.texcoords[i].offset = nat_offset; - vtx_decl.texcoords[i].type = VAR_FLOAT; - vtx_decl.texcoords[i].integer = false; + m_native_vtx_decl.texcoords[i].offset = nat_offset; + m_native_vtx_decl.texcoords[i].type = VAR_FLOAT; + m_native_vtx_decl.texcoords[i].integer = false; const int format = m_VtxAttr.texCoord[i].Format; const int elements = m_VtxAttr.texCoord[i].Elements; @@ -696,18 +692,18 @@ void VertexLoader::CompileVertexTranslator() if (components & (VB_HAS_TEXMTXIDX0 << i)) { - vtx_decl.texcoords[i].enable = true; + m_native_vtx_decl.texcoords[i].enable = true; if (tc[i] != NOT_PRESENT) { // if texmtx is included, texcoord will always be 3 floats, z will be the texmtx index - vtx_decl.texcoords[i].components = 3; + m_native_vtx_decl.texcoords[i].components = 3; nat_offset += 12; WriteCall(m_VtxAttr.texCoord[i].Elements ? TexMtx_Write_Float : TexMtx_Write_Float2); } else { components |= VB_HAS_UV0 << i; // have to include since using now - vtx_decl.texcoords[i].components = 4; + m_native_vtx_decl.texcoords[i].components = 4; nat_offset += 16; // still include the texture coordinate, but this time as 6 + 2 bytes WriteCall(TexMtx_Write_Float4); } @@ -716,8 +712,8 @@ void VertexLoader::CompileVertexTranslator() { if (tc[i] != NOT_PRESENT) { - vtx_decl.texcoords[i].enable = true; - vtx_decl.texcoords[i].components = vtx_attr.texCoord[i].Elements ? 2 : 1; + m_native_vtx_decl.texcoords[i].enable = true; + m_native_vtx_decl.texcoords[i].components = vtx_attr.texCoord[i].Elements ? 2 : 1; nat_offset += 4 * (vtx_attr.texCoord[i].Elements ? 2 : 1); } } @@ -746,16 +742,16 @@ void VertexLoader::CompileVertexTranslator() if (m_VtxDesc.PosMatIdx) { WriteCall(PosMtx_Write); - vtx_decl.posmtx.components = 4; - vtx_decl.posmtx.enable = true; - vtx_decl.posmtx.offset = nat_offset; - vtx_decl.posmtx.type = VAR_UNSIGNED_BYTE; - vtx_decl.posmtx.integer = true; + m_native_vtx_decl.posmtx.components = 4; + m_native_vtx_decl.posmtx.enable = true; + m_native_vtx_decl.posmtx.offset = nat_offset; + m_native_vtx_decl.posmtx.type = VAR_UNSIGNED_BYTE; + m_native_vtx_decl.posmtx.integer = true; nat_offset += 4; } - native_stride = nat_offset; - vtx_decl.stride = native_stride; + m_native_components = components; + m_native_vtx_decl.stride = nat_offset; #ifdef USE_VERTEX_LOADER_JIT // End loop here @@ -770,7 +766,6 @@ void VertexLoader::CompileVertexTranslator() ABI_PopAllCalleeSavedRegsAndAdjustStack(); RET(); #endif - m_NativeFmt = VertexLoaderManager::GetNativeVertexFormat(vtx_decl, components); } void VertexLoader::WriteCall(TPipelineFunction func) @@ -813,31 +808,23 @@ void VertexLoader::WriteSetVariable(int bits, void *address, OpArg value) } #endif -void VertexLoader::SetupRunVertices(int vtx_attr_group, int primitive, int const count) +void VertexLoader::SetupRunVertices(const VAT& vat, int primitive, int const count) { m_numLoadedVertices += count; - // Flush if our vertex format is different from the currently set. - if (g_nativeVertexFmt != nullptr && g_nativeVertexFmt != m_NativeFmt) - { - VertexManager::Flush(); - // Also move the Set() here? - } - g_nativeVertexFmt = m_NativeFmt; - // Load position and texcoord scale factors. - m_VtxAttr.PosFrac = g_VtxAttr[vtx_attr_group].g0.PosFrac; - m_VtxAttr.texCoord[0].Frac = g_VtxAttr[vtx_attr_group].g0.Tex0Frac; - m_VtxAttr.texCoord[1].Frac = g_VtxAttr[vtx_attr_group].g1.Tex1Frac; - m_VtxAttr.texCoord[2].Frac = g_VtxAttr[vtx_attr_group].g1.Tex2Frac; - m_VtxAttr.texCoord[3].Frac = g_VtxAttr[vtx_attr_group].g1.Tex3Frac; - m_VtxAttr.texCoord[4].Frac = g_VtxAttr[vtx_attr_group].g2.Tex4Frac; - m_VtxAttr.texCoord[5].Frac = g_VtxAttr[vtx_attr_group].g2.Tex5Frac; - m_VtxAttr.texCoord[6].Frac = g_VtxAttr[vtx_attr_group].g2.Tex6Frac; - m_VtxAttr.texCoord[7].Frac = g_VtxAttr[vtx_attr_group].g2.Tex7Frac; + m_VtxAttr.PosFrac = vat.g0.PosFrac; + m_VtxAttr.texCoord[0].Frac = vat.g0.Tex0Frac; + m_VtxAttr.texCoord[1].Frac = vat.g1.Tex1Frac; + m_VtxAttr.texCoord[2].Frac = vat.g1.Tex2Frac; + m_VtxAttr.texCoord[3].Frac = vat.g1.Tex3Frac; + m_VtxAttr.texCoord[4].Frac = vat.g2.Tex4Frac; + m_VtxAttr.texCoord[5].Frac = vat.g2.Tex5Frac; + m_VtxAttr.texCoord[6].Frac = vat.g2.Tex6Frac; + m_VtxAttr.texCoord[7].Frac = vat.g2.Tex7Frac; posScale = fractionTable[m_VtxAttr.PosFrac]; - if (m_NativeFmt->m_components & VB_HAS_UVALL) + if (m_native_components & VB_HAS_UVALL) for (int i = 0; i < 8; i++) tcScale[i] = fractionTable[m_VtxAttr.texCoord[i].Frac]; for (int i = 0; i < 2; i++) @@ -870,7 +857,7 @@ void VertexLoader::ConvertVertices ( int count ) #endif } -void VertexLoader::RunVertices(int vtx_attr_group, int primitive, int const count) +void VertexLoader::RunVertices(const VAT& vat, int primitive, int const count) { if (bpmem.genMode.cullmode == 3 && primitive < 5) { @@ -878,8 +865,9 @@ void VertexLoader::RunVertices(int vtx_attr_group, int primitive, int const coun DataSkip(count * m_VertexSize); return; } - SetupRunVertices(vtx_attr_group, primitive, count); - VertexManager::PrepareForAdditionalData(primitive, count, native_stride); + SetupRunVertices(vat, primitive, count); + VertexManager::PrepareForAdditionalData(primitive, count, + m_native_vtx_decl.stride); ConvertVertices(count); IndexGenerator::AddIndices(primitive, count); @@ -887,13 +875,8 @@ void VertexLoader::RunVertices(int vtx_attr_group, int primitive, int const coun INCSTAT(stats.thisFrame.numPrimitiveJoins); } -void VertexLoader::SetVAT(u32 _group0, u32 _group1, u32 _group2) +void VertexLoader::SetVAT(const VAT& vat) { - VAT vat; - vat.g0.Hex = _group0; - vat.g1.Hex = _group1; - vat.g2.Hex = _group2; - m_VtxAttr.PosElements = vat.g0.PosElements; m_VtxAttr.PosFormat = vat.g0.PosFormat; m_VtxAttr.PosFrac = vat.g0.PosFrac; diff --git a/Source/Core/VideoCommon/VertexLoader.h b/Source/Core/VideoCommon/VertexLoader.h index 7e40bc8003..8738b99963 100644 --- a/Source/Core/VideoCommon/VertexLoader.h +++ b/Source/Core/VideoCommon/VertexLoader.h @@ -24,7 +24,6 @@ #endif // They are used for the communication with the loader functions -extern NativeVertexFormat *g_nativeVertexFmt; extern int tcIndex; extern int colIndex; extern int colElements[2]; @@ -40,13 +39,13 @@ public: { } - void InitFromCurrentState(int vtx_attr_group) + VertexLoaderUID(const TVtxDesc& vtx_desc, const VAT& vat) { - vid[0] = g_VtxDesc.Hex & 0xFFFFFFFF; - vid[1] = g_VtxDesc.Hex >> 32; - vid[2] = g_VtxAttr[vtx_attr_group].g0.Hex & ~VAT_0_FRACBITS; - vid[3] = g_VtxAttr[vtx_attr_group].g1.Hex & ~VAT_1_FRACBITS; - vid[4] = g_VtxAttr[vtx_attr_group].g2.Hex & ~VAT_2_FRACBITS; + vid[0] = vtx_desc.Hex & 0xFFFFFFFF; + vid[1] = vtx_desc.Hex >> 32; + vid[2] = vat.g0.Hex & ~VAT_0_FRACBITS; + vid[3] = vat.g1.Hex & ~VAT_1_FRACBITS; + vid[4] = vat.g2.Hex & ~VAT_2_FRACBITS; hash = CalculateHash(); } @@ -106,9 +105,12 @@ public: ~VertexLoader(); int GetVertexSize() const {return m_VertexSize;} + u32 GetNativeComponents() const { return m_native_components; } + const PortableVertexDeclaration& GetNativeVertexDeclaration() const + { return m_native_vtx_decl; } - void SetupRunVertices(int vtx_attr_group, int primitive, int const count); - void RunVertices(int vtx_attr_group, int primitive, int count); + void SetupRunVertices(const VAT& vat, int primitive, int const count); + void RunVertices(const VAT& vat, int primitive, int count); // For debugging / profiling void AppendToString(std::string *dest) const; @@ -122,8 +124,8 @@ private: TVtxDesc m_VtxDesc; // Not really used currently - or well it is, but could be easily avoided. // PC vertex format - NativeVertexFormat *m_NativeFmt; - int native_stride; + u32 m_native_components; + PortableVertexDeclaration m_native_vtx_decl; #ifndef USE_VERTEX_LOADER_JIT // Pipeline. @@ -135,7 +137,7 @@ private: int m_numLoadedVertices; - void SetVAT(u32 _group0, u32 _group1, u32 _group2); + void SetVAT(const VAT& vat); void CompileVertexTranslator(); void ConvertVertices(int count); diff --git a/Source/Core/VideoCommon/VertexLoaderManager.cpp b/Source/Core/VideoCommon/VertexLoaderManager.cpp index dd1196a48e..d5e74a0e11 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.cpp +++ b/Source/Core/VideoCommon/VertexLoaderManager.cpp @@ -12,11 +12,13 @@ #include "VideoCommon/Statistics.h" #include "VideoCommon/VertexLoader.h" #include "VideoCommon/VertexLoaderManager.h" +#include "VideoCommon/VertexManagerBase.h" #include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/VideoCommon.h" static int s_attr_dirty; // bitfield +static NativeVertexFormat* s_current_vtx_fmt; static VertexLoader *g_VertexLoaders[8]; namespace std @@ -104,8 +106,7 @@ static VertexLoader* RefreshLoader(int vtx_attr_group) { if ((s_attr_dirty >> vtx_attr_group) & 1) { - VertexLoaderUID uid; - uid.InitFromCurrentState(vtx_attr_group); + VertexLoaderUID uid(g_VtxDesc, g_VtxAttr[vtx_attr_group]); VertexLoaderMap::iterator iter = g_VertexLoaderMap.find(uid); if (iter != g_VertexLoaderMap.end()) { @@ -123,11 +124,35 @@ static VertexLoader* RefreshLoader(int vtx_attr_group) return g_VertexLoaders[vtx_attr_group]; } +static NativeVertexFormat* GetNativeVertexFormat(const PortableVertexDeclaration& format, + u32 components) +{ + auto& native = s_native_vertex_map[format]; + if (!native) + { + auto raw_pointer = g_vertex_manager->CreateNativeVertexFormat(); + native = std::unique_ptr<NativeVertexFormat>(raw_pointer); + native->Initialize(format); + native->m_components = components; + } + return native.get(); +} + void RunVertices(int vtx_attr_group, int primitive, int count) { if (!count) return; - RefreshLoader(vtx_attr_group)->RunVertices(vtx_attr_group, primitive, count); + VertexLoader* loader = RefreshLoader(vtx_attr_group); + + // If the native vertex format changed, force a flush. + NativeVertexFormat* required_vtx_fmt = GetNativeVertexFormat( + loader->GetNativeVertexDeclaration(), + loader->GetNativeComponents()); + if (required_vtx_fmt != s_current_vtx_fmt) + VertexManager::Flush(); + s_current_vtx_fmt = required_vtx_fmt; + + RefreshLoader(vtx_attr_group)->RunVertices(g_VtxAttr[vtx_attr_group], primitive, count); } int GetVertexSize(int vtx_attr_group) @@ -135,17 +160,9 @@ int GetVertexSize(int vtx_attr_group) return RefreshLoader(vtx_attr_group)->GetVertexSize(); } -NativeVertexFormat* GetNativeVertexFormat(const PortableVertexDeclaration& format, u32 components) +NativeVertexFormat* GetCurrentVertexFormat() { - auto& native = s_native_vertex_map[format]; - if (!native) - { - auto raw_pointer = g_vertex_manager->CreateNativeVertexFormat(); - native = std::unique_ptr<NativeVertexFormat>(raw_pointer); - native->m_components = components; - native->Initialize(format); - } - return native.get(); + return s_current_vtx_fmt; } } // namespace diff --git a/Source/Core/VideoCommon/VertexLoaderManager.h b/Source/Core/VideoCommon/VertexLoaderManager.h index 909701bf6d..17bf13c3ba 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.h +++ b/Source/Core/VideoCommon/VertexLoaderManager.h @@ -22,7 +22,7 @@ namespace VertexLoaderManager // For debugging void AppendListToString(std::string *dest); - NativeVertexFormat* GetNativeVertexFormat(const PortableVertexDeclaration& format, u32 components); + NativeVertexFormat* GetCurrentVertexFormat(); }; void RecomputeCachedArraybases(); |
