Interface and naming improvements:
- the new C++ style interface now stands on its own, with the addition of glslang::InitializeProcess() and glslang::FinalizeProcess() - more "global" pool names from a decade ago are fixed to be thread names - StandAlone.cpp fully uses one of the old-style interface or new C++ style interface git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23851 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
parent
5b0f13acbc
commit
c36e1d8e51
8 changed files with 57 additions and 26 deletions
|
|
@ -538,6 +538,8 @@ bool CompileDeferred(
|
|||
//
|
||||
int ShInitialize()
|
||||
{
|
||||
glslang::InitGlobalLock();
|
||||
|
||||
if (! InitProcess())
|
||||
return 0;
|
||||
|
||||
|
|
@ -546,7 +548,7 @@ int ShInitialize()
|
|||
|
||||
glslang::TScanContext::fillInKeywordMap();
|
||||
|
||||
return true;
|
||||
return 1;
|
||||
}
|
||||
|
||||
//
|
||||
|
|
@ -909,6 +911,16 @@ int ShGetUniformLocation(const ShHandle handle, const char* name)
|
|||
|
||||
namespace glslang {
|
||||
|
||||
bool InitializeProcess()
|
||||
{
|
||||
return ShInitialize() != 0;
|
||||
}
|
||||
|
||||
void FinalizeProcess()
|
||||
{
|
||||
ShFinalize();
|
||||
}
|
||||
|
||||
class TDeferredCompiler : public TCompiler {
|
||||
public:
|
||||
TDeferredCompiler(EShLanguage s, TInfoSink& i) : TCompiler(s, i) { }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue