BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use generic osinclude.h

Browse source 
Using platform-neutral osinclude.h makes it easier to substitute
implementation when necessary and eliminates some variability between
build configurations.
This commit is contained in:
Pyry Haulos 2015-12-01 12:59:53 -08:00
parent 1be8063e01
commit 5f6892e23c
6 changed files with 81 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

29
glslang/OSDependent/Windows/ossource.cpp
View file

@ -32,7 +32,7 @@
//POSSIBILITY OF SUCH DAMAGE.
//
#include "osinclude.h"
#include "../osinclude.h"
#define STRICT
#define VC_EXTRALEAN 1
@ -41,6 +41,7 @@
#include <process.h>
#include <psapi.h>
#include <stdio.h>
#include <stdint.h>
//
// This file contains contains the Window-OS-specific functions
@ -52,6 +53,16 @@
namespace glslang {
inline OS_TLSIndex ToGenericTLSIndex (DWORD handle)
{
return (OS_TLSIndex)((uintptr_t)handle + 1);
}
inline DWORD ToNativeTLSIndex (OS_TLSIndex nIndex)
{
return (DWORD)((uintptr_t)nIndex - 1);
}
//
// Thread Local Storage Operations
//
@ -63,7 +74,7 @@ OS_TLSIndex OS_AllocTLSIndex()
return OS_INVALID_TLS_INDEX;
}
return dwIndex;
return ToGenericTLSIndex(dwIndex);
}
@ -74,7 +85,7 @@ bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue)
return false;
}
if (TlsSetValue(nIndex, lpvValue))
if (TlsSetValue(ToNativeTLSIndex(nIndex), lpvValue))
return true;
else
return false;
@ -83,7 +94,7 @@ bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue)
void* OS_GetTLSValue(OS_TLSIndex nIndex)
{
assert(nIndex != OS_INVALID_TLS_INDEX);
return TlsGetValue(nIndex);
return TlsGetValue(ToNativeTLSIndex(nIndex));
}
bool OS_FreeTLSIndex(OS_TLSIndex nIndex)
@ -93,7 +104,7 @@ bool OS_FreeTLSIndex(OS_TLSIndex nIndex)
return false;
}
if (TlsFree(nIndex))
if (TlsFree(ToNativeTLSIndex(nIndex)))
return true;
else
return false;
@ -116,10 +127,14 @@ void ReleaseGlobalLock()
ReleaseMutex(GlobalLock);
}
unsigned int __stdcall EnterGenericThread (void* entry)
{
return ((TThreadEntrypoint)entry)(0);
}
void* OS_CreateThread(TThreadEntrypoint entry)
{
return (void*)_beginthreadex(0, 0, entry, 0, 0, 0);
//return CreateThread(0, 0, entry, 0, 0, 0);
return (void*)_beginthreadex(0, 0, EnterGenericThread, entry, 0, 0);
}
void OS_WaitForAllThreads(void* threads, int numThreads)