summaryrefslogtreecommitdiff
path: root/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
diff options
context:
space:
mode:
authorSoren Jorvang <soren.jorvang@gmail.com>2011-02-07 22:01:08 +0000
committerSoren Jorvang <soren.jorvang@gmail.com>2011-02-07 22:01:08 +0000
commitd83d129c38c7d38167f9bd3af0d08f6e7bf3ea85 (patch)
treeace2417cfcf9e4727c2755a21531c1d973426660 /Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
parentf48c2832941d2568e1cb250890c83287dcaac094 (diff)
Reach over for Plugin_VideoOGL's copy of GLUtil.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7104 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp')
-rw-r--r--Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp31
1 files changed, 29 insertions, 2 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
index 7e85fb3580..56aa48cc3b 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
@@ -151,7 +151,7 @@ bool VideoBackend::Video_Screenshot(const char *_szFilename)
// -------------------------------
void VideoBackend::Video_EnterLoop()
{
- Fifo_EnterLoop();
+ Fifo_EnterLoop();
}
void VideoBackend::Video_ExitLoop()
@@ -169,7 +169,7 @@ void VideoBackend::Video_ClearMessages()
void VideoBackend::Video_SetRendering(bool bEnabled)
{
- Fifo_SetRendering(bEnabled);
+ Fifo_SetRendering(bEnabled);
}
void VideoBackend::Video_WaitForFrameFinish(void)
@@ -185,4 +185,31 @@ void VideoBackend::Video_AbortFrame(void)
{
}
+// Draw messages on top of the screen
+unsigned int VideoBackend::PeekMessages()
+{
+#ifdef _WIN32
+ // TODO: peekmessage
+ MSG msg;
+ while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
+ {
+ if (msg.message == WM_QUIT)
+ return FALSE;
+ TranslateMessage(&msg);
+ DispatchMessage(&msg);
+ }
+ return TRUE;
+#else
+ return false;
+#endif
+}
+
+// Show the current FPS
+void VideoBackend::UpdateFPSDisplay(const char *text)
+{
+ char temp[100];
+ snprintf(temp, sizeof temp, "%s | Software | %s", svn_rev_str, text);
+ OpenGL_SetWindowText(temp);
+}
+
}