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

.travis updated to origin, rayQueryCheck removed

Browse Source
This commit is contained in:
Neslisah Torosdagli 2020-03-24 10:24:50 -04:00
parent 7f689bebec
commit 67c7bc4086
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -43,7 +43,7 @@ addons:
packages: packages:
- clang-3.6 - clang-3.6
install: travis_wait 30 mvn install install:
# Make sure that clang-3.6 is selected on Linux. # Make sure that clang-3.6 is selected on Linux.
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CC" == "clang" ]]; then - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CC" == "clang" ]]; then
export CC=clang-3.6 CXX=clang++-3.6; export CC=clang-3.6 CXX=clang++-3.6;

6
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -3259,11 +3259,6 @@ void TParseContext::accStructCheck(const TSourceLoc& loc, const TType& type, con
} }
void TParseContext::rayQueryCheck(const TSourceLoc& loc, const TType& type, const TString& identifier)
{
return;
}
#endif // GLSLANG_WEB #endif // GLSLANG_WEB
void TParseContext::transparentOpaqueCheck(const TSourceLoc& loc, const TType& type, const TString& identifier) void TParseContext::transparentOpaqueCheck(const TSourceLoc& loc, const TType& type, const TString& identifier)
@ -6511,7 +6506,6 @@ TIntermNode* TParseContext::declareVariable(const TSourceLoc& loc, TString& iden
#ifndef GLSLANG_WEB #ifndef GLSLANG_WEB
atomicUintCheck(loc, type, identifier); atomicUintCheck(loc, type, identifier);
accStructCheck(loc, type, identifier); accStructCheck(loc, type, identifier);
rayQueryCheck(loc, type, identifier);
checkAndResizeMeshViewDim(loc, type, /*isBlockMember*/ false); checkAndResizeMeshViewDim(loc, type, /*isBlockMember*/ false);
#endif #endif
if (type.getQualifier().storage == EvqConst && type.containsReference()) { if (type.getQualifier().storage == EvqConst && type.containsReference()) {

1
glslang/MachineIndependent/ParseHelper.h
View File

@ -360,7 +360,6 @@ public:
void samplerCheck(const TSourceLoc&, const TType&, const TString& identifier, TIntermTyped* initializer); void samplerCheck(const TSourceLoc&, const TType&, const TString& identifier, TIntermTyped* initializer);
void atomicUintCheck(const TSourceLoc&, const TType&, const TString& identifier); void atomicUintCheck(const TSourceLoc&, const TType&, const TString& identifier);
void accStructCheck(const TSourceLoc & loc, const TType & type, const TString & identifier); void accStructCheck(const TSourceLoc & loc, const TType & type, const TString & identifier);
void rayQueryCheck(const TSourceLoc & loc, const TType & type, const TString & identifier);
void transparentOpaqueCheck(const TSourceLoc&, const TType&, const TString& identifier); void transparentOpaqueCheck(const TSourceLoc&, const TType&, const TString& identifier);
void memberQualifierCheck(glslang::TPublicType&); void memberQualifierCheck(glslang::TPublicType&);
void globalQualifierFixCheck(const TSourceLoc&, TQualifier&); void globalQualifierFixCheck(const TSourceLoc&, TQualifier&);