Core: Remove UpdateFPSDisplay
This is effectively unused, as the window handles that we pass to the GLInterface are window handles for the frame which isn't ever a real toplevel window. Host_UpdateTitle is what actually sets the proper title on the render window.
This commit is contained in:
parent
7ca8d8dfc7
commit
63f1a16969
|
@ -694,9 +694,6 @@ void UpdateTitle()
|
||||||
std::string SMessage = StringFromFormat("%s | %s", SSettings.c_str(), SFPS.c_str());
|
std::string SMessage = StringFromFormat("%s | %s", SSettings.c_str(), SFPS.c_str());
|
||||||
std::string TMessage = StringFromFormat("%s | %s", scm_rev_str, SMessage.c_str());
|
std::string TMessage = StringFromFormat("%s | %s", scm_rev_str, SMessage.c_str());
|
||||||
|
|
||||||
// Show message
|
|
||||||
g_video_backend->UpdateFPSDisplay(SMessage);
|
|
||||||
|
|
||||||
// Update the audio timestretcher with the current speed
|
// Update the audio timestretcher with the current speed
|
||||||
if (soundStream)
|
if (soundStream)
|
||||||
{
|
{
|
||||||
|
|
|
@ -7,9 +7,6 @@
|
||||||
#include "VideoCommon/RenderBase.h"
|
#include "VideoCommon/RenderBase.h"
|
||||||
|
|
||||||
// Show the current FPS
|
// Show the current FPS
|
||||||
void cInterfaceEGL::UpdateFPSDisplay(const std::string& text)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
void cInterfaceEGL::Swap()
|
void cInterfaceEGL::Swap()
|
||||||
{
|
{
|
||||||
eglSwapBuffers(GLWin.egl_dpy, GLWin.egl_surf);
|
eglSwapBuffers(GLWin.egl_dpy, GLWin.egl_surf);
|
||||||
|
|
|
@ -18,7 +18,6 @@ public:
|
||||||
void SwapInterval(int Interval);
|
void SwapInterval(int Interval);
|
||||||
void Swap();
|
void Swap();
|
||||||
void SetMode(u32 mode) { s_opengl_mode = mode; }
|
void SetMode(u32 mode) { s_opengl_mode = mode; }
|
||||||
void UpdateFPSDisplay(const std::string& text);
|
|
||||||
void* GetFuncAddress(const std::string& name);
|
void* GetFuncAddress(const std::string& name);
|
||||||
bool Create(void *window_handle);
|
bool Create(void *window_handle);
|
||||||
bool MakeCurrent();
|
bool MakeCurrent();
|
||||||
|
|
|
@ -12,12 +12,6 @@
|
||||||
typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
|
typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
|
||||||
static PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalSGI = nullptr;
|
static PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalSGI = nullptr;
|
||||||
|
|
||||||
// Show the current FPS
|
|
||||||
void cInterfaceGLX::UpdateFPSDisplay(const std::string& text)
|
|
||||||
{
|
|
||||||
XStoreName(GLWin.dpy, GLWin.win, text.c_str());
|
|
||||||
}
|
|
||||||
|
|
||||||
void cInterfaceGLX::SwapInterval(int Interval)
|
void cInterfaceGLX::SwapInterval(int Interval)
|
||||||
{
|
{
|
||||||
if (glXSwapIntervalSGI)
|
if (glXSwapIntervalSGI)
|
||||||
|
|
|
@ -17,7 +17,6 @@ public:
|
||||||
friend class cX11Window;
|
friend class cX11Window;
|
||||||
void SwapInterval(int Interval) override;
|
void SwapInterval(int Interval) override;
|
||||||
void Swap() override;
|
void Swap() override;
|
||||||
void UpdateFPSDisplay(const std::string& text) override;
|
|
||||||
void* GetFuncAddress(const std::string& name) override;
|
void* GetFuncAddress(const std::string& name) override;
|
||||||
bool Create(void *window_handle);
|
bool Create(void *window_handle);
|
||||||
bool MakeCurrent() override;
|
bool MakeCurrent() override;
|
||||||
|
|
|
@ -55,12 +55,6 @@ bool cInterfaceWGL::PeekMessages()
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show the current FPS
|
|
||||||
void cInterfaceWGL::UpdateFPSDisplay(const std::string& text)
|
|
||||||
{
|
|
||||||
SetWindowTextA(m_window_handle, text.c_str());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create rendering window.
|
// Create rendering window.
|
||||||
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
|
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
|
||||||
bool cInterfaceWGL::Create(void *window_handle)
|
bool cInterfaceWGL::Create(void *window_handle)
|
||||||
|
|
|
@ -12,7 +12,6 @@ class cInterfaceWGL : public cInterfaceBase
|
||||||
public:
|
public:
|
||||||
void SwapInterval(int Interval);
|
void SwapInterval(int Interval);
|
||||||
void Swap();
|
void Swap();
|
||||||
void UpdateFPSDisplay(const std::string& text);
|
|
||||||
void* GetFuncAddress(const std::string& name);
|
void* GetFuncAddress(const std::string& name);
|
||||||
bool Create(void *window_handle);
|
bool Create(void *window_handle);
|
||||||
bool MakeCurrent();
|
bool MakeCurrent();
|
||||||
|
|
|
@ -19,7 +19,6 @@ class VideoBackend : public VideoBackendHardware
|
||||||
|
|
||||||
void ShowConfig(void* parent) override;
|
void ShowConfig(void* parent) override;
|
||||||
|
|
||||||
void UpdateFPSDisplay(const std::string&) override;
|
|
||||||
unsigned int PeekMessages() override;
|
unsigned int PeekMessages() override;
|
||||||
|
|
||||||
void* m_window_handle;
|
void* m_window_handle;
|
||||||
|
|
|
@ -51,12 +51,6 @@ unsigned int VideoBackend::PeekMessages()
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
void VideoBackend::UpdateFPSDisplay(const std::string& text)
|
|
||||||
{
|
|
||||||
std::string str = StringFromFormat("%s | D3D | %s", scm_rev_str, text.c_str());
|
|
||||||
SetWindowTextA((HWND)m_window_handle, str.c_str());
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string VideoBackend::GetName() const
|
std::string VideoBackend::GetName() const
|
||||||
{
|
{
|
||||||
return "D3D";
|
return "D3D";
|
||||||
|
|
|
@ -25,7 +25,6 @@ protected:
|
||||||
u32 s_opengl_mode;
|
u32 s_opengl_mode;
|
||||||
public:
|
public:
|
||||||
virtual void Swap() {}
|
virtual void Swap() {}
|
||||||
virtual void UpdateFPSDisplay(const std::string& text) {}
|
|
||||||
virtual void SetMode(u32 mode) { s_opengl_mode = GLInterfaceMode::MODE_OPENGL; }
|
virtual void SetMode(u32 mode) { s_opengl_mode = GLInterfaceMode::MODE_OPENGL; }
|
||||||
virtual u32 GetMode() { return s_opengl_mode; }
|
virtual u32 GetMode() { return s_opengl_mode; }
|
||||||
virtual void* GetFuncAddress(const std::string& name) { return nullptr; }
|
virtual void* GetFuncAddress(const std::string& name) { return nullptr; }
|
||||||
|
|
|
@ -26,12 +26,6 @@ unsigned int VideoBackend::PeekMessages()
|
||||||
return GLInterface->PeekMessages();
|
return GLInterface->PeekMessages();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show the current FPS
|
|
||||||
void VideoBackend::UpdateFPSDisplay(const std::string& text)
|
|
||||||
{
|
|
||||||
return GLInterface->UpdateFPSDisplay(StringFromFormat("%s | %s | %s", scm_rev_str, GetDisplayName().c_str(), text.c_str()));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
void InitInterface()
|
void InitInterface()
|
||||||
{
|
{
|
||||||
|
|
|
@ -19,7 +19,6 @@ class VideoBackend : public VideoBackendHardware
|
||||||
|
|
||||||
void ShowConfig(void* parent) override;
|
void ShowConfig(void* parent) override;
|
||||||
|
|
||||||
void UpdateFPSDisplay(const std::string&) override;
|
|
||||||
unsigned int PeekMessages() override;
|
unsigned int PeekMessages() override;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -372,10 +372,4 @@ unsigned int VideoSoftware::PeekMessages()
|
||||||
return GLInterface->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()));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,7 +48,6 @@ class VideoSoftware : public VideoBackend
|
||||||
|
|
||||||
void RegisterCPMMIO(MMIO::Mapping* mmio, u32 base) override;
|
void RegisterCPMMIO(MMIO::Mapping* mmio, u32 base) override;
|
||||||
|
|
||||||
void UpdateFPSDisplay(const std::string&) override;
|
|
||||||
unsigned int PeekMessages() override;
|
unsigned int PeekMessages() override;
|
||||||
|
|
||||||
void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
|
void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
|
||||||
|
|
|
@ -14,8 +14,6 @@
|
||||||
#include "VideoCommon/VertexShaderGen.h"
|
#include "VideoCommon/VertexShaderGen.h"
|
||||||
#include "VideoCommon/VideoConfig.h"
|
#include "VideoCommon/VideoConfig.h"
|
||||||
|
|
||||||
//void UpdateFPSDisplay(const char *text);
|
|
||||||
|
|
||||||
GFXDebuggerBase *g_pdebugger = nullptr;
|
GFXDebuggerBase *g_pdebugger = nullptr;
|
||||||
volatile bool GFXDebuggerPauseFlag = false; // if true, the GFX thread will be spin locked until it's false again
|
volatile bool GFXDebuggerPauseFlag = false; // if true, the GFX thread will be spin locked until it's false again
|
||||||
volatile PauseEvent GFXDebuggerToPauseAtNext = NOT_PAUSE; // Event which will trigger spin locking the GFX thread
|
volatile PauseEvent GFXDebuggerToPauseAtNext = NOT_PAUSE; // Event which will trigger spin locking the GFX thread
|
||||||
|
@ -57,8 +55,6 @@ void GFXDebuggerCheckAndPause(bool update)
|
||||||
g_pdebugger->OnPause();
|
g_pdebugger->OnPause();
|
||||||
while ( GFXDebuggerPauseFlag )
|
while ( GFXDebuggerPauseFlag )
|
||||||
{
|
{
|
||||||
g_video_backend->UpdateFPSDisplay("Paused by Video Debugger");
|
|
||||||
|
|
||||||
if (update) GFXDebuggerUpdateScreen();
|
if (update) GFXDebuggerUpdateScreen();
|
||||||
SLEEP(5);
|
SLEEP(5);
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,8 +68,6 @@ public:
|
||||||
|
|
||||||
virtual void EmuStateChange(EMUSTATE_CHANGE) = 0;
|
virtual void EmuStateChange(EMUSTATE_CHANGE) = 0;
|
||||||
|
|
||||||
virtual void UpdateFPSDisplay(const std::string&) = 0;
|
|
||||||
|
|
||||||
virtual unsigned int PeekMessages() = 0;
|
virtual unsigned int PeekMessages() = 0;
|
||||||
|
|
||||||
virtual bool Initialize(void *window_handle) = 0;
|
virtual bool Initialize(void *window_handle) = 0;
|
||||||
|
|
Loading…
Reference in New Issue