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

Whitespace: Nonfunctional: fix inconsistent white space, esp. no tabs.

Browse Source
This commit is contained in:
John Kessenich 2016-08-05 17:34:34 -06:00
parent 5c72a73971
commit 267590d452
12 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glslang/Include/revision.h
View File

@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits. // For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run). // For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "SPIRV99.1384" #define GLSLANG_REVISION "SPIRV99.1390"
#define GLSLANG_DATE "05-Aug-2016" #define GLSLANG_DATE "05-Aug-2016"

4
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -253,7 +253,7 @@ void TParseContext::handlePragma(const TSourceLoc& loc, const TVector<TString>&
// //
bool TParseContext::parseVectorFields(const TSourceLoc& loc, const TString& compString, int vecSize, TVectorFields& fields) bool TParseContext::parseVectorFields(const TSourceLoc& loc, const TString& compString, int vecSize, TVectorFields& fields)
{ {
fields.num = (int) compString.size(); fields.num = (int)compString.size();
if (fields.num > 4) { if (fields.num > 4) {
error(loc, "illegal vector field selection", compString.c_str(), ""); error(loc, "illegal vector field selection", compString.c_str(), "");
return false; return false;
@ -865,7 +865,7 @@ TIntermTyped* TParseContext::handleDotDereference(const TSourceLoc& loc, TInterm
TString vectorString = field; TString vectorString = field;
TIntermTyped* index = intermediate.addSwizzle(fields, loc); TIntermTyped* index = intermediate.addSwizzle(fields, loc);
result = intermediate.addIndex(EOpVectorSwizzle, base, index, loc); result = intermediate.addIndex(EOpVectorSwizzle, base, index, loc);
result->setType(TType(base->getBasicType(), EvqTemporary, base->getType().getQualifier().precision, (int) vectorString.size())); result->setType(TType(base->getBasicType(), EvqTemporary, base->getType().getQualifier().precision, (int)vectorString.size()));
} }
// Swizzle operations propagate specialization-constantness // Swizzle operations propagate specialization-constantness
if (base->getType().getQualifier().isSpecConstant()) if (base->getType().getQualifier().isSpecConstant())

2
hlsl/hlslGrammar.cpp
View File

@ -275,7 +275,7 @@ bool HlslGrammar::acceptDeclaration(TIntermNode*& node)
// DX9 sampler declaration use a different syntax // DX9 sampler declaration use a different syntax
// DX9 shaders need to run through HLSL compiler (fxc) via a back compat mode, it isn't going to // DX9 shaders need to run through HLSL compiler (fxc) via a back compat mode, it isn't going to
// be possible to simultanously compile D3D10+ style shaders and DX9 shaders. If we want to compile DX9 // be possible to simultaneously compile D3D10+ style shaders and DX9 shaders. If we want to compile DX9
// HLSL shaders, this will have to be a master level switch // HLSL shaders, this will have to be a master level switch
// As such, the sampler keyword in D3D10+ turns into an automatic sampler type, and is commonly used // As such, the sampler keyword in D3D10+ turns into an automatic sampler type, and is commonly used
// For that reason, this line is commented out // For that reason, this line is commented out

6
hlsl/hlslParseHelper.cpp
View File

@ -998,7 +998,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
const TSampler& texSampler = texType.getSampler(); const TSampler& texSampler = texType.getSampler();
const TSamplerDim dim = texSampler.dim; const TSamplerDim dim = texSampler.dim;
const int numArgs = (int) argAggregate->getSequence().size(); const int numArgs = (int)argAggregate->getSequence().size();
int numDims = 0; int numDims = 0;
@ -1184,7 +1184,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
lodComponent->setType(TType(coordBaseType, EvqTemporary, 1)); lodComponent->setType(TType(coordBaseType, EvqTemporary, 1));
} }
const int numArgs = (int) argAggregate->getSequence().size(); const int numArgs = (int)argAggregate->getSequence().size();
const bool hasOffset = ((!isMS && numArgs == 3) || (isMS && numArgs == 4)); const bool hasOffset = ((!isMS && numArgs == 3) || (isMS && numArgs == 4));
// Create texel fetch // Create texel fetch
@ -1228,7 +1228,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
TIntermTyped* argLod = argAggregate->getSequence()[3]->getAsTyped(); TIntermTyped* argLod = argAggregate->getSequence()[3]->getAsTyped();
TIntermTyped* argOffset = nullptr; TIntermTyped* argOffset = nullptr;
const int numArgs = (int) argAggregate->getSequence().size(); const int numArgs = (int)argAggregate->getSequence().size();
if (numArgs == 5) // offset, if present if (numArgs == 5) // offset, if present
argOffset = argAggregate->getSequence()[4]->getAsTyped(); argOffset = argAggregate->getSequence()[4]->getAsTyped();