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

Merge pull request #2162 from ntfshard/small_fix

Browse Source 
Humble fix
This commit is contained in:
John Kessenich 2020-03-30 00:33:09 -06:00 committed by GitHub
commit 344bd0889a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SPIRV/hex_float.h
View File

@ -784,8 +784,8 @@ inline std::istream& ParseNormalFloat(std::istream& is, bool negate_value,
if (val.isInfinity()) { if (val.isInfinity()) {
// Fail the parse. Emulate standard behaviour by setting the value to // Fail the parse. Emulate standard behaviour by setting the value to
// the closest normal value, and set the fail bit on the stream. // the closest normal value, and set the fail bit on the stream.
value.set_value((value.isNegative() | negate_value) ? T::lowest() value.set_value((value.isNegative() || negate_value) ? T::lowest()
: T::max()); : T::max());
is.setstate(std::ios_base::failbit); is.setstate(std::ios_base::failbit);
} }
return is; return is;

1
StandAlone/StandAlone.cpp
View File

@ -1140,7 +1140,6 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits)
for (int stage = 0; stage < EShLangCount; ++stage) { for (int stage = 0; stage < EShLangCount; ++stage) {
if (program.getIntermediate((EShLanguage)stage)) { if (program.getIntermediate((EShLanguage)stage)) {
std::vector<unsigned int> spirv; std::vector<unsigned int> spirv;
std::string warningsErrors;
spv::SpvBuildLogger logger; spv::SpvBuildLogger logger;
glslang::SpvOptions spvOptions; glslang::SpvOptions spvOptions;
if (Options & EOptionDebug) if (Options & EOptionDebug)

2
StandAlone/spirv-remap.cpp
View File

@ -334,8 +334,6 @@ int main(int argc, char** argv)
if (outputDir.empty()) if (outputDir.empty())
usage(argv[0], "Output directory required"); usage(argv[0], "Output directory required");
std::string errmsg;
// Main operations: read, remap, and write. // Main operations: read, remap, and write.
execute(inputFile, outputDir, opts, verbosity); execute(inputFile, outputDir, opts, verbosity);

2
glslang/MachineIndependent/SymbolTable.cpp
View File

@ -122,7 +122,7 @@ void TType::buildMangledName(TString& mangledName) const
mangledName += "-tx-struct"; mangledName += "-tx-struct";
char text[16]; // plenty enough space for the small integers. char text[16]; // plenty enough space for the small integers.
snprintf(text, sizeof(text), "%d-", sampler.getStructReturnIndex()); snprintf(text, sizeof(text), "%u-", sampler.getStructReturnIndex());
mangledName += text; mangledName += text;
} else { } else {
switch (sampler.getVectorSize()) { switch (sampler.getVectorSize()) {

2
glslang/MachineIndependent/reflection.cpp
View File

@ -1188,7 +1188,7 @@ void TReflection::dump()
for (int dim=0; dim<3; ++dim) for (int dim=0; dim<3; ++dim)
if (getLocalSize(dim) > 1) if (getLocalSize(dim) > 1)
printf("Local size %s: %d\n", axis[dim], getLocalSize(dim)); printf("Local size %s: %u\n", axis[dim], getLocalSize(dim));
printf("\n"); printf("\n");
} }

3
hlsl/hlslParseHelper.cpp
View File

@ -757,9 +757,6 @@ TIntermTyped* HlslParseContext::handleBracketOperator(const TSourceLoc& loc, TIn
// indexStructBufferContent returns nullptr if it isn't a structuredbuffer (SSBO). // indexStructBufferContent returns nullptr if it isn't a structuredbuffer (SSBO).
TIntermTyped* sbArray = indexStructBufferContent(loc, base); TIntermTyped* sbArray = indexStructBufferContent(loc, base);
if (sbArray != nullptr) { if (sbArray != nullptr) {
if (sbArray == nullptr)
return nullptr;
// Now we'll apply the [] index to that array // Now we'll apply the [] index to that array
const TOperator idxOp = (index->getQualifier().storage == EvqConst) ? EOpIndexDirect : EOpIndexIndirect; const TOperator idxOp = (index->getQualifier().storage == EvqConst) ? EOpIndexDirect : EOpIndexIndirect;