piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 23:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

minor core fixing. moved CatchUpGPU() back to CommandProcessor so that MP1 (and more?) have graphics again. also fixed the lzo.lib error some ppl get (i think)

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@608 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
daco65
2008-09-22 11:42:52 +00:00
parent dbc5a154b6
commit 570071a8b6
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Core/Core.vcproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8,00"
Name="Core" Name="Core"
ProjectGUID="{F0B874CB-4476-4199-9315-8343D05AE684}" ProjectGUID="{F0B874CB-4476-4199-9315-8343D05AE684}"
RootNamespace="Core" RootNamespace="Core"
@ -70,6 +70,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="$(OutDir)/Core.lib" OutputFile="$(OutDir)/Core.lib"
AdditionalLibraryDirectories="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -140,6 +141,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="$(OutDir)/Core.lib" OutputFile="$(OutDir)/Core.lib"
AdditionalLibraryDirectories="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -213,8 +215,8 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"
OutputFile="$(OutDir)/Core.lib" OutputFile="$(OutDir)/Core.lib"
AdditionalLibraryDirectories="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -290,9 +292,8 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"
OutputFile="$(OutDir)/Core.lib" OutputFile="$(OutDir)/Core.lib"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -366,6 +367,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="$(OutDir)/Core.lib" OutputFile="$(OutDir)/Core.lib"
AdditionalLibraryDirectories="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -439,6 +441,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="$(OutDir)/Core.lib" OutputFile="$(OutDir)/Core.lib"
AdditionalLibraryDirectories="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"

15
Source/Core/Core/Src/Core.cpp
View File

@ -341,15 +341,16 @@ THREAD_RETURN EmuThread(void *pArg)
//CPU thread should in this case also create the emuwindow... //CPU thread should in this case also create the emuwindow...
//Spawn the CPU thread //Spawn the CPU thread
Common::Thread *cpuThread = new Common::Thread(CpuThread, pArg); Common::Thread *cpuThread = NULL;
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// ENTER THE VIDEO THREAD LOOP // ENTER THE VIDEO THREAD LOOP
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
if (!Core::GetStartupParameter().bUseDualCore) if (!Core::GetStartupParameter().bUseDualCore)
{ {
Common::SetCurrentThreadName("Idle thread"); #ifdef _WIN32
cpuThread = new Common::Thread(CpuThread, pArg);
//Common::SetCurrentThreadName("Idle thread");
//TODO(ector) : investigate using GetMessage instead .. although //TODO(ector) : investigate using GetMessage instead .. although
//then we lose the powerdown check. ... unless powerdown sends a message :P //then we lose the powerdown check. ... unless powerdown sends a message :P
while (PowerPC::state != PowerPC::CPU_POWERDOWN) while (PowerPC::state != PowerPC::CPU_POWERDOWN)
@ -357,18 +358,16 @@ THREAD_RETURN EmuThread(void *pArg)
if (Callback_PeekMessages) { if (Callback_PeekMessages) {
Callback_PeekMessages(); Callback_PeekMessages();
} }
#ifdef _WIN32
Common::SleepCurrentThread(20); Common::SleepCurrentThread(20);
#else
Common::SleepCurrentThread(200);
#endif
} }
#else
// In single-core mode, the Emulation main thread is also the CPU thread // In single-core mode, the Emulation main thread is also the CPU thread
CpuThread(pArg); CpuThread(pArg);
#endif
} }
else else
{ {
cpuThread = new Common::Thread(CpuThread, pArg);
PluginVideo::Video_Prepare(); //wglMakeCurrent PluginVideo::Video_Prepare(); //wglMakeCurrent
Common::SetCurrentThreadName("Video thread"); Common::SetCurrentThreadName("Video thread");
PluginVideo::Video_EnterLoop(); PluginVideo::Video_EnterLoop();

2
Source/Core/Core/Src/HW/CommandProcessor.cpp
View File

@ -472,7 +472,7 @@ void UpdateFifoRegister()
#ifdef _WIN32 #ifdef _WIN32
if (Core::g_CoreStartupParameter.bUseDualCore) LeaveCriticalSection(&fifo.sync); if (Core::g_CoreStartupParameter.bUseDualCore) LeaveCriticalSection(&fifo.sync);
#endif #endif
// if (!Core::g_CoreStartupParameter.bUseDualCore) CatchUpGPU(); if (!Core::g_CoreStartupParameter.bUseDualCore) CatchUpGPU();
} }
void UpdateInterrupts() void UpdateInterrupts()

2
Source/Core/Core/Src/HW/SystemTimers.cpp
View File

@ -23,7 +23,6 @@
#include "../HW/DSP.h" #include "../HW/DSP.h"
#include "../HW/AudioInterface.h" #include "../HW/AudioInterface.h"
#include "../HW/VideoInterface.h" #include "../HW/VideoInterface.h"
#include "../HW/CommandProcessor.h"
#include "../HW/SerialInterface.h" #include "../HW/SerialInterface.h"
#include "../PowerPC/PowerPC.h" #include "../PowerPC/PowerPC.h"
#include "../CoreTiming.h" #include "../CoreTiming.h"
@ -160,7 +159,6 @@ void AdvanceCallback(int cyclesExecuted)
void GPUCallback(u64 userdata, int cyclesLate) void GPUCallback(u64 userdata, int cyclesLate)
{ {
CommandProcessor::CatchUpGPU();
CoreTiming::ScheduleEvent(GPU_PERIOD-cyclesLate, et_GPU); CoreTiming::ScheduleEvent(GPU_PERIOD-cyclesLate, et_GPU);
} }