diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp index 47c60bcedd..30c97f9839 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp @@ -444,7 +444,7 @@ void Video_PixelEngineWrite32(const u32 _Data, const u32 _Address) PixelEngine::Write32(_Data, _Address); } -inline void Video_GatherPipeBursted(void) +void Video_GatherPipeBursted(void) { CommandProcessor::GatherPipeBursted(); } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index fdf8162d0b..b556ccc10f 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -466,7 +466,7 @@ void Video_PixelEngineWrite32(const u32 _Data, const u32 _Address) PixelEngine::Write32(_Data, _Address); } -inline void Video_GatherPipeBursted(void) +void Video_GatherPipeBursted(void) { CommandProcessor::GatherPipeBursted(); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index ccc39bdd7b..576d10cf5c 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -180,7 +180,7 @@ void Initialize(void *init) frameCount = 0; SVideoInitialize *_pVideoInitialize = (SVideoInitialize*)init; // Create a shortcut to _pVideoInitialize that can also update it - g_VideoInitialize = *(_pVideoInitialize); + g_VideoInitialize = *(_pVideoInitialize); InitXFBConvTables(); g_Config.Load((std::string(File::GetUserPath(D_CONFIG_IDX)) + "gfx_opengl.ini").c_str()); @@ -201,7 +201,7 @@ void Initialize(void *init) // Now the window handle is written _pVideoInitialize->pWindowHandle = g_VideoInitialize.pWindowHandle; - OSD::AddMessage("Dolphin Direct3D9 Video Plugin.", 5000); + OSD::AddMessage("Dolphin OpenGL Video Plugin.", 5000); s_PluginInitialized = true; } @@ -238,7 +238,8 @@ static void check_DoState() { } // Run from the CPU thread -void DoState(unsigned char **ptr, int mode) { +void DoState(unsigned char **ptr, int mode) +{ s_doStateArgs.ptr = ptr; s_doStateArgs.mode = mode; #if defined(HAVE_X11) && HAVE_X11 @@ -497,7 +498,7 @@ void Video_PixelEngineWrite32(const u32 _Data, const u32 _Address) PixelEngine::Write32(_Data, _Address); } -inline void Video_GatherPipeBursted(void) +void Video_GatherPipeBursted(void) { CommandProcessor::GatherPipeBursted(); }