diff --git a/Source/Core/VideoCommon/Statistics.cpp b/Source/Core/VideoCommon/Statistics.cpp index aea3b0e957..6e6dedfc62 100644 --- a/Source/Core/VideoCommon/Statistics.cpp +++ b/Source/Core/VideoCommon/Statistics.cpp @@ -147,6 +147,9 @@ void Statistics::DisplayProj() const ImGui::Text("Projection 13: %f (%f)", gproj[13], g2proj[13]); ImGui::Text("Projection 14: %f (%f)", gproj[14], g2proj[14]); ImGui::Text("Projection 15: %f (%f)", gproj[15], g2proj[15]); + ImGui::NewLine(); + ImGui::Text("Avg Projection Viewport Ratio Persp(3D): %f", avg_persp_proj_viewport_ratio); + ImGui::Text("Avg Projection Viewport Ratio Ortho(2D): %f", avg_ortho_proj_viewport_ratio); ImGui::End(); } diff --git a/Source/Core/VideoCommon/Statistics.h b/Source/Core/VideoCommon/Statistics.h index dac0404f1a..7d4b367ead 100644 --- a/Source/Core/VideoCommon/Statistics.h +++ b/Source/Core/VideoCommon/Statistics.h @@ -25,6 +25,10 @@ struct Statistics std::array gproj{}; std::array g2proj{}; + // For widescreen heuristic. + float avg_persp_proj_viewport_ratio = 0; + float avg_ortho_proj_viewport_ratio = 0; + std::vector scissors{}; size_t current_scissor = 0; // 0 => all, otherwise index + 1 int scissor_scale = 10; diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp index 94d609c23f..b51cfa19e0 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/VertexManagerBase.cpp @@ -520,15 +520,21 @@ void VertexManagerBase::Flush() auto& counts = is_perspective ? m_flush_statistics.perspective : m_flush_statistics.orthographic; + const auto& projection = xfmem.projection.rawProjection; // TODO: Potentially the viewport size could be used as weight for the flush count average. // This way a small minimap would have less effect than a fullscreen projection. + const auto& viewport = xfmem.viewport; - if (IsAnamorphicProjection(xfmem.projection.rawProjection, xfmem.viewport, g_ActiveConfig)) + // FYI: This average is based on flushes. + // It doesn't look at vertex counts like the heuristic does. + counts.average_ratio.Push(CalculateProjectionViewportRatio(projection, viewport)); + + if (IsAnamorphicProjection(projection, viewport, g_ActiveConfig)) { ++counts.anamorphic_flush_count; counts.anamorphic_vertex_count += m_index_generator.GetIndexLen(); } - else if (IsNormalProjection(xfmem.projection.rawProjection, xfmem.viewport, g_ActiveConfig)) + else if (IsNormalProjection(projection, viewport, g_ActiveConfig)) { ++counts.normal_flush_count; counts.normal_vertex_count += m_index_generator.GetIndexLen(); diff --git a/Source/Core/VideoCommon/VertexManagerBase.h b/Source/Core/VideoCommon/VertexManagerBase.h index c1248972da..af0f694a01 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.h +++ b/Source/Core/VideoCommon/VertexManagerBase.h @@ -79,6 +79,8 @@ private: { return normal_vertex_count + anamorphic_vertex_count + other_vertex_count; } + + MathUtil::RunningMean average_ratio; }; ProjectionCounts perspective; diff --git a/Source/Core/VideoCommon/Widescreen.cpp b/Source/Core/VideoCommon/Widescreen.cpp index d35ba758ec..cfb10ad479 100644 --- a/Source/Core/VideoCommon/Widescreen.cpp +++ b/Source/Core/VideoCommon/Widescreen.cpp @@ -8,6 +8,7 @@ #include "Core/Config/SYSCONFSettings.h" #include "Core/System.h" +#include "VideoCommon/Statistics.h" #include "VideoCommon/VertexManagerBase.h" std::unique_ptr g_widescreen; @@ -117,6 +118,9 @@ void WidescreenManager::UpdateWidescreenHeuristic() const auto& persp = flush_statistics.perspective; const auto& ortho = flush_statistics.orthographic; + g_stats.avg_persp_proj_viewport_ratio = persp.average_ratio.Mean(); + g_stats.avg_ortho_proj_viewport_ratio = ortho.average_ratio.Mean(); + const auto ortho_looks_anamorphic = looks_anamorphic(ortho); const auto persp_looks_normal = looks_normal(persp);