AuroraMiddleware/glslang
1
0
Fork 0
mirror of https://github.com/KhronosGroup/glslang synced 2024-11-09 20:10:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Warning for #pragma once. GLSL and HLSL. Addresses #824.

Browse Source
This commit is contained in:
John Kessenich 2018-02-11 22:04:45 -07:00
parent b5bf536b5f
commit 23ea3db3e5
5 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Test/baseResults/preprocessor.pragma.vert.err
View File

@ -0,0 +1,2 @@
WARNING: 0:10: '#pragma once' : not implemented

2
Test/baseResults/preprocessor.pragma.vert.out
View File

@ -7,6 +7,8 @@
#pragma undefined_pragma(x,4) #pragma undefined_pragma(x,4)
#pragma once
int main(){ int main(){
} }

2
Test/preprocessor.pragma.vert
View File

@ -7,5 +7,7 @@
#pragma undefined_pragma(x, 4) #pragma undefined_pragma(x, 4)
#pragma once
int main() { int main() {
} }

2
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -266,6 +266,8 @@ void TParseContext::handlePragma(const TSourceLoc& loc, const TVector<TString>&
if (tokens.size() != 1) if (tokens.size() != 1)
error(loc, "extra tokens", "#pragma", ""); error(loc, "extra tokens", "#pragma", "");
intermediate.setUseStorageBuffer(); intermediate.setUseStorageBuffer();
} else if (tokens[0].compare("once") == 0) {
warn(loc, "not implemented", "#pragma once", "");
} }
} }

7
hlsl/hlslParseHelper.cpp
View File

@ -550,6 +550,13 @@ void HlslParseContext::handlePragma(const TSourceLoc& loc, const TVector<TString
warn(loc, "unknown pack_matrix pragma value", tokens[2].c_str(), ""); warn(loc, "unknown pack_matrix pragma value", tokens[2].c_str(), "");
globalUniformDefaults.layoutMatrix = globalBufferDefaults.layoutMatrix = ElmRowMajor; globalUniformDefaults.layoutMatrix = globalBufferDefaults.layoutMatrix = ElmRowMajor;
} }
return;
}
// Handle once
if (lowerTokens[0] == "once") {
warn(loc, "not implemented", "#pragma once", "");
return;
} }
} }