ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3473 from Tilka/videosw 

VideoSW: fix some warnings
This commit is contained in:
Dolphin Bot 2016-01-09 16:08:41 +01:00
parent dbe7e6634d 98ea1f773a
commit 6e8cbff338
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/VideoBackends/Software/SWVertexLoader.h
View File

@ -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;

15
Source/Core/VideoBackends/Software/SWmain.cpp
View File

@ -44,15 +44,6 @@
#define VSYNC_ENABLED 0
static std::atomic<bool> 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<bool> fifoStateRun;
static std::atomic<bool> emuRunningState;
static std::mutex m_csSWVidOccupied;
std::string VideoSoftware::GetName() const
{
return "Software Renderer";