mirror of
https://github.com/cemu-project/Cemu.git
synced 2025-07-06 15:01:18 +12:00
fetch vertices manually if needed
This commit is contained in:
parent
a3bfde80b0
commit
94e8ed5a46
8 changed files with 215 additions and 149 deletions
|
@ -8,8 +8,12 @@
|
|||
#include "Cafe/HW/Latte/LegacyShaderDecompiler/LatteDecompilerInstructions.h"
|
||||
#include "Cafe/HW/Latte/Core/FetchShader.h"
|
||||
#include "Cafe/HW/Latte/ISA/LatteInstructions.h"
|
||||
#include "HW/Latte/Renderer/Renderer.h"
|
||||
#include "util/containers/LookupTableL3.h"
|
||||
#include "util/helpers/fspinlock.h"
|
||||
#if BOOST_OS_MACOS
|
||||
#include "Cafe/HW/Latte/Renderer/Metal/LatteToMtl.h"
|
||||
#endif
|
||||
#include <openssl/sha.h> /* SHA1_DIGEST_LENGTH */
|
||||
#include <openssl/evp.h> /* EVP_Digest */
|
||||
|
||||
|
@ -71,7 +75,7 @@ uint32 LatteShaderRecompiler_getAttributeAlignment(LatteParsedFetchShaderAttribu
|
|||
return 4;
|
||||
}
|
||||
|
||||
void LatteShader_calculateFSKey(LatteFetchShader* fetchShader)
|
||||
void LatteShader_calculateFSKey(LatteFetchShader* fetchShader, uint32* contextRegister)
|
||||
{
|
||||
uint64 key = 0;
|
||||
for (sint32 g = 0; g < fetchShader->bufferGroups.size(); g++)
|
||||
|
@ -104,11 +108,25 @@ void LatteShader_calculateFSKey(LatteFetchShader* fetchShader)
|
|||
key = std::rotl<uint64>(key, 8);
|
||||
key += (uint64)attrib->semanticId;
|
||||
key = std::rotl<uint64>(key, 8);
|
||||
key += (uint64)(attrib->offset & 3);
|
||||
key = std::rotl<uint64>(key, 2);
|
||||
if (g_renderer->GetType() == RendererAPI::Metal)
|
||||
key += (uint64)attrib->offset;
|
||||
else
|
||||
key += (uint64)(attrib->offset & 3);
|
||||
key = std::rotl<uint64>(key, 7);
|
||||
}
|
||||
}
|
||||
// todo - also hash invalid buffer groups?
|
||||
|
||||
if (g_renderer->GetType() == RendererAPI::Metal)
|
||||
{
|
||||
for (sint32 g = 0; g < fetchShader->bufferGroups.size(); g++)
|
||||
{
|
||||
LatteParsedFetchShaderBufferGroup_t& group = fetchShader->bufferGroups[g];
|
||||
key += (uint64)group.attributeBufferIndex;
|
||||
key = std::rotl<uint64>(key, 5);
|
||||
}
|
||||
}
|
||||
|
||||
fetchShader->key = key;
|
||||
}
|
||||
|
||||
|
@ -146,8 +164,8 @@ void LatteFetchShader::CalculateFetchShaderVkHash()
|
|||
this->vkPipelineHashFragment = h;
|
||||
}
|
||||
|
||||
void LatteFetchShader::CalculateFetchShaderMtlObjectShaderHash(uint32* contextRegister)
|
||||
{uint64 key = 0;
|
||||
void LatteFetchShader::CheckIfVerticesNeedManualFetchMtl(uint32* contextRegister)
|
||||
{
|
||||
for (sint32 g = 0; g < bufferGroups.size(); g++)
|
||||
{
|
||||
LatteParsedFetchShaderBufferGroup_t& group = bufferGroups[g];
|
||||
|
@ -155,12 +173,16 @@ void LatteFetchShader::CalculateFetchShaderMtlObjectShaderHash(uint32* contextRe
|
|||
uint32 bufferBaseRegisterIndex = mmSQ_VTX_ATTRIBUTE_BLOCK_START + bufferIndex * 7;
|
||||
uint32 bufferStride = (contextRegister[bufferBaseRegisterIndex + 2] >> 11) & 0xFFFF;
|
||||
|
||||
key += (uint64)bufferIndex;
|
||||
key = std::rotl<uint64>(key, 5);
|
||||
key += (uint64)bufferStride;
|
||||
key = std::rotl<uint64>(key, 5);
|
||||
if (bufferStride % 4 != 0)
|
||||
mtlFetchVertexManually = true;
|
||||
|
||||
for (sint32 f = 0; f < group.attribCount; f++)
|
||||
{
|
||||
auto& attr = group.attrib[f];
|
||||
if (attr.offset + GetMtlVertexFormatSize(attr.format) > bufferStride)
|
||||
mtlFetchVertexManually = true;
|
||||
}
|
||||
}
|
||||
mtlShaderHashObject = key;
|
||||
}
|
||||
|
||||
void _fetchShaderDecompiler_parseInstruction_VTX_SEMANTIC(LatteFetchShader* parsedFetchShader, uint32* contextRegister, const LatteClauseInstruction_VTX* instr)
|
||||
|
@ -343,9 +365,9 @@ LatteFetchShader* LatteShaderRecompiler_createFetchShader(LatteFetchShader::Cach
|
|||
{
|
||||
// empty fetch shader, seen in Minecraft
|
||||
// these only make sense when vertex shader does not call FS?
|
||||
LatteShader_calculateFSKey(newFetchShader);
|
||||
LatteShader_calculateFSKey(newFetchShader, contextRegister);
|
||||
newFetchShader->CalculateFetchShaderVkHash();
|
||||
newFetchShader->CalculateFetchShaderMtlObjectShaderHash(contextRegister);
|
||||
newFetchShader->CheckIfVerticesNeedManualFetchMtl(contextRegister);
|
||||
return newFetchShader;
|
||||
}
|
||||
|
||||
|
@ -403,9 +425,9 @@ LatteFetchShader* LatteShaderRecompiler_createFetchShader(LatteFetchShader::Cach
|
|||
}
|
||||
bufferGroup.vboStride = vboOffset;
|
||||
}
|
||||
LatteShader_calculateFSKey(newFetchShader);
|
||||
LatteShader_calculateFSKey(newFetchShader, contextRegister);
|
||||
newFetchShader->CalculateFetchShaderVkHash();
|
||||
newFetchShader->CalculateFetchShaderMtlObjectShaderHash(contextRegister);
|
||||
newFetchShader->CheckIfVerticesNeedManualFetchMtl(contextRegister);
|
||||
|
||||
// register in cache
|
||||
// its possible that during multi-threaded shader cache loading, two identical (same hash) fetch shaders get created simultaneously
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue