diff options
Diffstat (limited to 'Source/Core/VideoCommon/VertexManagerBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VertexManagerBase.cpp | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp index 5588c1e717..ae694868aa 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/VertexManagerBase.cpp @@ -144,13 +144,19 @@ DataReader VertexManagerBase::PrepareForAdditionalData(int primitive, u32 count, Flush(); if (count > m_index_generator.GetRemainingIndices()) - ERROR_LOG(VIDEO, "Too little remaining index values. Use 32-bit or reset them on flush."); + { + ERROR_LOG_FMT(VIDEO, "Too little remaining index values. Use 32-bit or reset them on flush."); + } if (count > GetRemainingIndices(primitive)) - ERROR_LOG(VIDEO, "VertexManager: Buffer not large enough for all indices! " - "Increase MAXIBUFFERSIZE or we need primitive breaking after all."); + { + ERROR_LOG_FMT(VIDEO, "VertexManager: Buffer not large enough for all indices! " + "Increase MAXIBUFFERSIZE or we need primitive breaking after all."); + } if (needed_vertex_bytes > GetRemainingSize()) - ERROR_LOG(VIDEO, "VertexManager: Buffer not large enough for all vertices! " - "Increase MAXVBUFFERSIZE or we need primitive breaking after all."); + { + ERROR_LOG_FMT(VIDEO, "VertexManager: Buffer not large enough for all vertices! " + "Increase MAXVBUFFERSIZE or we need primitive breaking after all."); + } } m_cull_all = cullall; @@ -358,11 +364,12 @@ void VertexManagerBase::Flush() if (xfmem.numTexGen.numTexGens != bpmem.genMode.numtexgens || xfmem.numChan.numColorChans != bpmem.genMode.numcolchans) { - ERROR_LOG(VIDEO, - "Mismatched configuration between XF and BP stages - %u/%u texgens, %u/%u colors. " - "Skipping draw. Please report on the issue tracker.", - xfmem.numTexGen.numTexGens, bpmem.genMode.numtexgens.Value(), - xfmem.numChan.numColorChans, bpmem.genMode.numcolchans.Value()); + ERROR_LOG_FMT( + VIDEO, + "Mismatched configuration between XF and BP stages - {}/{} texgens, {}/{} colors. " + "Skipping draw. Please report on the issue tracker.", + xfmem.numTexGen.numTexGens, bpmem.genMode.numtexgens.Value(), xfmem.numChan.numColorChans, + bpmem.genMode.numcolchans.Value()); // Analytics reporting so we can discover which games have this problem, that way when we // eventually simulate the behavior we have test cases for it. @@ -381,7 +388,7 @@ void VertexManagerBase::Flush() } #if defined(_DEBUG) || defined(DEBUGFAST) - PRIM_LOG("frame%d:\n texgen=%u, numchan=%u, dualtex=%u, ztex=%u, cole=%u, alpe=%u, ze=%u", + PRIM_LOG("frame{}:\n texgen={}, numchan={}, dualtex={}, ztex={}, cole={}, alpe={}, ze={}", g_ActiveConfig.iSaveTargetId, xfmem.numTexGen.numTexGens, xfmem.numChan.numColorChans, xfmem.dualTexTrans.enabled, bpmem.ztex2.op.Value(), bpmem.blendmode.colorupdate.Value(), bpmem.blendmode.alphaupdate.Value(), bpmem.zmode.updateenable.Value()); @@ -389,11 +396,11 @@ void VertexManagerBase::Flush() for (u32 i = 0; i < xfmem.numChan.numColorChans; ++i) { LitChannel* ch = &xfmem.color[i]; - PRIM_LOG("colchan%u: matsrc=%u, light=0x%x, ambsrc=%u, diffunc=%u, attfunc=%u", i, + PRIM_LOG("colchan{}: matsrc={}, light={:#x}, ambsrc={}, diffunc={}, attfunc={}", i, ch->matsource.Value(), ch->GetFullLightMask(), ch->ambsource.Value(), ch->diffusefunc.Value(), ch->attnfunc.Value()); ch = &xfmem.alpha[i]; - PRIM_LOG("alpchan%u: matsrc=%u, light=0x%x, ambsrc=%u, diffunc=%u, attfunc=%u", i, + PRIM_LOG("alpchan{}: matsrc={}, light={:#x}, ambsrc={}, diffunc={}, attfunc={}", i, ch->matsource.Value(), ch->GetFullLightMask(), ch->ambsource.Value(), ch->diffusefunc.Value(), ch->attnfunc.Value()); } @@ -406,15 +413,15 @@ void VertexManagerBase::Flush() if (tinfo.texgentype != XF_TEXGEN_REGULAR) tinfo.projection = 0; - PRIM_LOG("txgen%u: proj=%u, input=%u, gentype=%u, srcrow=%u, embsrc=%u, emblght=%u, " - "postmtx=%u, postnorm=%u", + PRIM_LOG("txgen{}: proj={}, input={}, gentype={}, srcrow={}, embsrc={}, emblght={}, " + "postmtx={}, postnorm={}", i, tinfo.projection.Value(), tinfo.inputform.Value(), tinfo.texgentype.Value(), tinfo.sourcerow.Value(), tinfo.embosssourceshift.Value(), tinfo.embosslightshift.Value(), xfmem.postMtxInfo[i].index.Value(), xfmem.postMtxInfo[i].normalize.Value()); } - PRIM_LOG("pixel: tev=%u, ind=%u, texgen=%u, dstalpha=%u, alphatest=0x%x", + PRIM_LOG("pixel: tev={}, ind={}, texgen={}, dstalpha={}, alphatest={:#x}", bpmem.genMode.numtevstages.Value() + 1, bpmem.genMode.numindstages.Value(), bpmem.genMode.numtexgens.Value(), bpmem.dstalpha.enable.Value(), (bpmem.alpha_test.hex >> 16) & 0xff); @@ -502,9 +509,9 @@ void VertexManagerBase::Flush() if (xfmem.numTexGen.numTexGens != bpmem.genMode.numtexgens) { - ERROR_LOG(VIDEO, - "xf.numtexgens (%d) does not match bp.numtexgens (%d). Error in command stream.", - xfmem.numTexGen.numTexGens, bpmem.genMode.numtexgens.Value()); + ERROR_LOG_FMT(VIDEO, + "xf.numtexgens ({}) does not match bp.numtexgens ({}). Error in command stream.", + xfmem.numTexGen.numTexGens, bpmem.genMode.numtexgens.Value()); } } @@ -813,12 +820,12 @@ void VertexManagerBase::OnEndFrame() { std::ostringstream ss; std::for_each(m_cpu_accesses_this_frame.begin(), m_cpu_accesses_this_frame.end(), [&ss](u32 idx) { ss << idx << ","; }); - WARN_LOG(VIDEO, "CPU EFB accesses in last frame: %s", ss.str().c_str()); + WARN_LOG_FMT(VIDEO, "CPU EFB accesses in last frame: {}", ss.str()); } { std::ostringstream ss; std::for_each(m_scheduled_command_buffer_kicks.begin(), m_scheduled_command_buffer_kicks.end(), [&ss](u32 idx) { ss << idx << ","; }); - WARN_LOG(VIDEO, "Scheduled command buffer kicks: %s", ss.str().c_str()); + WARN_LOG_FMT(VIDEO, "Scheduled command buffer kicks: {}", ss.str()); } #endif |