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

Build: Fix three new warnings in HLSL code.

Browse Source
This commit is contained in:
John Kessenich 2016-07-16 10:19:43 -06:00
parent 35dcbbef8e
commit e4821e43c8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hlsl/hlslGrammar.cpp
View File

@ -211,7 +211,7 @@ bool HlslGrammar::acceptSamplerState()
// sampler_declaration_dx9 // sampler_declaration_dx9
// : SAMPLER identifier EQUAL sampler_type sampler_state // : SAMPLER identifier EQUAL sampler_type sampler_state
// //
bool HlslGrammar::acceptSamplerDeclarationDX9(TType& type) bool HlslGrammar::acceptSamplerDeclarationDX9(TType& /*type*/)
{ {
if (! acceptTokenClass(EHTokSampler)) if (! acceptTokenClass(EHTokSampler))
return false; return false;

2
hlsl/hlslParseHelper.cpp
View File

@ -906,7 +906,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
TOperator textureOp = EOpTexture; TOperator textureOp = EOpTexture;
if (argAggregate->getSequence().size() == (nextArg+1)) { // last parameter is offset form if ((int)argAggregate->getSequence().size() == (nextArg+1)) { // last parameter is offset form
textureOp = EOpTextureOffset; textureOp = EOpTextureOffset;
argOffset = argAggregate->getSequence()[nextArg++]->getAsTyped(); argOffset = argAggregate->getSequence()[nextArg++]->getAsTyped();
} }

4
hlsl/hlslParseables.cpp
View File

@ -69,7 +69,7 @@ const char* BaseTypeName(const char argOrder, const char* scalarName, const char
bool IsTextureType(const char argOrder) { return argOrder == '%' || argOrder == '@'; } bool IsTextureType(const char argOrder) { return argOrder == '%' || argOrder == '@'; }
bool IsTextureArrayed(const char argOrder) { return argOrder == '@'; } bool IsTextureArrayed(const char argOrder) { return argOrder == '@'; }
bool IsTextureMS(const char argOrder) { return false; } // TODO: ... bool IsTextureMS(const char /*argOrder*/) { return false; } // TODO: ...
// Reject certain combinations that are illegal sample methods. For example, // Reject certain combinations that are illegal sample methods. For example,
// 3D arrays. // 3D arrays.
@ -118,7 +118,7 @@ glslang::TString& AppendTypeName(glslang::TString& s, const char* argOrder, cons
const bool isMatMul = (argOrder[0] == '#'); const bool isMatMul = (argOrder[0] == '#');
const bool isTexture = IsTextureType(argOrder[0]); const bool isTexture = IsTextureType(argOrder[0]);
const bool isArrayed = IsTextureArrayed(argOrder[0]); const bool isArrayed = IsTextureArrayed(argOrder[0]);
const bool isMS = IsTextureMS(argOrder[0]); //const bool isMS = IsTextureMS(argOrder[0]);
char order = *argOrder; char order = *argOrder;
char type = *argType; char type = *argType;