diff options
| author | magumagu <magumagu9@gmail.com> | 2014-03-28 19:22:15 -0700 |
|---|---|---|
| committer | magumagu <magumagu9@gmail.com> | 2014-03-29 12:07:20 -0700 |
| commit | 0661efea8456b32d88fa13103f8ed68509f2b69f (patch) | |
| tree | 971ec9afbd3608a5b019db613346f73b112ef0a2 /Source/Core/VideoBackends/Software/SWmain.cpp | |
| parent | 47d96e449a5fcee8280368b8ec72eab551b87d31 (diff) | |
Software backend: Delete forked PixelEngine.
Mostly just zapping a bunch of duplicated code; the only interesting thing
going on here is the changes to the performance counter implementation.
Diffstat (limited to 'Source/Core/VideoBackends/Software/SWmain.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Software/SWmain.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index e88d8d1441..c42cc136f2 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -24,7 +24,6 @@ #include "VideoBackends/Software/OpcodeDecoder.h" #include "VideoBackends/Software/Rasterizer.h" #include "VideoBackends/Software/SWCommandProcessor.h" -#include "VideoBackends/Software/SWPixelEngine.h" #include "VideoBackends/Software/SWRenderer.h" #include "VideoBackends/Software/SWStatistics.h" #include "VideoBackends/Software/SWVertexLoader.h" @@ -37,6 +36,8 @@ #endif // HAVE_WX #include "VideoCommon/OnScreenDisplay.h" +#include "VideoCommon/PixelEngine.h" +#include "VideoCommon/XFMemory.h" #define VSYNC_ENABLED 0 @@ -89,7 +90,7 @@ bool VideoSoftware::Initialize(void *&window_handle) InitBPMemory(); InitXFMemory(); SWCommandProcessor::Init(); - SWPixelEngine::Init(); + PixelEngine::Init(); OpcodeDecoder::Init(); Clipper::Init(); Rasterizer::Init(); @@ -110,7 +111,7 @@ void VideoSoftware::DoState(PointerWrap& p) // TODO: incomplete? SWCommandProcessor::DoState(p); - SWPixelEngine::DoState(p); + PixelEngine::DoState(p); EfbInterface::DoState(p); OpcodeDecoder::DoState(p); Clipper::DoState(p); @@ -283,8 +284,7 @@ u32 VideoSoftware::Video_AccessEFB(EFBAccessType type, u32 x, u32 y, u32 InputDa u32 VideoSoftware::Video_GetQueryResult(PerfQueryType type) { - // TODO: - return 0; + return EfbInterface::perf_values[type]; } bool VideoSoftware::Video_Screenshot(const std::string& filename) @@ -376,11 +376,6 @@ void VideoSoftware::RegisterCPMMIO(MMIO::Mapping* mmio, u32 base) SWCommandProcessor::RegisterMMIO(mmio, base); } -void VideoSoftware::RegisterPEMMIO(MMIO::Mapping* mmio, u32 base) -{ - SWPixelEngine::RegisterMMIO(mmio, base); -} - // Draw messages on top of the screen unsigned int VideoSoftware::PeekMessages() { |