mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #851 from dgkoch/dgkoch_build_fixes3

Browse Source 
Fix Android build errors
This commit is contained in:
John Kessenich 2017-04-22 09:54:34 -06:00 committed by GitHub
commit a1cdd13b1c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glslang/MachineIndependent/iomapper.cpp
View File

@ -204,8 +204,8 @@ public:
struct TResolverUniformAdaptor struct TResolverUniformAdaptor
{ {
TResolverUniformAdaptor(EShLanguage s, TIoMapResolver& r, TInfoSink& i, bool& e, TIntermediate& interm) TResolverUniformAdaptor(EShLanguage s, TIoMapResolver& r, TInfoSink& i, bool& e, TIntermediate& interm)
: resolver(r) : stage(s)
, stage(s) , resolver(r)
, infoSink(i) , infoSink(i)
, error(e) , error(e)
, intermediate(interm) , intermediate(interm)
@ -260,8 +260,8 @@ private:
struct TResolverInOutAdaptor struct TResolverInOutAdaptor
{ {
TResolverInOutAdaptor(EShLanguage s, TIoMapResolver& r, TInfoSink& i, bool& e, TIntermediate& interm) TResolverInOutAdaptor(EShLanguage s, TIoMapResolver& r, TInfoSink& i, bool& e, TIntermediate& interm)
: resolver(r) : stage(s)
, stage(s) , resolver(r)
, infoSink(i) , infoSink(i)
, error(e) , error(e)
, intermediate(interm) , intermediate(interm)

4
hlsl/hlslParseHelper.cpp
View File

@ -61,14 +61,14 @@ HlslParseContext::HlslParseContext(TSymbolTable& symbolTable, TIntermediate& int
loopNestingLevel(0), annotationNestingLevel(0), structNestingLevel(0), controlFlowNestingLevel(0), loopNestingLevel(0), annotationNestingLevel(0), structNestingLevel(0), controlFlowNestingLevel(0),
postEntryPointReturn(false), postEntryPointReturn(false),
limits(resources.limits), limits(resources.limits),
inputPatch(nullptr),
builtInIoIndex(nullptr), builtInIoIndex(nullptr),
builtInIoBase(nullptr), builtInIoBase(nullptr),
nextInLocation(0), nextOutLocation(0), nextInLocation(0), nextOutLocation(0),
sourceEntryPointName(sourceEntryPointName), sourceEntryPointName(sourceEntryPointName),
entryPointFunction(nullptr), entryPointFunction(nullptr),
entryPointFunctionBody(nullptr), entryPointFunctionBody(nullptr),
gsStreamOutput(nullptr), gsStreamOutput(nullptr)
inputPatch(nullptr)
{ {
globalUniformDefaults.clear(); globalUniformDefaults.clear();
globalUniformDefaults.layoutMatrix = ElmRowMajor; globalUniformDefaults.layoutMatrix = ElmRowMajor;