From 98ea1f773a671b9747459087e687b6e2be0eb104 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sat, 9 Jan 2016 10:37:09 +0100 Subject: [PATCH] VideoSW: fix some warnings --- .../Core/VideoBackends/Software/SWVertexLoader.h | 2 +- Source/Core/VideoBackends/Software/SWmain.cpp | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.h b/Source/Core/VideoBackends/Software/SWVertexLoader.h index 7166ae6697..1880ae8c07 100644 --- a/Source/Core/VideoBackends/Software/SWVertexLoader.h +++ b/Source/Core/VideoBackends/Software/SWVertexLoader.h @@ -26,7 +26,7 @@ public: NativeVertexFormat* CreateNativeVertexFormat(const PortableVertexDeclaration& vdec) override; protected: - virtual void ResetBuffer(u32 stride); + void ResetBuffer(u32 stride) override; u16* GetIndexBuffer() { return &LocalIBuffer[0]; } private: void vFlush(bool useDstAlpha) override; diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 59162c2f06..a2ed4ff3a0 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -44,15 +44,6 @@ #define VSYNC_ENABLED 0 -static std::atomic s_swapRequested; - -static volatile struct -{ - u32 xfbAddr; - u32 fbWidth; - u32 fbHeight; -} s_beginFieldArgs; - namespace SW { @@ -73,7 +64,7 @@ public: return EfbInterface::perf_values[type]; }; void FlushResults() override {} - bool IsFlushed() const {return true;}; + bool IsFlushed() const override { return true; }; }; class TextureCache : public TextureCacheBase @@ -136,10 +127,6 @@ class FramebufferManager : public FramebufferManagerBase } }; -static std::atomic fifoStateRun; -static std::atomic emuRunningState; -static std::mutex m_csSWVidOccupied; - std::string VideoSoftware::GetName() const { return "Software Renderer";