piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into wxw3-update

Browse Source 
Conflicts:
	Source/Core/DolphinWX/Src/LogWindow.cpp
This commit is contained in:
Shawn Hoffman
2012-03-22 17:57:38 -07:00
parent 5242f09104 9c9e593479
commit f7423a0a4f
186 changed files with 1193 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
View File

@ -215,6 +215,12 @@ bool VideoSoftware::Video_IsPossibleWaitingSetDrawDone(void)
return false;
}
bool VideoSoftware::Video_IsHiWatermarkActive(void)
{
return false;
}
void VideoSoftware::Video_AbortFrame(void)
{
}

2
Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h
View File

@ -36,7 +36,7 @@ class VideoSoftware : public VideoBackend
void Video_SetRendering(bool bEnabled);
void Video_GatherPipeBursted();
bool Video_IsHiWatermarkActive();
bool Video_IsPossibleWaitingSetDrawDone();
void Video_AbortFrame();