From e351f03cdf9371f63423fdda1ff168e0daff6966 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 26 Mar 2025 00:55:40 -0500 Subject: VideoCommon: Fix out-of-bounds and disabled EFB access. --- Source/Core/VideoBackends/Null/NullGfx.cpp | 2 +- Source/Core/VideoBackends/Null/NullGfx.h | 2 +- Source/Core/VideoBackends/Software/SWEfbInterface.cpp | 2 +- Source/Core/VideoBackends/Software/SWEfbInterface.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/Core/VideoBackends') diff --git a/Source/Core/VideoBackends/Null/NullGfx.cpp b/Source/Core/VideoBackends/Null/NullGfx.cpp index ab60339d0b..61822d3c83 100644 --- a/Source/Core/VideoBackends/Null/NullGfx.cpp +++ b/Source/Core/VideoBackends/Null/NullGfx.cpp @@ -108,7 +108,7 @@ u32 NullEFBInterface::PeekColorInternal(u16 x, u16 y) return 0; } -u32 NullEFBInterface::PeekDepth(u16 x, u16 y) +u32 NullEFBInterface::PeekDepthInternal(u16 x, u16 y) { return 0; } diff --git a/Source/Core/VideoBackends/Null/NullGfx.h b/Source/Core/VideoBackends/Null/NullGfx.h index 43d20a45a2..a84b3743d4 100644 --- a/Source/Core/VideoBackends/Null/NullGfx.h +++ b/Source/Core/VideoBackends/Null/NullGfx.h @@ -46,7 +46,7 @@ class NullEFBInterface final : public EFBInterfaceBase void PokeDepth(u16 x, u16 y, u32 depth) override; u32 PeekColorInternal(u16 x, u16 y) override; - u32 PeekDepth(u16 x, u16 y) override; + u32 PeekDepthInternal(u16 x, u16 y) override; }; } // namespace Null diff --git a/Source/Core/VideoBackends/Software/SWEfbInterface.cpp b/Source/Core/VideoBackends/Software/SWEfbInterface.cpp index e534fab1c5..1e322a528e 100644 --- a/Source/Core/VideoBackends/Software/SWEfbInterface.cpp +++ b/Source/Core/VideoBackends/Software/SWEfbInterface.cpp @@ -742,7 +742,7 @@ u32 SWEFBInterface::PeekColorInternal(u16 x, u16 y) return value; } -u32 SWEFBInterface::PeekDepth(u16 x, u16 y) +u32 SWEFBInterface::PeekDepthInternal(u16 x, u16 y) { return EfbInterface::GetDepth(x, y); } diff --git a/Source/Core/VideoBackends/Software/SWEfbInterface.h b/Source/Core/VideoBackends/Software/SWEfbInterface.h index 5f866ad227..1182d3b5e0 100644 --- a/Source/Core/VideoBackends/Software/SWEfbInterface.h +++ b/Source/Core/VideoBackends/Software/SWEfbInterface.h @@ -69,6 +69,6 @@ class SWEFBInterface final : public EFBInterfaceBase void PokeDepth(u16 x, u16 y, u32 depth) override; u32 PeekColorInternal(u16 x, u16 y) override; - u32 PeekDepth(u16 x, u16 y) override; + u32 PeekDepthInternal(u16 x, u16 y) override; }; } // namespace SW -- cgit v1.2.3