diff options
| author | Connor McLaughlin <stenzek@gmail.com> | 2019-07-11 20:34:48 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 20:34:48 +1000 |
| commit | 4c649d1a5d92ccb1cb106861d60d744b92188524 (patch) | |
| tree | 25011e4e5197824643d837414f3a2ebb66d283a2 /Source/Core/VideoBackends/Software/DebugUtil.cpp | |
| parent | 8d8d1037398f0aebd4fcec478ace20dfef91e4cc (diff) | |
| parent | 9c245655fbb1deea183d47a53dbd6ecaab3bcb4a (diff) | |
Merge pull request #8238 from lioncash/video-stats
VideoCommon/Statistics: Minor cleanup changes
Diffstat (limited to 'Source/Core/VideoBackends/Software/DebugUtil.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Software/DebugUtil.cpp | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/Source/Core/VideoBackends/Software/DebugUtil.cpp b/Source/Core/VideoBackends/Software/DebugUtil.cpp index 7f8edcc909..7b9be6e503 100644 --- a/Source/Core/VideoBackends/Software/DebugUtil.cpp +++ b/Source/Core/VideoBackends/Software/DebugUtil.cpp @@ -106,7 +106,7 @@ void DumpActiveTextures() { SaveTexture(StringFromFormat("%star%i_ind%i_map%i_mip%i.png", File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(), - stats.thisFrame.numDrawnObjects, stageNum, texmap, mip), + g_stats.this_frame.num_drawn_objects, stageNum, texmap, mip), texmap, mip); } } @@ -124,7 +124,7 @@ void DumpActiveTextures() { SaveTexture(StringFromFormat("%star%i_stage%i_map%i_mip%i.png", File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(), - stats.thisFrame.numDrawnObjects, stageNum, texmap, mip), + g_stats.this_frame.num_drawn_objects, stageNum, texmap, mip), texmap, mip); } } @@ -191,32 +191,38 @@ void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char* nam void OnObjectBegin() { - if (g_ActiveConfig.bDumpTextures && stats.thisFrame.numDrawnObjects >= g_ActiveConfig.drawStart && - stats.thisFrame.numDrawnObjects < g_ActiveConfig.drawEnd) + if (g_ActiveConfig.bDumpTextures && + g_stats.this_frame.num_drawn_objects >= g_ActiveConfig.drawStart && + g_stats.this_frame.num_drawn_objects < g_ActiveConfig.drawEnd) + { DumpActiveTextures(); + } } void OnObjectEnd() { - if (g_ActiveConfig.bDumpObjects && stats.thisFrame.numDrawnObjects >= g_ActiveConfig.drawStart && - stats.thisFrame.numDrawnObjects < g_ActiveConfig.drawEnd) + if (g_ActiveConfig.bDumpObjects && + g_stats.this_frame.num_drawn_objects >= g_ActiveConfig.drawStart && + g_stats.this_frame.num_drawn_objects < g_ActiveConfig.drawEnd) + { DumpEfb(StringFromFormat("%sobject%i.png", File::GetUserPath(D_DUMPOBJECTS_IDX).c_str(), - stats.thisFrame.numDrawnObjects)); + g_stats.this_frame.num_drawn_objects)); + } for (int i = 0; i < NUM_OBJECT_BUFFERS; i++) { if (DrawnToBuffer[i]) { DrawnToBuffer[i] = false; - std::string filename = - StringFromFormat("%sobject%i_%s(%i).png", File::GetUserPath(D_DUMPOBJECTS_IDX).c_str(), - stats.thisFrame.numDrawnObjects, ObjectBufferName[i], i - BufferBase[i]); + std::string filename = StringFromFormat( + "%sobject%i_%s(%i).png", File::GetUserPath(D_DUMPOBJECTS_IDX).c_str(), + g_stats.this_frame.num_drawn_objects, ObjectBufferName[i], i - BufferBase[i]); TextureToPng((u8*)ObjectBuffer[i], EFB_WIDTH * 4, filename, EFB_WIDTH, EFB_HEIGHT, true); memset(ObjectBuffer[i], 0, EFB_WIDTH * EFB_HEIGHT * sizeof(u32)); } } - stats.thisFrame.numDrawnObjects++; + g_stats.this_frame.num_drawn_objects++; } } // namespace DebugUtil |