mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-17 07:49:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #764 from magcius/new-nogui-2

Browse source 
Rewrite GLInterface
This commit is contained in:
Lioncash 2014-08-21 14:14:54 -04:00
commit f17dcd2019
47 changed files with 449 additions and 1404 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/Core/VideoBackends/Software/SWmain.cpp
View file

@ -71,7 +71,7 @@ void VideoSoftware::ShowConfig(void *hParent)
Host_ShowVideoConfig(hParent, GetDisplayName(), "gfx_software");
}
bool VideoSoftware::Initialize(void *&window_handle)
bool VideoSoftware::Initialize(void *window_handle)
{
g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str());
@ -372,10 +372,4 @@ unsigned int VideoSoftware::PeekMessages()
return GLInterface->PeekMessages();
}
// Show the current FPS
void VideoSoftware::UpdateFPSDisplay(const std::string& text)
{
GLInterface->UpdateFPSDisplay(StringFromFormat("%s | Software | %s", scm_rev_str, text.c_str()));
}
}

3
Source/Core/VideoBackends/Software/VideoBackend.h
View file

@ -10,7 +10,7 @@ namespace SW
class VideoSoftware : public VideoBackend
{
bool Initialize(void *&) override;
bool Initialize(void *window_handle) override;
void Shutdown() override;
std::string GetName() const override;
@ -48,7 +48,6 @@ class VideoSoftware : public VideoBackend
void RegisterCPMMIO(MMIO::Mapping* mmio, u32 base) override;
void UpdateFPSDisplay(const std::string&) override;
unsigned int PeekMessages() override;
void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;