From 8b309e26dc00c354e0fc71fa6ac9b6990f79710a Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Wed, 2 Feb 2011 04:40:27 +0000 Subject: [PATCH] Remove PluginSpecs.h. Merge the few needed enums from that file into Common.h for now. I am up for suggestions on a better place for those. Fix frame dumping on linux. Make sure that on screen messages get cleared between games. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7039 8ced0084-cf51-0410-be5f-012b33b47a6e --- CMakeLists.txt | 1 - SConstruct | 2 +- Source/Core/Common/Common.vcproj | 16 ++--- Source/Core/Common/Common.vcxproj | 14 ++--- Source/Core/Common/Src/Common.h | 20 +++++++ Source/Core/Common/Src/VideoBackendBase.cpp | 6 +- Source/Core/Common/Src/VideoBackendBase.h | 8 +-- Source/Core/Core/Core.vcproj | 12 ++-- Source/Core/Core/Core.vcxproj | 14 ++--- Source/Core/Core/Src/Core.cpp | 5 +- Source/Core/Core/Src/HLE/HLE_Misc.cpp | 1 - Source/Core/Core/Src/HW/CPU.cpp | 4 +- Source/Core/Core/Src/HW/Wiimote.cpp | 2 +- Source/Core/Core/Src/HW/Wiimote.h | 3 +- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 2 +- .../Core/Src/HW/WiimoteReal/WiimoteReal.h | 2 +- .../DebuggerUICommon/DebuggerUICommon.vcproj | 12 ++-- Source/Core/DebuggerWX/Debugger.vcxproj | 14 ++--- Source/Core/DebuggerWX/DebuggerWX.vcproj | 12 ++-- Source/Core/DolphinWX/Dolphin.vcxproj | 14 ++--- Source/Core/DolphinWX/DolphinWX.vcproj | 12 ++-- Source/Core/InputCommon/InputCommon.vcproj | 12 ++-- Source/Core/VideoCommon/Src/AVIDump.cpp | 1 + Source/Core/VideoCommon/Src/BPStructs.cpp | 4 +- Source/Core/VideoCommon/Src/MainBase.cpp | 23 +++++--- .../Core/VideoCommon/Src/NativeVertexFormat.h | 2 +- .../Core/VideoCommon/Src/OnScreenDisplay.cpp | 7 +++ Source/Core/VideoCommon/Src/OnScreenDisplay.h | 1 + .../Core/VideoCommon/Src/OpcodeDecoding.cpp | 4 +- Source/Core/VideoCommon/Src/RenderBase.cpp | 2 +- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 2 - Source/Core/VideoCommon/Src/VideoCommon.h | 5 ++ Source/Core/VideoCommon/VideoCommon.vcproj | 12 ++-- Source/Core/VideoCommon/VideoCommon.vcxproj | 14 ++--- .../Core/VideoUICommon/VideoUICommon.vcproj | 12 ++-- .../Core/VideoUICommon/VideoUICommon.vcxproj | 14 ++--- Source/PluginSpecs/PluginSpecs.h | 59 ------------------- .../Plugin_VideoDX11/Plugin_VideoDX11.vcproj | 12 ++-- .../Plugin_VideoDX11/Plugin_VideoDX11.vcxproj | 14 ++--- .../Plugin_VideoDX9/Plugin_VideoDX9.vcproj | 12 ++-- .../Plugin_VideoDX9/Plugin_VideoDX9.vcxproj | 14 ++--- .../Plugin_VideoOGL/Plugin_VideoOGL.vcproj | 12 ++-- .../Plugin_VideoOGL/Plugin_VideoOGL.vcxproj | 14 ++--- Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 4 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 3 + Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 5 -- .../Plugin_VideoSoftware.vcproj | 8 +-- .../Plugin_VideoSoftware.vcxproj | 10 ++-- .../Plugin_VideoSoftware/Src/VideoBackend.h | 2 +- .../Plugins/Plugin_VideoSoftware/Src/main.cpp | 2 +- Source/UnitTests/UnitTests.vcproj | 8 +-- 51 files changed, 221 insertions(+), 249 deletions(-) delete mode 100644 Source/PluginSpecs/PluginSpecs.h diff --git a/CMakeLists.txt b/CMakeLists.txt index a53c977bc3..8ed3c5f21e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -246,7 +246,6 @@ endif() ######################################## # Setup include directories (and make sure they are preferred over the Externals) # -include_directories(Source/PluginSpecs) include_directories(Source/Core/AudioCommon/Src) include_directories(Source/Core/Common/Src) include_directories(Source/Core/Core/Src) diff --git a/SConstruct b/SConstruct index 387eea179b..a1567dc4ca 100644 --- a/SConstruct +++ b/SConstruct @@ -95,7 +95,7 @@ if env['flavor'] == 'debug': env['CPPDEFINES'] += ['_DEBUG'] elif env['flavor'] == 'fastlog': env['CPPDEFINES'] += ['DEBUGFAST'] -env['CPPPATH'] = ['#Source/PluginSpecs'] +env['CPPPATH'] = [] env['LIBPATH'] = [] env['LIBS'] = [] diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj index 988c386b43..f3ef52f869 100644 --- a/Source/Core/Common/Common.vcproj +++ b/Source/Core/Common/Common.vcproj @@ -46,7 +46,7 @@ - - diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index 8cc11f9866..4b062233f5 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -116,7 +116,7 @@ Level3 Disabled _SECURE_SCL=0;%(PreprocessorDefinitions) - .\Src;..\..\PluginSpecs;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) + .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) MultiThreadedDebug stdafx.h Use @@ -133,7 +133,7 @@ Level3 Disabled _SECURE_SCL=0;%(PreprocessorDefinitions) - .\Src;..\..\PluginSpecs;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) + .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) stdafx.h Use MultiThreadedDebug @@ -152,7 +152,7 @@ true true _SECURE_SCL=0;%(PreprocessorDefinitions) - .\Src;..\..\PluginSpecs;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) + .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) MultiThreaded Use stdafx.h @@ -173,7 +173,7 @@ true true DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) - .\Src;..\..\PluginSpecs;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) + .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) MultiThreaded Use stdafx.h @@ -195,7 +195,7 @@ true true _SECURE_SCL=0;%(PreprocessorDefinitions) - .\Src;..\..\PluginSpecs;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) + .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) stdafx.h Use MultiThreaded @@ -216,7 +216,7 @@ true true DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) - .\Src;..\..\PluginSpecs;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) + .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) stdafx.h Use MultiThreaded @@ -335,4 +335,4 @@ - \ No newline at end of file + diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index 9bb42aaf9b..d1d647fe81 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -159,4 +159,24 @@ private: #define _M_SSE 0x401 #endif +// Host communication. +enum HOST_COMM +{ + // Begin at 10 in case there is already messages with wParam = 0, 1, 2 and so on + WM_USER_PAUSE = 10, + WM_USER_STOP, + WM_USER_CREATE, + WM_USER_SETCURSOR, + WM_USER_KEYDOWN, + WIIMOTE_DISCONNECT // Disconnect Wiimote +}; + +// Used for notification on emulation state +enum EMUSTATE_CHANGE +{ + EMUSTATE_CHANGE_PLAY = 1, + EMUSTATE_CHANGE_PAUSE, + EMUSTATE_CHANGE_STOP +}; + #endif // _COMMON_H_ diff --git a/Source/Core/Common/Src/VideoBackendBase.cpp b/Source/Core/Common/Src/VideoBackendBase.cpp index ff3bb809a0..3efa6ddbac 100644 --- a/Source/Core/Common/Src/VideoBackendBase.cpp +++ b/Source/Core/Common/Src/VideoBackendBase.cpp @@ -19,10 +19,10 @@ // TODO: ugly #ifdef _WIN32 -#include "../Plugins/Plugin_VideoDX9/Src/VideoBackend.h" -#include "../Plugins/Plugin_VideoDX11/Src/VideoBackend.h" +#include "../../../Plugins/Plugin_VideoDX9/Src/VideoBackend.h" +#include "../../../Plugins/Plugin_VideoDX11/Src/VideoBackend.h" #endif -#include "../Plugins/Plugin_VideoOGL/Src/VideoBackend.h" +#include "../../../Plugins/Plugin_VideoOGL/Src/VideoBackend.h" //#include "../Plugins/Plugin_VideoSoftware/Src/VideoBackend.h" std::vector g_available_video_backends; diff --git a/Source/Core/Common/Src/VideoBackendBase.h b/Source/Core/Common/Src/VideoBackendBase.h index 4747ec91a9..ba90717009 100644 --- a/Source/Core/Common/Src/VideoBackendBase.h +++ b/Source/Core/Common/Src/VideoBackendBase.h @@ -21,8 +21,6 @@ #include #include -#include "PluginSpecs.h" - #include "ChunkFile.h" enum FieldType @@ -80,7 +78,7 @@ class VideoBackend public: virtual ~VideoBackend() {} - virtual void EmuStateChange(PLUGIN_EMUSTATE) = 0; + virtual void EmuStateChange(EMUSTATE_CHANGE) = 0; virtual void UpdateFPSDisplay(const char*) = 0; @@ -106,6 +104,7 @@ public: virtual u32 Video_AccessEFB(EFBAccessType, u32, u32, u32) = 0; virtual void Video_AddMessage(const char* pstr, unsigned int milliseconds) = 0; + virtual void Video_ClearMessages() = 0; virtual bool Video_Screenshot(const char* filename) = 0; virtual void Video_SetRendering(bool bEnabled) = 0; @@ -129,7 +128,7 @@ class VideoBackendHLE : public VideoBackend { void DoState(PointerWrap &p); - void EmuStateChange(PLUGIN_EMUSTATE); + void EmuStateChange(EMUSTATE_CHANGE); void Video_EnterLoop(); void Video_ExitLoop(); @@ -138,6 +137,7 @@ class VideoBackendHLE : public VideoBackend u32 Video_AccessEFB(EFBAccessType, u32, u32, u32); void Video_AddMessage(const char* pstr, unsigned int milliseconds); + void Video_ClearMessages(); bool Video_Screenshot(const char* filename); void Video_SetRendering(bool bEnabled); diff --git a/Source/Core/Core/Core.vcproj b/Source/Core/Core/Core.vcproj index 62b79fe3e5..b7448218ac 100644 --- a/Source/Core/Core/Core.vcproj +++ b/Source/Core/Core/Core.vcproj @@ -45,7 +45,7 @@ Level3 Disabled - .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;..\..\..\Externals\Lua;%(AdditionalIncludeDirectories) + .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;..\..\..\Externals\Lua;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug stdafx.h @@ -146,7 +146,7 @@ Level3 Disabled - .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;..\..\..\Externals\Lua;%(AdditionalIncludeDirectories) + .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;..\..\..\Externals\Lua;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug stdafx.h @@ -167,7 +167,7 @@ MaxSpeed true true - .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;..\..\..\Externals\Lua;%(AdditionalIncludeDirectories) + .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;..\..\..\Externals\Lua;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded false @@ -191,7 +191,7 @@ MaxSpeed true true - .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;..\..\..\Externals\Lua;%(AdditionalIncludeDirectories) + .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;..\..\..\Externals\Lua;%(AdditionalIncludeDirectories) DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded false @@ -216,7 +216,7 @@ MaxSpeed true true - .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;..\..\..\Externals\Lua;%(AdditionalIncludeDirectories) + .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;..\..\..\Externals\Lua;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded false @@ -240,7 +240,7 @@ MaxSpeed true true - .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;..\..\..\Externals\Lua;%(AdditionalIncludeDirectories) + .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;..\..\..\Externals\Lua;%(AdditionalIncludeDirectories) DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded false @@ -641,4 +641,4 @@ - \ No newline at end of file + diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index bb03cc8e79..d7dd5eb635 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -191,7 +191,7 @@ void Stop() // - Hammertime! { const SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter; g_bStopping = true; - g_video_backend->EmuStateChange(PLUGIN_EMUSTATE_STOP); + g_video_backend->EmuStateChange(EMUSTATE_CHANGE_STOP); WARN_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutting down ----"); @@ -216,6 +216,9 @@ void Stop() // - Hammertime! cpuRunloopQuit.Wait(); } + // Clear on screen messages that haven't expired + g_video_backend->Video_ClearMessages(); + // Close the trace file Core::StopTrace(); diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp index 7c9f8fa2ec..d69bf09680 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp @@ -21,7 +21,6 @@ #include "../PowerPC/PowerPC.h" #include "../HW/Memmap.h" -#include "PluginSpecs.h" #include "../Host.h" namespace HLE_Misc diff --git a/Source/Core/Core/Src/HW/CPU.cpp b/Source/Core/Core/Src/HW/CPU.cpp index e091935bc2..75a76010b6 100644 --- a/Source/Core/Core/Src/HW/CPU.cpp +++ b/Source/Core/Core/Src/HW/CPU.cpp @@ -117,14 +117,14 @@ void CCPU::EnableStepping(const bool _bStepping) if (_bStepping) { PowerPC::Pause(); - g_video_backend->EmuStateChange(PLUGIN_EMUSTATE_PAUSE); + g_video_backend->EmuStateChange(EMUSTATE_CHANGE_PAUSE); DSP::GetPlugin()->DSP_ClearAudioBuffer(true); } else { PowerPC::Start(); m_StepEvent.Set(); - g_video_backend->EmuStateChange(PLUGIN_EMUSTATE_PLAY); + g_video_backend->EmuStateChange(EMUSTATE_CHANGE_PLAY); DSP::GetPlugin()->DSP_ClearAudioBuffer(false); } } diff --git a/Source/Core/Core/Src/HW/Wiimote.cpp b/Source/Core/Core/Src/HW/Wiimote.cpp index fe42f006ee..2b79974e49 100644 --- a/Source/Core/Core/Src/HW/Wiimote.cpp +++ b/Source/Core/Core/Src/HW/Wiimote.cpp @@ -144,7 +144,7 @@ void DoState(unsigned char **ptr, int mode) // input: newState // output: none // -void EmuStateChange(PLUGIN_EMUSTATE newState) +void EmuStateChange(EMUSTATE_CHANGE newState) { // TODO WiimoteReal::StateChange(newState); diff --git a/Source/Core/Core/Src/HW/Wiimote.h b/Source/Core/Core/Src/HW/Wiimote.h index 843f62e249..5e0ab8d05e 100644 --- a/Source/Core/Core/Src/HW/Wiimote.h +++ b/Source/Core/Core/Src/HW/Wiimote.h @@ -2,7 +2,6 @@ #ifndef _WIIMOTE_H_ #define _WIIMOTE_H_ -#include "PluginSpecs.h" #include "../../InputCommon/Src/InputConfig.h" #define MAX_WIIMOTES 4 @@ -27,7 +26,7 @@ void Initialize(void* const hwnd); unsigned int GetAttached(); void DoState(unsigned char **ptr, int mode); -void EmuStateChange(PLUGIN_EMUSTATE newState); +void EmuStateChange(EMUSTATE_CHANGE newState); InputPlugin *GetPlugin(); void ControlChannel(int _number, u16 _channelID, const void* _pData, u32 _Size); diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index da2e0ea662..63cdb7df08 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -509,7 +509,7 @@ void Update(int _WiimoteNumber) g_refresh_critsec.Leave(); } -void StateChange(PLUGIN_EMUSTATE newState) +void StateChange(EMUSTATE_CHANGE newState) { //g_refresh_critsec.Enter(); // enter diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index 429c71691a..635784e91a 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -108,7 +108,7 @@ void ControlChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 void Update(int _WiimoteNumber); void DoState(PointerWrap &p); -void StateChange(PLUGIN_EMUSTATE newState); +void StateChange(EMUSTATE_CHANGE newState); int FindWiimotes(Wiimote** wm, int max_wiimotes); diff --git a/Source/Core/DebuggerUICommon/DebuggerUICommon.vcproj b/Source/Core/DebuggerUICommon/DebuggerUICommon.vcproj index 4ee5c0dde7..55a1a81df7 100644 --- a/Source/Core/DebuggerUICommon/DebuggerUICommon.vcproj +++ b/Source/Core/DebuggerUICommon/DebuggerUICommon.vcproj @@ -44,7 +44,7 @@ Level3 Disabled - ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) + ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) _SECURE_SCL=0;%(PreprocessorDefinitions) MultiThreadedDebug Use @@ -221,7 +221,7 @@ Level3 Disabled - ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) + ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) _SECURE_SCL=0;%(PreprocessorDefinitions) MultiThreadedDebug Use @@ -237,7 +237,7 @@ MaxSpeed true true - ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) + ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) _SECURE_SCL=0;%(PreprocessorDefinitions) MultiThreaded Use @@ -255,7 +255,7 @@ MaxSpeed true true - ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) + ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) MultiThreaded Use @@ -274,7 +274,7 @@ MaxSpeed true true - ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) + ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) _SECURE_SCL=0;%(PreprocessorDefinitions) MultiThreaded Use @@ -293,7 +293,7 @@ MaxSpeed true true - ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) + ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) MultiThreaded Use @@ -309,4 +309,4 @@ - \ No newline at end of file + diff --git a/Source/Core/DebuggerWX/DebuggerWX.vcproj b/Source/Core/DebuggerWX/DebuggerWX.vcproj index 2903b537d6..619722da42 100644 --- a/Source/Core/DebuggerWX/DebuggerWX.vcproj +++ b/Source/Core/DebuggerWX/DebuggerWX.vcproj @@ -46,7 +46,7 @@ Name="VCCLCompilerTool" Optimization="0" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\VideoUICommon\Src;..\VideoCommon\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerUICommon\Src" + AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\VideoUICommon\Src;..\VideoCommon\Src;..\InputCommon\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerUICommon\Src" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -113,7 +113,7 @@ Name="VCCLCompilerTool" Optimization="0" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\VideoUICommon\Src;..\VideoCommon\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerUICommon\Src" + AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\VideoUICommon\Src;..\VideoCommon\Src;..\InputCommon\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerUICommon\Src" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" ExceptionHandling="2" @@ -179,7 +179,7 @@ Level3 Disabled - ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\DiscIO\Src;..\..\PluginSpecs;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;%(PreprocessorDefinitions) MultiThreadedDebug stdafx.h @@ -157,7 +157,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / Level3 Disabled - ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\DiscIO\Src;..\..\PluginSpecs;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;%(PreprocessorDefinitions) MultiThreadedDebug stdafx.h @@ -185,7 +185,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / MaxSpeed true true - ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\DiscIO\Src;..\..\PluginSpecs;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;%(PreprocessorDefinitions) MultiThreaded stdafx.h @@ -215,7 +215,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / MaxSpeed true true - ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\PluginSpecs;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) MultiThreaded stdafx.h @@ -247,7 +247,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / MaxSpeed true true - ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\DiscIO\Src;..\..\PluginSpecs;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;%(PreprocessorDefinitions) MultiThreaded stdafx.h @@ -277,7 +277,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / MaxSpeed true true - ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\PluginSpecs;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) MultiThreaded stdafx.h @@ -457,4 +457,4 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - \ No newline at end of file + diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj index 1465e038a1..e2bd176af9 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcproj +++ b/Source/Core/DolphinWX/DolphinWX.vcproj @@ -56,7 +56,7 @@ Optimization="3" InlineFunctionExpansion="0" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\AudioCommon\Src;..\InputCommon\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\DiscIO\Src;..\AudioCommon\Src..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include;..\..\..\Externals\CLRun\include" + AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\AudioCommon\Src;..\InputCommon\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\DiscIO\Src;..\AudioCommon\Src..\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include;..\..\..\Externals\CLRun\include" PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" StringPooling="false" RuntimeLibrary="0" @@ -175,7 +175,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="false" - AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\AudioCommon\Src;..\InputCommon\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\DiscIO\Src;..\AudioCommon\Src..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include;..\..\..\Externals\CLRun\include" + AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\AudioCommon\Src;..\InputCommon\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\DiscIO\Src;..\AudioCommon\Src..\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include;..\..\..\Externals\CLRun\include" PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" StringPooling="true" RuntimeLibrary="0" @@ -287,7 +287,7 @@ filename, sizeof(s_FormatContext->filename), "%s", StringFromFormat("%sframedump0.avi", File::GetUserPath(D_DUMPFRAMES_IDX)).c_str()); + File::CreateFullPath(s_FormatContext->filename); if (!(s_FormatContext->oformat = av_guess_format("avi", NULL, NULL)) || !(s_Stream = av_new_stream(s_FormatContext, 0))) diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index 17ca146653..600a4e45af 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -217,11 +217,11 @@ void BPWritten(const BPCmd& bp) } break; case BPMEM_PE_TOKEN_ID: // Pixel Engine Token ID - PixelEngine::SetToken(static_cast(bp.newvalue & 0xFFFF), FALSE); + PixelEngine::SetToken(static_cast(bp.newvalue & 0xFFFF), false); DEBUG_LOG(VIDEO, "SetPEToken 0x%04x", (bp.newvalue & 0xFFFF)); break; case BPMEM_PE_TOKEN_INT_ID: // Pixel Engine Interrupt Token ID - PixelEngine::SetToken(static_cast(bp.newvalue & 0xFFFF), TRUE); + PixelEngine::SetToken(static_cast(bp.newvalue & 0xFFFF), true); DEBUG_LOG(VIDEO, "SetPEToken + INT 0x%04x", (bp.newvalue & 0xFFFF)); break; // ------------------------ diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp index 762ffcb157..409b141d9f 100644 --- a/Source/Core/VideoCommon/Src/MainBase.cpp +++ b/Source/Core/VideoCommon/Src/MainBase.cpp @@ -39,9 +39,9 @@ static struct static u32 s_AccessEFBResult = 0; -void VideoBackendHLE::EmuStateChange(PLUGIN_EMUSTATE newState) +void VideoBackendHLE::EmuStateChange(EMUSTATE_CHANGE newState) { - Fifo_RunLoop((newState == PLUGIN_EMUSTATE_PLAY) ? true : false); + Fifo_RunLoop((newState == EMUSTATE_CHANGE_PLAY) ? true : false); } // Enter and exit the video loop @@ -70,7 +70,7 @@ void VideoFifo_CheckSwapRequest() { EFBRectangle rc; g_renderer->Swap(s_beginFieldArgs.xfbAddr, s_beginFieldArgs.field, s_beginFieldArgs.fbWidth, s_beginFieldArgs.fbHeight,rc); - Common::AtomicStoreRelease(s_swapRequested, FALSE); + Common::AtomicStoreRelease(s_swapRequested, false); } } } @@ -112,7 +112,7 @@ void VideoBackendHLE::Video_EndField() { if (s_PluginInitialized) { - Common::AtomicStoreRelease(s_swapRequested, TRUE); + Common::AtomicStoreRelease(s_swapRequested, true); } } @@ -121,6 +121,11 @@ void VideoBackendHLE::Video_AddMessage(const char* pstr, u32 milliseconds) OSD::AddMessage(pstr, milliseconds); } +void VideoBackendHLE::Video_ClearMessages() +{ + OSD::ClearMessages(); +} + // Screenshot bool VideoBackendHLE::Video_Screenshot(const char *_szFilename) { @@ -134,7 +139,7 @@ void VideoFifo_CheckEFBAccess() { s_AccessEFBResult = g_renderer->AccessEFB(s_accessEFBArgs.type, s_accessEFBArgs.x, s_accessEFBArgs.y, s_accessEFBArgs.Data); - Common::AtomicStoreRelease(s_efbAccessRequested, FALSE); + Common::AtomicStoreRelease(s_efbAccessRequested, false); } } @@ -147,7 +152,7 @@ u32 VideoBackendHLE::Video_AccessEFB(EFBAccessType type, u32 x, u32 y, u32 Input s_accessEFBArgs.y = y; s_accessEFBArgs.Data = InputData; - Common::AtomicStoreRelease(s_efbAccessRequested, TRUE); + Common::AtomicStoreRelease(s_efbAccessRequested, true); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread) { @@ -164,7 +169,7 @@ u32 VideoBackendHLE::Video_AccessEFB(EFBAccessType type, u32 x, u32 y, u32 Input return 0; } -static volatile u32 s_doStateRequested = FALSE; +static volatile u32 s_doStateRequested = false; static volatile struct { @@ -193,7 +198,7 @@ static void check_DoState() { RecomputeCachedArraybases(); } - Common::AtomicStoreRelease(s_doStateRequested, FALSE); + Common::AtomicStoreRelease(s_doStateRequested, false); } } @@ -202,7 +207,7 @@ void VideoBackendHLE::DoState(PointerWrap& p) { s_doStateArgs.ptr = p.ptr; s_doStateArgs.mode = p.mode; - Common::AtomicStoreRelease(s_doStateRequested, TRUE); + Common::AtomicStoreRelease(s_doStateRequested, true); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread) { while (Common::AtomicLoadAcquire(s_doStateRequested) && !s_FifoShuttingDown) diff --git a/Source/Core/VideoCommon/Src/NativeVertexFormat.h b/Source/Core/VideoCommon/Src/NativeVertexFormat.h index 1c873365fd..0013e05845 100644 --- a/Source/Core/VideoCommon/Src/NativeVertexFormat.h +++ b/Source/Core/VideoCommon/Src/NativeVertexFormat.h @@ -18,7 +18,7 @@ #ifndef _NATIVEVERTEXFORMAT_H #define _NATIVEVERTEXFORMAT_H -#include "PluginSpecs.h" +#include "Common.h" // m_components enum { diff --git a/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp b/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp index d91806b3ce..f24bfc31b3 100644 --- a/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp +++ b/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp @@ -76,4 +76,11 @@ void DrawMessages() } } +void ClearMessages() +{ + std::list::iterator it = s_listMsgs.begin(); + while (it != s_listMsgs.end()) + it = s_listMsgs.erase(it); +} + } // namespace diff --git a/Source/Core/VideoCommon/Src/OnScreenDisplay.h b/Source/Core/VideoCommon/Src/OnScreenDisplay.h index a656ebad1f..3777e2b5d3 100644 --- a/Source/Core/VideoCommon/Src/OnScreenDisplay.h +++ b/Source/Core/VideoCommon/Src/OnScreenDisplay.h @@ -24,6 +24,7 @@ namespace OSD // On-screen message display void AddMessage(const char* str, u32 ms); void DrawMessages(); // draw the current messages on the screen. Only call once per frame. +void ClearMessages(); } // namespace diff --git a/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp b/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp index 14c8e94173..9d1c6f82d4 100644 --- a/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp +++ b/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp @@ -213,7 +213,7 @@ bool FifoCommandRunnable() "* Some other sort of bug\n\n" "Dolphin will now likely crash or hang. Enjoy." , cmd_byte); Host_SysMessage(szTemp); - Core::Callback_VideoLog(szTemp, TRUE); + Core::Callback_VideoLog(szTemp, true); { SCPFifoStruct &fifo = CommandProcessor::fifo; @@ -238,7 +238,7 @@ bool FifoCommandRunnable() ,fifo.bFF_Breakpoint ? "true" : "false"); Host_SysMessage(szTmp); - Core::Callback_VideoLog(szTmp, TRUE); + Core::Callback_VideoLog(szTmp, true); } } break; diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index 15bf3795a6..50f7c8428f 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -107,7 +107,7 @@ void Renderer::RenderToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRect else { g_renderer->Swap(xfbAddr, FIELD_PROGRESSIVE, fbWidth, fbHeight,sourceRc,Gamma); - Common::AtomicStoreRelease(s_swapRequested, FALSE); + Common::AtomicStoreRelease(s_swapRequested, false); } } diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index eb6c4c8539..ad487acd18 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -7,8 +7,6 @@ #include "RenderBase.h" #include "FileUtil.h" -#include "PluginSpecs.h" - #include "TextureCacheBase.h" #include "Debugger.h" #include "ConfigManager.h" diff --git a/Source/Core/VideoCommon/Src/VideoCommon.h b/Source/Core/VideoCommon/Src/VideoCommon.h index 67c89465a0..4084773470 100644 --- a/Source/Core/VideoCommon/Src/VideoCommon.h +++ b/Source/Core/VideoCommon/Src/VideoCommon.h @@ -18,6 +18,11 @@ #ifndef _VIDEOCOMMON_H #define _VIDEOCOMMON_H +#ifdef _WIN32 +#define WIN32_LEAN_AND_MEAN +#include +#endif + #include "Common.h" #include "MathUtil.h" #include "VideoBackendBase.h" diff --git a/Source/Core/VideoCommon/VideoCommon.vcproj b/Source/Core/VideoCommon/VideoCommon.vcproj index 5f20ed54a8..9cd9cdab92 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcproj +++ b/Source/Core/VideoCommon/VideoCommon.vcproj @@ -50,7 +50,7 @@ Level3 Disabled - ..\Common\Src;..\Core\Src;..\..\PluginSpecs;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug @@ -142,7 +142,7 @@ Level3 Disabled - ..\Common\Src;..\Core\Src;..\..\PluginSpecs;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug @@ -159,7 +159,7 @@ MaxSpeed true true - ..\Common\Src;..\Core\Src;..\..\PluginSpecs;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded @@ -178,7 +178,7 @@ MaxSpeed true true - ..\Common\Src;..\Core\Src;..\..\PluginSpecs;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded false @@ -198,7 +198,7 @@ MaxSpeed true true - ..\Common\Src;..\Core\Src;..\..\PluginSpecs;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded @@ -217,7 +217,7 @@ MaxSpeed true true - ..\Common\Src;..\Core\Src;..\..\PluginSpecs;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded false @@ -356,4 +356,4 @@ - \ No newline at end of file + diff --git a/Source/Core/VideoUICommon/VideoUICommon.vcproj b/Source/Core/VideoUICommon/VideoUICommon.vcproj index 266705ee39..7c961edbb9 100644 --- a/Source/Core/VideoUICommon/VideoUICommon.vcproj +++ b/Source/Core/VideoUICommon/VideoUICommon.vcproj @@ -44,7 +44,7 @@ Level3 Disabled - ..\Common\Src;..\VideoCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug @@ -139,7 +139,7 @@ Level3 Disabled - ..\Common\Src;..\VideoCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug @@ -153,7 +153,7 @@ MaxSpeed true true - ..\Common\Src;..\VideoCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded @@ -169,7 +169,7 @@ MaxSpeed true true - ..\Common\Src;..\VideoCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded false @@ -186,7 +186,7 @@ MaxSpeed true true - ..\Common\Src;..\VideoCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded @@ -202,7 +202,7 @@ MaxSpeed true true - ..\Common\Src;..\VideoCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded false @@ -260,4 +260,4 @@ - \ No newline at end of file + diff --git a/Source/PluginSpecs/PluginSpecs.h b/Source/PluginSpecs/PluginSpecs.h deleted file mode 100644 index d12c2a0c21..0000000000 --- a/Source/PluginSpecs/PluginSpecs.h +++ /dev/null @@ -1,59 +0,0 @@ - -//________________________________________________________________________________________ -// File description: Common plugin spec, version #1.0 maintained by F|RES - -#ifndef _PLUGINS_H_INCLUDED__ -#define _PLUGINS_H_INCLUDED__ - -// Includes -// ------------ -// TODO: See if we can get rid of the windows.h include. -#ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN -#include -#endif -#include "Common.h" -#include "CommonTypes.h" - -// Plugin communication. I place this here rather in Common.h to rebuild less if any of this is changed -// ----------------- -enum PLUGIN_COMM -{ - // Begin at 10 in case there is already messages with wParam = 0, 1, 2 and so on - WM_USER_PAUSE = 10, - WM_USER_STOP, - WM_USER_CREATE, - WM_USER_SETCURSOR, - WM_USER_KEYDOWN, - WIIMOTE_DISCONNECT, // Disconnect Wiimote - INPUT_FRAME_COUNTER // Wind back the frame counter for rerecording -}; - -// System specific declarations and definitions -// ------------ - -// TODO: get rid of this i think -#if !defined(_WIN32) && !defined(TRUE) -#define TRUE 1 -#define FALSE 0 -#endif - -// Global values -// ------------ - -//enum STATE_MODE -//{ -// STATE_MODE_READ = 1, -// STATE_MODE_WRITE, -// STATE_MODE_MEASURE, -//}; - -// used for notification on emulation state -enum PLUGIN_EMUSTATE -{ - PLUGIN_EMUSTATE_PLAY = 1, - PLUGIN_EMUSTATE_PAUSE, - PLUGIN_EMUSTATE_STOP, -}; - -#endif // _PLUGINS_H_INCLUDED__ diff --git a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcproj b/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcproj index 06f73ff7b2..7e0d0914fa 100644 --- a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcproj +++ b/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcproj @@ -58,7 +58,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="false" WholeProgramOptimization="true" - AdditionalIncludeDirectories="../../../Externals;../../PluginSpecs;../../Core/Common/Src;../../Core/Core/Src;../../Core/VideoCommon/Src;../../Core/VideoUICommon/Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc" + AdditionalIncludeDirectories="../../../Externals;../../Core/Common/Src;../../Core/Core/Src;../../Core/VideoCommon/Src;../../Core/VideoUICommon/Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc" PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;VIDEO_DIRECTX11_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" StringPooling="true" RuntimeLibrary="0" @@ -148,7 +148,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="false" WholeProgramOptimization="true" - AdditionalIncludeDirectories="../../../Externals;../../PluginSpecs;../../Core/Common/Src;../../Core/Core/Src;../../Core/VideoCommon/Src;../../Core/VideoUICommon/Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc" + AdditionalIncludeDirectories="../../../Externals;../../Core/Common/Src;../../Core/Core/Src;../../Core/VideoCommon/Src;../../Core/VideoUICommon/Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;VIDEO_DIRECTX11_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" StringPooling="true" ExceptionHandling="1" @@ -232,7 +232,7 @@ Level3 Disabled - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug stdafx.h @@ -148,7 +148,7 @@ Level3 Disabled - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug stdafx.h @@ -166,7 +166,7 @@ MaxSpeed true true - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded stdafx.h @@ -186,7 +186,7 @@ MaxSpeed true true - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded stdafx.h @@ -207,7 +207,7 @@ MaxSpeed true true - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded stdafx.h @@ -227,7 +227,7 @@ MaxSpeed true true - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded stdafx.h @@ -295,4 +295,4 @@ - \ No newline at end of file + diff --git a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj index 946e25b920..615a9eb6dd 100644 --- a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj +++ b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj @@ -58,7 +58,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="false" WholeProgramOptimization="true" - AdditionalIncludeDirectories="../../../Externals;../../PluginSpecs;../../Core/Common/Src;../../Core/Core/Src;../../Core/VideoCommon/Src;../../Core/VideoUICommon/Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc" + AdditionalIncludeDirectories="../../../Externals;../../Core/Common/Src;../../Core/Core/Src;../../Core/VideoCommon/Src;../../Core/VideoUICommon/Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc" PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;VIDEO_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" StringPooling="true" RuntimeLibrary="0" @@ -150,7 +150,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="false" WholeProgramOptimization="true" - AdditionalIncludeDirectories="../../../Externals;../../PluginSpecs;../../Core/Common/Src;../../Core/Core/Src;../../Core/VideoCommon/Src;../../Core/VideoUICommon/Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc" + AdditionalIncludeDirectories="../../../Externals;../../Core/Common/Src;../../Core/Core/Src;../../Core/VideoCommon/Src;../../Core/VideoUICommon/Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;VIDEO_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" StringPooling="true" ExceptionHandling="1" @@ -236,7 +236,7 @@ Level3 Disabled - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug stdafx.h @@ -147,7 +147,7 @@ Level3 Disabled - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug stdafx.h @@ -164,7 +164,7 @@ MaxSpeed true true - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded stdafx.h @@ -183,7 +183,7 @@ MaxSpeed true true - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded stdafx.h @@ -203,7 +203,7 @@ MaxSpeed true true - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded stdafx.h @@ -222,7 +222,7 @@ MaxSpeed true true - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded stdafx.h @@ -287,4 +287,4 @@ - \ No newline at end of file + diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj index 69dd902de3..48f2a65621 100644 --- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj +++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj @@ -57,7 +57,7 @@ EnableIntrinsicFunctions="true" OmitFramePointers="true" WholeProgramOptimization="true" - AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/Core/Src;../../Core/InputCommon/Src;../../Core/VideoCommon/Src;../../Core/VideoUICommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew\include" + AdditionalIncludeDirectories="../../Core/Common/Src;../../Core/Core/Src;../../Core/InputCommon/Src;../../Core/VideoCommon/Src;../../Core/VideoUICommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew\include" PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" StringPooling="true" RuntimeLibrary="0" @@ -150,7 +150,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="false" WholeProgramOptimization="true" - AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/Core/Src;../../Core/InputCommon/Src;../../Core/VideoCommon/Src;../../Core/VideoUICommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew\include" + AdditionalIncludeDirectories="../../Core/Common/Src;../../Core/Core/Src;../../Core/InputCommon/Src;../../Core/VideoCommon/Src;../../Core/VideoUICommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" StringPooling="true" ExceptionHandling="1" @@ -238,7 +238,7 @@ Level3 Disabled - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug stdafx.h @@ -153,7 +153,7 @@ Level3 Disabled - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug stdafx.h @@ -176,7 +176,7 @@ MaxSpeed true true - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded stdafx.h @@ -201,7 +201,7 @@ MaxSpeed true true - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded stdafx.h @@ -227,7 +227,7 @@ MaxSpeed true true - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded stdafx.h @@ -252,7 +252,7 @@ MaxSpeed true true - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded stdafx.h @@ -329,4 +329,4 @@ - \ No newline at end of file + diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp index 58a8078d94..f23393f7ce 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp @@ -105,7 +105,7 @@ unsigned int VideoBackend::PeekMessages() } return TRUE; #else - return FALSE; + return false; #endif } @@ -494,7 +494,7 @@ bool OpenGL_Create(int _iwidth, int _iheight) CreateXWindow(); VideoWindowHandle() = (void *)GLWin.win; #endif - return false; + return true; } bool OpenGL_MakeCurrent() diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index bc2cb9fdcb..16fa8a2f9f 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -501,7 +501,10 @@ Renderer::~Renderer() #if defined _WIN32 || defined HAVE_LIBAV if(s_bAVIDumping) + { AVIDump::Stop(); + s_bAVIDumping = false; + } #else if(f_pFrameDump != NULL) fclose(f_pFrameDump); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index 51cb959aaf..c7ab974ba5 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -179,14 +179,10 @@ void VideoBackend::Initialize() UpdateActiveConfig(); if (!OpenGL_Create(640, 480)) - { return; - } OSD::AddMessage("Dolphin OpenGL Video Plugin.", 5000); s_PluginInitialized = true; - - return; } // This is called after Initialize() from the Core @@ -228,7 +224,6 @@ void VideoBackend::Video_Prepare() // Notify the core that the video plugin is ready Core::Callback_CoreMessage(WM_USER_CREATE); - s_PluginInitialized = true; INFO_LOG(VIDEO, "Video plugin initialized."); } diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj index 0116b887b2..dba53bcf4a 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj +++ b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj @@ -44,7 +44,7 @@ Level3 Disabled - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) MultiThreadedDebug _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdafx.h @@ -109,7 +109,7 @@ Level3 Disabled - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) MultiThreadedDebug _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdafx.h @@ -128,7 +128,7 @@ MaxSpeed true true - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) MultiThreaded _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdafx.h @@ -150,7 +150,7 @@ MaxSpeed true true - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\PluginSpecs;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) MultiThreaded _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdafx.h @@ -254,4 +254,4 @@ - \ No newline at end of file + diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h index 379ca13680..26168e0a23 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h @@ -14,7 +14,7 @@ class VideoBackend : public VideoBackendLLE std::string GetName(); - void EmuStateChange(PLUGIN_EMUSTATE newState); + void EmuStateChange(EMUSTATE_CHANGE newState); void DoState(PointerWrap &p); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/main.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/main.cpp index ffc455cecc..15e0b75dba 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/main.cpp @@ -83,7 +83,7 @@ void VideoBackend::DoState(PointerWrap&) } -void VideoBackend::EmuStateChange(PLUGIN_EMUSTATE newState) +void VideoBackend::EmuStateChange(EMUSTATE_CHANGE newState) { } diff --git a/Source/UnitTests/UnitTests.vcproj b/Source/UnitTests/UnitTests.vcproj index d85c9fb9c1..74e96a8263 100644 --- a/Source/UnitTests/UnitTests.vcproj +++ b/Source/UnitTests/UnitTests.vcproj @@ -44,7 +44,7 @@