ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed r6235 for the Mac and Linux builds. Thanks, glennricster. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6238 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
skidau 2010-09-28 21:28:49 +00:00
parent 543c8926cc
commit 7eb99b9088
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_VideoDX11/Src/main.cpp
View File

@ -444,7 +444,7 @@ void Video_PixelEngineWrite32(const u32 _Data, const u32 _Address)
PixelEngine::Write32(_Data, _Address); PixelEngine::Write32(_Data, _Address);
} }
inline void Video_GatherPipeBursted(void) void Video_GatherPipeBursted(void)
{ {
CommandProcessor::GatherPipeBursted(); CommandProcessor::GatherPipeBursted();
} }

2
Source/Plugins/Plugin_VideoDX9/Src/main.cpp
View File

@ -466,7 +466,7 @@ void Video_PixelEngineWrite32(const u32 _Data, const u32 _Address)
PixelEngine::Write32(_Data, _Address); PixelEngine::Write32(_Data, _Address);
} }
inline void Video_GatherPipeBursted(void) void Video_GatherPipeBursted(void)
{ {
CommandProcessor::GatherPipeBursted(); CommandProcessor::GatherPipeBursted();
} }

9
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View File

@ -180,7 +180,7 @@ void Initialize(void *init)
frameCount = 0; frameCount = 0;
SVideoInitialize *_pVideoInitialize = (SVideoInitialize*)init; SVideoInitialize *_pVideoInitialize = (SVideoInitialize*)init;
// Create a shortcut to _pVideoInitialize that can also update it // Create a shortcut to _pVideoInitialize that can also update it
g_VideoInitialize = *(_pVideoInitialize); g_VideoInitialize = *(_pVideoInitialize);
InitXFBConvTables(); InitXFBConvTables();
g_Config.Load((std::string(File::GetUserPath(D_CONFIG_IDX)) + "gfx_opengl.ini").c_str()); 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 // Now the window handle is written
_pVideoInitialize->pWindowHandle = g_VideoInitialize.pWindowHandle; _pVideoInitialize->pWindowHandle = g_VideoInitialize.pWindowHandle;
OSD::AddMessage("Dolphin Direct3D9 Video Plugin.", 5000); OSD::AddMessage("Dolphin OpenGL Video Plugin.", 5000);
s_PluginInitialized = true; s_PluginInitialized = true;
} }
@ -238,7 +238,8 @@ static void check_DoState() {
} }
// Run from the CPU thread // 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.ptr = ptr;
s_doStateArgs.mode = mode; s_doStateArgs.mode = mode;
#if defined(HAVE_X11) && HAVE_X11 #if defined(HAVE_X11) && HAVE_X11
@ -497,7 +498,7 @@ void Video_PixelEngineWrite32(const u32 _Data, const u32 _Address)
PixelEngine::Write32(_Data, _Address); PixelEngine::Write32(_Data, _Address);
} }
inline void Video_GatherPipeBursted(void) void Video_GatherPipeBursted(void)
{ {
CommandProcessor::GatherPipeBursted(); CommandProcessor::GatherPipeBursted();
} }