Skip to content

G
glslang
Commit 5f6892e2 by Pyry Haulos
Options

Use generic osinclude.h

Using platform-neutral osinclude.h makes it easier to substitute implementation when necessary and eliminates some variability between build configurations.
parent 1be8063e
Showing with 83 additions and 191 deletions
StandAlone/StandAlone.cpp 100755 → 100644
...@@ -621,11 +621,7 @@ void SetMessageOptions(EShMessages& messages) ...@@ -621,11 +621,7 @@ void SetMessageOptions(EShMessages& messages)
// //
// Return 0 for failure, 1 for success. // Return 0 for failure, 1 for success.
// //
unsigned int unsigned int CompileShaders(void*)
#ifdef _WIN32
__stdcall
#endif
CompileShaders(void*)
{ {
glslang::TWorkItem* workItem; glslang::TWorkItem* workItem;
while (Worklist.remove(workItem)) { while (Worklist.remove(workItem)) {
......
glslang/OSDependent/Unix/osinclude.h deleted 100644 → 0
//
//Copyright (C) 2002-2005 3Dlabs Inc. Ltd.
//All rights reserved.
//
//Redistribution and use in source and binary forms, with or without
//modification, are permitted provided that the following conditions
//are met:
//
// Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
//
// Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following
// disclaimer in the documentation and/or other materials provided
// with the distribution.
//
// Neither the name of 3Dlabs Inc. Ltd. nor the names of its
// contributors may be used to endorse or promote products derived
// from this software without specific prior written permission.
//
//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
//POSSIBILITY OF SUCH DAMAGE.
//
#ifndef __OSINCLUDE_H
#define __OSINCLUDE_H
//
// This file contains any Linux specific functions.
//
#include <pthread.h>
#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#define _vsnprintf vsnprintf
namespace glslang {
void DetachThreadLinux(void *);
//
// Thread Local Storage Operations
//
typedef pthread_key_t OS_TLSIndex;
#define OS_INVALID_TLS_INDEX ((pthread_key_t)0xFFFFFFFF)
OS_TLSIndex OS_AllocTLSIndex();
bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue);
bool OS_FreeTLSIndex(OS_TLSIndex nIndex);
inline void* OS_GetTLSValue(OS_TLSIndex nIndex)
{
//
// This function should return 0 if nIndex is invalid.
//
assert(nIndex != OS_INVALID_TLS_INDEX);
return pthread_getspecific(nIndex);
}
void InitGlobalLock();
void GetGlobalLock();
void ReleaseGlobalLock();
typedef unsigned int (*TThreadEntrypoint)(void*);
void* OS_CreateThread(TThreadEntrypoint);
void OS_WaitForAllThreads(void* threads, int numThreads);
void OS_Sleep(int milliseconds);
void OS_DumpMemoryCounters();
} // end namespace glslang
#endif // __OSINCLUDE_H
glslang/OSDependent/Unix/ossource.cpp
...@@ -35,9 +35,15 @@ ...@@ -35,9 +35,15 @@
// //
// This file contains the Linux-specific functions // This file contains the Linux-specific functions
// //
#include "osinclude.h" #include "../osinclude.h"
#include "../../../OGLCompilersDLL/InitializeDll.h" #include "../../../OGLCompilersDLL/InitializeDll.h"
#include <pthread.h>
#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <stdint.h>
namespace glslang { namespace glslang {
// //
...@@ -95,6 +101,16 @@ void OS_CleanupThreadData(void) ...@@ -95,6 +101,16 @@ void OS_CleanupThreadData(void)
// //
// Thread Local Storage Operations // Thread Local Storage Operations
// //
inline OS_TLSIndex PthreadKeyToTLSIndex(pthread_key_t key)
{
return (OS_TLSIndex)((uintptr_t)key + 1);
}
inline pthread_key_t TLSIndexToPthreadKey(OS_TLSIndex nIndex)
{
return (pthread_key_t)((uintptr_t)nIndex - 1);
}
OS_TLSIndex OS_AllocTLSIndex() OS_TLSIndex OS_AllocTLSIndex()
{ {
pthread_key_t pPoolIndex; pthread_key_t pPoolIndex;
...@@ -104,10 +120,10 @@ OS_TLSIndex OS_AllocTLSIndex() ...@@ -104,10 +120,10 @@ OS_TLSIndex OS_AllocTLSIndex()
// //
if ((pthread_key_create(&pPoolIndex, NULL)) != 0) { if ((pthread_key_create(&pPoolIndex, NULL)) != 0) {
assert(0 && "OS_AllocTLSIndex(): Unable to allocate Thread Local Storage"); assert(0 && "OS_AllocTLSIndex(): Unable to allocate Thread Local Storage");
return false; return OS_INVALID_TLS_INDEX;
} }
else else
return pPoolIndex; return PthreadKeyToTLSIndex(pPoolIndex);
} }
...@@ -118,12 +134,20 @@ bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue) ...@@ -118,12 +134,20 @@ bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue)
return false; return false;
} }
if (pthread_setspecific(nIndex, lpvValue) == 0) if (pthread_setspecific(TLSIndexToPthreadKey(nIndex), lpvValue) == 0)
return true; return true;
else else
return false; return false;
} }
void* OS_GetTLSValue(OS_TLSIndex nIndex)
{
//
// This function should return 0 if nIndex is invalid.
//
assert(nIndex != OS_INVALID_TLS_INDEX);
return pthread_getspecific(TLSIndexToPthreadKey(nIndex));
}
bool OS_FreeTLSIndex(OS_TLSIndex nIndex) bool OS_FreeTLSIndex(OS_TLSIndex nIndex)
{ {
...@@ -135,7 +159,7 @@ bool OS_FreeTLSIndex(OS_TLSIndex nIndex) ...@@ -135,7 +159,7 @@ bool OS_FreeTLSIndex(OS_TLSIndex nIndex)
// //
// Delete the global pool key. // Delete the global pool key.
// //
if (pthread_key_delete(nIndex) == 0) if (pthread_key_delete(TLSIndexToPthreadKey(nIndex)) == 0)
return true; return true;
else else
return false; return false;
......
glslang/OSDependent/Windows/osinclude.h deleted 100644 → 0
//
//Copyright (C) 2002-2005 3Dlabs Inc. Ltd.
//All rights reserved.
//
//Redistribution and use in source and binary forms, with or without
//modification, are permitted provided that the following conditions
//are met:
//
// Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
//
// Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following
// disclaimer in the documentation and/or other materials provided
// with the distribution.
//
// Neither the name of 3Dlabs Inc. Ltd. nor the names of its
// contributors may be used to endorse or promote products derived
// from this software without specific prior written permission.
//
//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
//POSSIBILITY OF SUCH DAMAGE.
//
#ifndef __OSINCLUDE_H
#define __OSINCLUDE_H
//
// This file contains contains the window's specific datatypes and
// declares any windows specific functions.
//
#if !(defined(_WIN32) || defined(_WIN64))
#error Trying to include a windows specific file in a non windows build.
#endif
namespace glslang {
//
// Thread Local Storage Operations
//
typedef unsigned long OS_TLSIndex;
#define OS_INVALID_TLS_INDEX ((unsigned long)0xFFFFFFFF)
OS_TLSIndex OS_AllocTLSIndex();
bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue);
bool OS_FreeTLSIndex(OS_TLSIndex nIndex);
void* OS_GetTLSValue(OS_TLSIndex nIndex);
void InitGlobalLock();
void GetGlobalLock();
void ReleaseGlobalLock();
typedef unsigned int (__stdcall *TThreadEntrypoint)(void*);
void* OS_CreateThread(TThreadEntrypoint);
void OS_WaitForAllThreads(void* threads, int numThreads);
void OS_Sleep(int milliseconds);
void OS_DumpMemoryCounters();
} // end namespace glslang
#endif // __OSINCLUDE_H
glslang/OSDependent/Windows/ossource.cpp
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
//POSSIBILITY OF SUCH DAMAGE. //POSSIBILITY OF SUCH DAMAGE.
// //
#include "osinclude.h" #include "../osinclude.h"
#define STRICT #define STRICT
#define VC_EXTRALEAN 1 #define VC_EXTRALEAN 1
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include <process.h> #include <process.h>
#include <psapi.h> #include <psapi.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h>
// //
// This file contains contains the Window-OS-specific functions // This file contains contains the Window-OS-specific functions
...@@ -52,6 +53,16 @@ ...@@ -52,6 +53,16 @@
namespace glslang { 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 // Thread Local Storage Operations
// //
...@@ -63,7 +74,7 @@ OS_TLSIndex OS_AllocTLSIndex() ...@@ -63,7 +74,7 @@ OS_TLSIndex OS_AllocTLSIndex()
return OS_INVALID_TLS_INDEX; return OS_INVALID_TLS_INDEX;
} }
return dwIndex; return ToGenericTLSIndex(dwIndex);
} }
...@@ -74,7 +85,7 @@ bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue) ...@@ -74,7 +85,7 @@ bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue)
return false; return false;
} }
if (TlsSetValue(nIndex, lpvValue)) if (TlsSetValue(ToNativeTLSIndex(nIndex), lpvValue))
return true; return true;
else else
return false; return false;
...@@ -83,7 +94,7 @@ bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue) ...@@ -83,7 +94,7 @@ bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue)
void* OS_GetTLSValue(OS_TLSIndex nIndex) void* OS_GetTLSValue(OS_TLSIndex nIndex)
{ {
assert(nIndex != OS_INVALID_TLS_INDEX); assert(nIndex != OS_INVALID_TLS_INDEX);
return TlsGetValue(nIndex); return TlsGetValue(ToNativeTLSIndex(nIndex));
} }
bool OS_FreeTLSIndex(OS_TLSIndex nIndex) bool OS_FreeTLSIndex(OS_TLSIndex nIndex)
...@@ -93,7 +104,7 @@ bool OS_FreeTLSIndex(OS_TLSIndex nIndex) ...@@ -93,7 +104,7 @@ bool OS_FreeTLSIndex(OS_TLSIndex nIndex)
return false; return false;
} }
if (TlsFree(nIndex)) if (TlsFree(ToNativeTLSIndex(nIndex)))
return true; return true;
else else
return false; return false;
...@@ -116,10 +127,14 @@ void ReleaseGlobalLock() ...@@ -116,10 +127,14 @@ void ReleaseGlobalLock()
ReleaseMutex(GlobalLock); ReleaseMutex(GlobalLock);
} }
unsigned int __stdcall EnterGenericThread (void* entry)
{
return ((TThreadEntrypoint)entry)(0);
}
void* OS_CreateThread(TThreadEntrypoint entry) void* OS_CreateThread(TThreadEntrypoint entry)
{ {
return (void*)_beginthreadex(0, 0, entry, 0, 0, 0); return (void*)_beginthreadex(0, 0, EnterGenericThread, entry, 0, 0);
//return CreateThread(0, 0, entry, 0, 0, 0);
} }
void OS_WaitForAllThreads(void* threads, int numThreads) void OS_WaitForAllThreads(void* threads, int numThreads)
......
glslang/OSDependent/osinclude.h
...@@ -32,15 +32,34 @@ ...@@ -32,15 +32,34 @@
//POSSIBILITY OF SUCH DAMAGE. //POSSIBILITY OF SUCH DAMAGE.
// //
#ifndef __ROOT_OSINCLUDE_H #ifndef __OSINCLUDE_H
#define __ROOT_OSINCLUDE_H #define __OSINCLUDE_H
#if defined(GLSLANG_OSINCLUDE_WIN32) namespace glslang {
#include "Windows/osinclude.h"
#elif defined(GLSLANG_OSINCLUDE_UNIX) //
#include "Unix/osinclude.h" // Thread Local Storage Operations
#else //
#error "Unknown platform" typedef void* OS_TLSIndex;
#endif #define OS_INVALID_TLS_INDEX ((void*)0)
#endif // __ROOT_OSINCLUDE_H OS_TLSIndex OS_AllocTLSIndex();
bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue);
bool OS_FreeTLSIndex(OS_TLSIndex nIndex);
void* OS_GetTLSValue(OS_TLSIndex nIndex);
void InitGlobalLock();
void GetGlobalLock();
void ReleaseGlobalLock();
typedef unsigned int (*TThreadEntrypoint)(void*);
void* OS_CreateThread(TThreadEntrypoint);
void OS_WaitForAllThreads(void* threads, int numThreads);
void OS_Sleep(int milliseconds);
void OS_DumpMemoryCounters();
} // end namespace glslang
#endif // __OSINCLUDE_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment