From f3a8874214b61f33332b826a37ac9ca25dee1477 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 18 May 2018 15:09:37 -0400 Subject: [PATCH 1/4] EfbInterface: Move efb array into the EfbInterface namespace --- Source/Core/VideoBackends/Software/EfbInterface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoBackends/Software/EfbInterface.cpp b/Source/Core/VideoBackends/Software/EfbInterface.cpp index a13feb6c50..cf30c35a48 100644 --- a/Source/Core/VideoBackends/Software/EfbInterface.cpp +++ b/Source/Core/VideoBackends/Software/EfbInterface.cpp @@ -18,10 +18,10 @@ #include "VideoCommon/LookUpTables.h" #include "VideoCommon/PerfQueryBase.h" -static u8 efb[EFB_WIDTH * EFB_HEIGHT * 6]; - namespace EfbInterface { +static u8 efb[EFB_WIDTH * EFB_HEIGHT * 6]; + u32 perf_values[PQ_NUM_MEMBERS]; static inline u32 GetColorOffset(u16 x, u16 y) From c58b5e9b9bccf9baac5d5fb5aa6e254528f19782 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 18 May 2018 15:13:03 -0400 Subject: [PATCH 2/4] EfbInterface: Make perf_values internally linked Instead, expose functions to operate with it. This way we keep the internal representation concealed. --- .../VideoBackends/Software/EfbInterface.cpp | 25 ++++++++++++++++++- .../VideoBackends/Software/EfbInterface.h | 20 +++------------ Source/Core/VideoBackends/Software/SWmain.cpp | 7 ++---- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/Source/Core/VideoBackends/Software/EfbInterface.cpp b/Source/Core/VideoBackends/Software/EfbInterface.cpp index cf30c35a48..1d5dab1f49 100644 --- a/Source/Core/VideoBackends/Software/EfbInterface.cpp +++ b/Source/Core/VideoBackends/Software/EfbInterface.cpp @@ -22,7 +22,7 @@ namespace EfbInterface { static u8 efb[EFB_WIDTH * EFB_HEIGHT * 6]; -u32 perf_values[PQ_NUM_MEMBERS]; +static u32 perf_values[PQ_NUM_MEMBERS]; static inline u32 GetColorOffset(u16 x, u16 y) { @@ -682,4 +682,27 @@ bool ZCompare(u16 x, u16 y, u32 z) return pass; } + +u32 GetPerfQueryResult(PerfQueryType type) +{ + return perf_values[type]; +} + +void ResetPerfQuery() +{ + std::memset(perf_values, 0, sizeof(perf_values)); +} + +void IncPerfCounterQuadCount(PerfQueryType type) +{ + // NOTE: hardware doesn't process individual pixels but quads instead. + // Current software renderer architecture works on pixels though, so + // we have this "quad" hack here to only increment the registers on + // every fourth rendered pixel + static u32 quad[PQ_NUM_MEMBERS]; + if (++quad[type] != 3) + return; + quad[type] = 0; + ++perf_values[type]; +} } diff --git a/Source/Core/VideoBackends/Software/EfbInterface.h b/Source/Core/VideoBackends/Software/EfbInterface.h index 7f7c0ec608..1c8093b1bc 100644 --- a/Source/Core/VideoBackends/Software/EfbInterface.h +++ b/Source/Core/VideoBackends/Software/EfbInterface.h @@ -4,8 +4,6 @@ #pragma once -#include - #include "Common/CommonTypes.h" #include "VideoCommon/PerfQueryBase.h" #include "VideoCommon/VideoCommon.h" @@ -61,17 +59,7 @@ u8* GetPixelPointer(u16 x, u16 y, bool depth); void EncodeXFB(u8* xfb_in_ram, u32 memory_stride, const EFBRectangle& source_rect, float y_scale, float gamma); -extern u32 perf_values[PQ_NUM_MEMBERS]; -inline void IncPerfCounterQuadCount(PerfQueryType type) -{ - // NOTE: hardware doesn't process individual pixels but quads instead. - // Current software renderer architecture works on pixels though, so - // we have this "quad" hack here to only increment the registers on - // every fourth rendered pixel - static u32 quad[PQ_NUM_MEMBERS]; - if (++quad[type] != 3) - return; - quad[type] = 0; - ++perf_values[type]; -} -} +u32 GetPerfQueryResult(PerfQueryType type); +void ResetPerfQuery(); +void IncPerfCounterQuadCount(PerfQueryType type); +} // namespace EfbInterface diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 8765a28e4c..18a739726b 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -38,11 +38,8 @@ public: ~PerfQuery() {} void EnableQuery(PerfQueryGroup type) override {} void DisableQuery(PerfQueryGroup type) override {} - void ResetQuery() override - { - memset(EfbInterface::perf_values, 0, sizeof(EfbInterface::perf_values)); - } - u32 GetQueryResult(PerfQueryType type) override { return EfbInterface::perf_values[type]; } + void ResetQuery() override { EfbInterface::ResetPerfQuery(); } + u32 GetQueryResult(PerfQueryType type) override { return EfbInterface::GetPerfQueryResult(type); } void FlushResults() override {} bool IsFlushed() const override { return true; } }; From 5eef8ba9844806a795a635c6e364e3b9edc9a6c8 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 18 May 2018 15:36:37 -0400 Subject: [PATCH 3/4] EfbInterface: Make efb and perf_values std::arrays --- Source/Core/VideoBackends/Software/EfbInterface.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Core/VideoBackends/Software/EfbInterface.cpp b/Source/Core/VideoBackends/Software/EfbInterface.cpp index 1d5dab1f49..a133d63c2f 100644 --- a/Source/Core/VideoBackends/Software/EfbInterface.cpp +++ b/Source/Core/VideoBackends/Software/EfbInterface.cpp @@ -5,6 +5,7 @@ #include "VideoBackends/Software/EfbInterface.h" #include +#include #include #include #include @@ -20,9 +21,9 @@ namespace EfbInterface { -static u8 efb[EFB_WIDTH * EFB_HEIGHT * 6]; +static std::array efb; -static u32 perf_values[PQ_NUM_MEMBERS]; +static std::array perf_values; static inline u32 GetColorOffset(u16 x, u16 y) { @@ -690,7 +691,7 @@ u32 GetPerfQueryResult(PerfQueryType type) void ResetPerfQuery() { - std::memset(perf_values, 0, sizeof(perf_values)); + perf_values = {}; } void IncPerfCounterQuadCount(PerfQueryType type) From 505d45a2331e5587ca0b564ec616fc5855c33fd7 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 18 May 2018 15:43:26 -0400 Subject: [PATCH 4/4] EfbInterface: Move buffer constant from the header to the cpp file This is only ever used internally, so we can limit its scope to the only usage point. --- Source/Core/VideoBackends/Software/EfbInterface.cpp | 4 +++- Source/Core/VideoBackends/Software/EfbInterface.h | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/VideoBackends/Software/EfbInterface.cpp b/Source/Core/VideoBackends/Software/EfbInterface.cpp index a133d63c2f..bb3cfeda90 100644 --- a/Source/Core/VideoBackends/Software/EfbInterface.cpp +++ b/Source/Core/VideoBackends/Software/EfbInterface.cpp @@ -32,7 +32,9 @@ static inline u32 GetColorOffset(u16 x, u16 y) static inline u32 GetDepthOffset(u16 x, u16 y) { - return (x + y * EFB_WIDTH) * 3 + DEPTH_BUFFER_START; + constexpr u32 depth_buffer_start = EFB_WIDTH * EFB_HEIGHT * 3; + + return (x + y * EFB_WIDTH) * 3 + depth_buffer_start; } static void SetPixelAlphaOnly(u32 offset, u8 a) diff --git a/Source/Core/VideoBackends/Software/EfbInterface.h b/Source/Core/VideoBackends/Software/EfbInterface.h index 1c8093b1bc..518395d7c9 100644 --- a/Source/Core/VideoBackends/Software/EfbInterface.h +++ b/Source/Core/VideoBackends/Software/EfbInterface.h @@ -10,8 +10,6 @@ namespace EfbInterface { -const int DEPTH_BUFFER_START = EFB_WIDTH * EFB_HEIGHT * 3; - // xfb color format - packed so the compiler doesn't mess with alignment #pragma pack(push, 1) struct yuv422_packed