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

GSdx: Replaced condvar/srwlock imports with getprocaddress, it should work on XP and compile on vs2010 express again. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5008 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gabest11 2011-12-23 02:49:27 +00:00
parent d5dbe7e7e9
commit da41bcd756
1 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
plugins/GSdx/GSThread.h
View File

@ -169,6 +169,21 @@ protected:
struct {GSCritSec lock; GSEvent notempty, empty;} m_ev; struct {GSCritSec lock; GSEvent notempty, empty;} m_ev;
#ifdef _WINDOWS #ifdef _WINDOWS
struct {SRWLOCK lock; CONDITION_VARIABLE notempty, empty; bool available;} m_cv; struct {SRWLOCK lock; CONDITION_VARIABLE notempty, empty; bool available;} m_cv;
HMODULE m_kernel32;
typedef void (WINAPI * InitializeConditionVariablePtr)(CONDITION_VARIABLE* ConditionVariable);
typedef void (WINAPI * WakeConditionVariablePtr)(CONDITION_VARIABLE* ConditionVariable);
typedef void (WINAPI * WakeAllConditionVariablePtr)(CONDITION_VARIABLE* ConditionVariable);
typedef void (WINAPI * SleepConditionVariableSRWPtr)(CONDITION_VARIABLE* ConditionVariable, SRWLOCK* SRWLock, DWORD dwMilliseconds, ULONG Flags);
typedef void (WINAPI * InitializeSRWLockPtr)(SRWLOCK* SRWLock);
typedef void (WINAPI * AcquireSRWLockExclusivePtr)(SRWLOCK* SRWLock);
typedef void (WINAPI * ReleaseSRWLockExclusivePtr)(SRWLOCK* SRWLock);
InitializeConditionVariablePtr pInitializeConditionVariable;
WakeConditionVariablePtr pWakeConditionVariable;
WakeAllConditionVariablePtr pWakeAllConditionVariable;
SleepConditionVariableSRWPtr pSleepConditionVariableSRW;
InitializeSRWLockPtr pInitializeSRWLock;;
AcquireSRWLockExclusivePtr pAcquireSRWLockExclusive;
ReleaseSRWLockExclusivePtr pReleaseSRWLockExclusive;
#endif #endif
void ThreadProc() void ThreadProc()
@ -177,32 +192,30 @@ protected:
if(m_cv.available) if(m_cv.available)
{ {
AcquireSRWLockExclusive(&m_cv.lock); pAcquireSRWLockExclusive(&m_cv.lock);
while(true) while(true)
{ {
while(m_queue.empty()) while(m_queue.empty())
{ {
SleepConditionVariableSRW(&m_cv.notempty, &m_cv.lock, INFINITE, 0); pSleepConditionVariableSRW(&m_cv.notempty, &m_cv.lock, INFINITE, 0);
if(m_exit) {ReleaseSRWLockExclusive(&m_cv.lock); return;} if(m_exit) {pReleaseSRWLockExclusive(&m_cv.lock); return;}
} }
{
T item = m_queue.front(); T item = m_queue.front();
ReleaseSRWLockExclusive(&m_cv.lock); pReleaseSRWLockExclusive(&m_cv.lock);
Process(item); Process(item);
AcquireSRWLockExclusive(&m_cv.lock); pAcquireSRWLockExclusive(&m_cv.lock);
}
m_queue.pop(); m_queue.pop();
if(m_queue.empty()) if(m_queue.empty())
{ {
WakeConditionVariable(&m_cv.empty); pWakeConditionVariable(&m_cv.empty);
} }
} }
} }
@ -247,20 +260,25 @@ public:
: m_count(0) : m_count(0)
, m_exit(false) , m_exit(false)
{ {
m_cv.available = false;
#ifdef _WINDOWS #ifdef _WINDOWS
OSVERSIONINFOEX version; m_cv.available = false;
memset(&version, 0, sizeof(version));
version.dwOSVersionInfoSize = sizeof(version);
GetVersionEx((OSVERSIONINFO*)&version);
if(version.dwMajorVersion >= 6) m_kernel32 = LoadLibrary("kernel32.dll");
pInitializeConditionVariable = (InitializeConditionVariablePtr)GetProcAddress(m_kernel32, "InitializeConditionVariable");
pWakeConditionVariable = (WakeConditionVariablePtr)GetProcAddress(m_kernel32, "WakeConditionVariable");
pWakeAllConditionVariable = (WakeAllConditionVariablePtr)GetProcAddress(m_kernel32, "WakeAllConditionVariable");
pSleepConditionVariableSRW = (SleepConditionVariableSRWPtr)GetProcAddress(m_kernel32, "SleepConditionVariableSRW");
pInitializeSRWLock = (InitializeSRWLockPtr)GetProcAddress(m_kernel32, "InitializeSRWLock");
pAcquireSRWLockExclusive = (AcquireSRWLockExclusivePtr)GetProcAddress(m_kernel32, "AcquireSRWLockExclusive");
pReleaseSRWLockExclusive = (ReleaseSRWLockExclusivePtr)GetProcAddress(m_kernel32, "ReleaseSRWLockExclusive");
if(pInitializeConditionVariable != NULL)
{ {
InitializeSRWLock(&m_cv.lock); pInitializeSRWLock(&m_cv.lock);
InitializeConditionVariable(&m_cv.notempty); pInitializeConditionVariable(&m_cv.notempty);
InitializeConditionVariable(&m_cv.empty); pInitializeConditionVariable(&m_cv.empty);
m_cv.available = true; m_cv.available = true;
} }
@ -278,7 +296,7 @@ public:
if(m_cv.available) if(m_cv.available)
{ {
WakeConditionVariable(&m_cv.notempty); pWakeConditionVariable(&m_cv.notempty);
} }
else else
{ {
@ -291,6 +309,11 @@ public:
} }
if(m_kernel32 != NULL)
{
FreeLibrary(m_kernel32); // lol, decrement the refcount anyway
}
#endif #endif
} }
@ -305,13 +328,13 @@ public:
if(m_cv.available) if(m_cv.available)
{ {
AcquireSRWLockExclusive(&m_cv.lock); pAcquireSRWLockExclusive(&m_cv.lock);
m_queue.push(item); m_queue.push(item);
ReleaseSRWLockExclusive(&m_cv.lock); pReleaseSRWLockExclusive(&m_cv.lock);
WakeConditionVariable(&m_cv.notempty); pWakeConditionVariable(&m_cv.notempty);
} }
else else
{ {
@ -339,14 +362,14 @@ public:
if(m_cv.available) if(m_cv.available)
{ {
AcquireSRWLockExclusive(&m_cv.lock); pAcquireSRWLockExclusive(&m_cv.lock);
while(!m_queue.empty()) while(!m_queue.empty())
{ {
SleepConditionVariableSRW(&m_cv.empty, &m_cv.lock, INFINITE, 0); pSleepConditionVariableSRW(&m_cv.empty, &m_cv.lock, INFINITE, 0);
} }
ReleaseSRWLockExclusive(&m_cv.lock); pReleaseSRWLockExclusive(&m_cv.lock);
} }
else else
{ {