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

break my BOOLs 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2002 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
memberTwo.mb2 2009-01-24 22:02:27 +00:00
parent 1e7655b5db
commit 2a13bedfc8
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Src/PluginVideo.h
View File

@ -7,7 +7,7 @@
namespace Common { namespace Common {
typedef void (__cdecl* TVideo_Prepare)(); typedef void (__cdecl* TVideo_Prepare)();
typedef void (__cdecl* TVideo_SendFifoData)(u8*,u32); typedef void (__cdecl* TVideo_SendFifoData)(u8*,u32);
typedef void (__cdecl* TVideo_UpdateXFB)(u8*, u32, u32, s32, BOOL); typedef void (__cdecl* TVideo_UpdateXFB)(u8*, u32, u32, s32, bool);
typedef bool (__cdecl* TVideo_Screenshot)(const char* filename); typedef bool (__cdecl* TVideo_Screenshot)(const char* filename);
typedef void (__cdecl* TVideo_EnterLoop)(); typedef void (__cdecl* TVideo_EnterLoop)();
typedef void (__cdecl* TVideo_AddMessage)(const char* pstr, unsigned int milliseconds); typedef void (__cdecl* TVideo_AddMessage)(const char* pstr, unsigned int milliseconds);

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

@ -151,10 +151,10 @@ u16 m_tokenReg;
SCPFifoStruct fifo; //This one is shared between gfx thread and emulator thread SCPFifoStruct fifo; //This one is shared between gfx thread and emulator thread
static u32 fake_GPWatchdogLastToken = 0; static u32 fake_GPWatchdogLastToken = 0;
static BOOL fake_CommandProcessorNotUsed = TRUE; // This is used by VI when homebrews use directly XFB without FIFO and CP static bool fake_CommandProcessorNotUsed = true; // This is used by VI when homebrews use directly XFB without FIFO and CP
// hack: This is used by VI when homebrews use directly XFB without FIFO and CP // hack: This is used by VI when homebrews use directly XFB without FIFO and CP
BOOL IsCommandProcessorNotUsed() bool IsCommandProcessorNotUsed()
{ {
return fake_CommandProcessorNotUsed; return fake_CommandProcessorNotUsed;
} }
@ -228,7 +228,7 @@ void Init()
fifo.CPReadIdle = 1; fifo.CPReadIdle = 1;
et_UpdateInterrupts = CoreTiming::RegisterEvent("UpdateInterrupts", UpdateInterrupts_Wrapper); et_UpdateInterrupts = CoreTiming::RegisterEvent("UpdateInterrupts", UpdateInterrupts_Wrapper);
fake_CommandProcessorNotUsed = TRUE; fake_CommandProcessorNotUsed = true;
} }
void Shutdown() void Shutdown()
@ -418,7 +418,7 @@ void Write16(const u16 _Value, const u32 _Address)
case CTRL_REGISTER: case CTRL_REGISTER:
{ {
fake_CommandProcessorNotUsed = FALSE; fake_CommandProcessorNotUsed = false;
UCPCtrlReg tmpCtrl(_Value); UCPCtrlReg tmpCtrl(_Value);
Common::SyncInterlockedExchange((LONG*)&fifo.bFF_GPReadEnable, tmpCtrl.GPReadEnable); Common::SyncInterlockedExchange((LONG*)&fifo.bFF_GPReadEnable, tmpCtrl.GPReadEnable);

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

@ -80,7 +80,7 @@ void IncrementGPWDToken();
void WaitForFrameFinish(); void WaitForFrameFinish();
// hack: This is used by VI when homebrews use directly XFB without FIFO and CP // hack: This is used by VI when homebrews use directly XFB without FIFO and CP
BOOL IsCommandProcessorNotUsed(); bool IsCommandProcessorNotUsed();
} // end of namespace CommandProcessor } // end of namespace CommandProcessor

2
Source/Core/VideoCommon/Src/Fifo.cpp
View File

@ -26,7 +26,7 @@
extern u8* g_pVideoData; extern u8* g_pVideoData;
// TODO (mb2): move/rm this global // TODO (mb2): move/rm this global
volatile BOOL g_XFBUpdateRequested = FALSE; volatile u32 g_XFBUpdateRequested = FALSE;
#ifndef _WIN32 #ifndef _WIN32
static bool fifoStateRun = true; static bool fifoStateRun = true;

2
Source/Core/VideoCommon/Src/VideoCommon.h
View File

@ -44,7 +44,7 @@ enum {
extern SVideoInitialize g_VideoInitialize; extern SVideoInitialize g_VideoInitialize;
// (mb2) for XFB update hack. TODO: find a static better place // (mb2) for XFB update hack. TODO: find a static better place
extern volatile BOOL g_XFBUpdateRequested; extern volatile u32 g_XFBUpdateRequested;
void DebugLog(const char* _fmt, ...); void DebugLog(const char* _fmt, ...);

2
Source/PluginSpecs/pluginspecs_video.h
View File

@ -104,7 +104,7 @@ EXPORT void CALL Video_SendFifoData(u8* _uData, u32 len);
// input: pointer to the XFB, width and height of the XFB // input: pointer to the XFB, width and height of the XFB
// output: none // output: none
// //
EXPORT void CALL Video_UpdateXFB(u8* _pXFB, u32 _dwWidth, u32 _dwHeight, s32 _dwYOffset, BOOL scheduling); EXPORT void CALL Video_UpdateXFB(u8* _pXFB, u32 _dwWidth, u32 _dwHeight, s32 _dwYOffset, bool scheduling);
// __________________________________________________________________________________________________ // __________________________________________________________________________________________________
// Function: Video_Screenshot // Function: Video_Screenshot

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

@ -234,7 +234,7 @@ void Video_Stop(void)
{ {
} }
void Video_UpdateXFB(u8* /*_pXFB*/, u32 /*_dwWidth*/, u32 /*_dwHeight*/, s32 /*_dwYOffset*/, BOOL /*scheduling*/) void Video_UpdateXFB(u8* /*_pXFB*/, u32 /*_dwWidth*/, u32 /*_dwHeight*/, s32 /*_dwYOffset*/, bool /*scheduling*/)
{ {
/* /*
ConvertXFB(tempBuffer, _pXFB, _dwWidth, _dwHeight); ConvertXFB(tempBuffer, _pXFB, _dwWidth, _dwHeight);

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

@ -361,7 +361,7 @@ unsigned int Video_Screenshot(TCHAR* _szFilename)
} }
void Video_UpdateXFB(u8* _pXFB, u32 _dwWidth, u32 _dwHeight, s32 _dwYOffset, BOOL scheduling) void Video_UpdateXFB(u8* _pXFB, u32 _dwWidth, u32 _dwHeight, s32 _dwYOffset, bool scheduling)
{ {
if(g_Config.bUseXFB && XFB_isInit()) if(g_Config.bUseXFB && XFB_isInit())
{ {