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

Fix #800 (mostly): set of Linux warnings.

Browse Source
This commit is contained in:
John Kessenich
2017-03-28 09:52:38 -06:00
parent 9fb31ce8ec
commit aa3c64c214
7 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hlsl/hlslGrammar.cpp
View File

@@ -1829,7 +1829,7 @@ bool HlslGrammar::acceptStruct(TType& type, TIntermNode*& nodeList)
TVector<TFunctionDeclarator> functionDeclarators;
parseContext.pushNamespace(structName);
bool acceptedList = acceptStructDeclarationList(typeList, nodeList, structName, functionDeclarators);
bool acceptedList = acceptStructDeclarationList(typeList, nodeList, functionDeclarators);
parseContext.popNamespace();
if (! acceptedList) {
@@ -1988,7 +1988,7 @@ bool HlslGrammar::acceptStructBufferType(TType& type)
// | IDENTIFIER array_specifier post_decls
// | IDENTIFIER function_parameters post_decls // member-function prototype
//
bool HlslGrammar::acceptStructDeclarationList(TTypeList*& typeList, TIntermNode*& nodeList, const TString& typeName,
bool HlslGrammar::acceptStructDeclarationList(TTypeList*& typeList, TIntermNode*& nodeList,
TVector<TFunctionDeclarator>& declarators)
{
typeList = new TTypeList();

3
hlsl/hlslGrammar.h
View File

@@ -87,8 +87,7 @@ namespace glslang {
bool acceptTextureType(TType&);
bool acceptStructBufferType(TType&);
bool acceptStruct(TType&, TIntermNode*& nodeList);
bool acceptStructDeclarationList(TTypeList*&, TIntermNode*& nodeList, const TString& typeName,
TVector<TFunctionDeclarator>&);
bool acceptStructDeclarationList(TTypeList*&, TIntermNode*& nodeList, TVector<TFunctionDeclarator>&);
bool acceptMemberFunctionDefinition(TIntermNode*& nodeList, const TType&, const TString& memberName,
TFunctionDeclarator&);
bool acceptFunctionParameters(TFunction&);