From e4821e43c86d97bcf65fb07c1f70471b7102978d Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Sat, 16 Jul 2016 10:19:43 -0600 Subject: [PATCH] Build: Fix three new warnings in HLSL code. --- hlsl/hlslGrammar.cpp | 2 +- hlsl/hlslParseHelper.cpp | 2 +- hlsl/hlslParseables.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp index 5381885..c149b1c 100755 --- a/hlsl/hlslGrammar.cpp +++ b/hlsl/hlslGrammar.cpp @@ -211,7 +211,7 @@ bool HlslGrammar::acceptSamplerState() // sampler_declaration_dx9 // : SAMPLER identifier EQUAL sampler_type sampler_state // -bool HlslGrammar::acceptSamplerDeclarationDX9(TType& type) +bool HlslGrammar::acceptSamplerDeclarationDX9(TType& /*type*/) { if (! acceptTokenClass(EHTokSampler)) return false; diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index 753fbfe..b7b7000 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -906,7 +906,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType 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; argOffset = argAggregate->getSequence()[nextArg++]->getAsTyped(); } diff --git a/hlsl/hlslParseables.cpp b/hlsl/hlslParseables.cpp index f6b8539..61b176b 100755 --- a/hlsl/hlslParseables.cpp +++ b/hlsl/hlslParseables.cpp @@ -69,7 +69,7 @@ const char* BaseTypeName(const char argOrder, const char* scalarName, const char bool IsTextureType(const char argOrder) { return argOrder == '%' || 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, // 3D arrays. @@ -118,7 +118,7 @@ glslang::TString& AppendTypeName(glslang::TString& s, const char* argOrder, cons const bool isMatMul = (argOrder[0] == '#'); const bool isTexture = IsTextureType(argOrder[0]); const bool isArrayed = IsTextureArrayed(argOrder[0]); - const bool isMS = IsTextureMS(argOrder[0]); + //const bool isMS = IsTextureMS(argOrder[0]); char order = *argOrder; char type = *argType; -- 2.7.4