diff options
| author | NeoBrainX <NeoBrainX@googlemail.com> | 2013-03-01 01:07:34 +0100 |
|---|---|---|
| committer | NeoBrainX <NeoBrainX@googlemail.com> | 2013-03-01 01:07:34 +0100 |
| commit | 7682ed22c6d584bd276c1049c9b5068b1610da61 (patch) | |
| tree | ea65d89f5b4b172bc1bbbd437ebc28752f336332 /Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp | |
| parent | 0f617183a8a74f066d1d01a3ed50042cc9824bf8 (diff) | |
| parent | bc15919e2ebefe327ce6330f7abdaccaa2fd2004 (diff) | |
Merge branch 'master' into perfqueries.
Conflicts:
Source/Core/VideoCommon/Src/VideoConfig.h
Source/Core/VideoCommon/VideoCommon.vcxproj.filters
Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp index ad19eb87ee..a621542ea0 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp @@ -53,6 +53,8 @@ void DoState(PointerWrap &p) p.Do(pereg); p.Do(g_bSignalTokenInterrupt); p.Do(g_bSignalFinishInterrupt); + p.Do(et_SetTokenOnMainThread); + p.Do(et_SetFinishOnMainThread); } void UpdateInterrupts(); |