Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-06 06:05:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

explicitly setup hash member variables (#645)

Browse source
This commit is contained in:
SamoZ256 2024-11-23 20:17:19 +01:00 • committed by GitHub
parent 0089d73588
commit c35304e485
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/core/renderer_mtl/renderer_mtl.cpp
View file

@ -455,9 +455,11 @@ void RendererMTL::drawVertices(PICA::PrimType primType, std::span<const PICA::Ve
const u8 depthFunc = Helpers::getBits<4, 3>(depthControl); const u8 depthFunc = Helpers::getBits<4, 3>(depthControl);
const u8 colorMask = Helpers::getBits<8, 4>(depthControl); const u8 colorMask = Helpers::getBits<8, 4>(depthControl);
Metal::DepthStencilHash depthStencilHash{false, 1}; Metal::DepthStencilHash depthStencilHash;
depthStencilHash.stencilConfig = regs[PICA::InternalRegs::StencilTest]; depthStencilHash.stencilConfig = regs[PICA::InternalRegs::StencilTest];
depthStencilHash.stencilOpConfig = regs[PICA::InternalRegs::StencilOp]; depthStencilHash.stencilOpConfig = regs[PICA::InternalRegs::StencilOp];
depthStencilHash.depthStencilWrite = false;
depthStencilHash.depthFunc = 1;
const bool stencilEnable = Helpers::getBit<0>(depthStencilHash.stencilConfig); const bool stencilEnable = Helpers::getBit<0>(depthStencilHash.stencilConfig);
std::optional<Metal::DepthStencilRenderTarget> depthStencilRenderTarget = std::nullopt; std::optional<Metal::DepthStencilRenderTarget> depthStencilRenderTarget = std::nullopt;
@ -485,9 +487,12 @@ void RendererMTL::drawVertices(PICA::PrimType primType, std::span<const PICA::Ve
depthUniforms.depthMapEnable = regs[PICA::InternalRegs::DepthmapEnable] & 1; depthUniforms.depthMapEnable = regs[PICA::InternalRegs::DepthmapEnable] & 1;
// -------- Pipeline -------- // -------- Pipeline --------
Metal::DrawPipelineHash pipelineHash{colorRenderTarget->format, DepthFmt::Unknown1}; Metal::DrawPipelineHash pipelineHash;
pipelineHash.colorFmt = colorRenderTarget->format;
if (depthStencilRenderTarget) { if (depthStencilRenderTarget) {
pipelineHash.depthFmt = depthStencilRenderTarget->format; pipelineHash.depthFmt = depthStencilRenderTarget->format;
} else {
pipelineHash.depthFmt = DepthFmt::Unknown1;
} }
pipelineHash.fragHash.lightingEnabled = regs[0x008F] & 1; pipelineHash.fragHash.lightingEnabled = regs[0x008F] & 1;
pipelineHash.fragHash.lightingNumLights = regs[0x01C2] & 0x7; pipelineHash.fragHash.lightingNumLights = regs[0x01C2] & 0x7;