diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2013-03-02 15:33:32 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2013-03-02 15:33:32 -0600 |
| commit | 2b1af36900bcb13102690bd862246b9cc3b7d541 (patch) | |
| tree | 50a950e592d7bfcaab9a575ddfa8037e9701b1f2 /Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp | |
| parent | e079d2491282f334f0d87dd16801550efcf8d4d1 (diff) | |
| parent | 2356e5c0e7dab9c0f541e48f8df5fd663d3b671f (diff) | |
Merge branch 'master' into windows-unicode
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp index 33a6164b01..118e59629e 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(); @@ -77,7 +79,7 @@ void Read16(u16& _uReturnValue, const u32 _iAddress) u16 address = _iAddress & 0xFFF; - if (address <= 0x16) + if (address <= 0x2e) _uReturnValue = ((u16*)&pereg)[address >> 1]; } @@ -109,7 +111,7 @@ void Write16(const u16 _iValue, const u32 _iAddress) } break; default: - if (address <= 0x16) + if (address <= 0x2e) ((u16*)&pereg)[address >> 1] = _iValue; break; } |