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

Merge pull request #1115 from LoopDawg/stdarray-binding-set

Browse Source 
Nonfunctional: minor: use std::array for per-set shifts, fix warning.
This commit is contained in:
John Kessenich 2017-10-20 16:31:26 -06:00 committed by GitHub
commit b1eaf82cc8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glslang/MachineIndependent/localintermediate.h
View File

@ -677,8 +677,7 @@ protected:
std::array<unsigned int, EResCount> shiftBinding;
// Per-descriptor-set shift values
typedef std::map<int, int> TDescriptorSetShift;
TDescriptorSetShift shiftBindingForSet[EResCount];
std::array<std::map<int, int>, EResCount> shiftBindingForSet;
std::vector<std::string> resourceSetBinding;
bool autoMapBindings;

4
hlsl/hlslParseHelper.cpp
View File

@ -1157,8 +1157,8 @@ bool HlslParseContext::shouldFlatten(const TType& type, TStorageQualifier qualif
case EvqVaryingOut:
return type.isStruct() || type.isArray();
case EvqUniform:
return type.isArray() && intermediate.getFlattenUniformArrays() && topLevel ||
type.isStruct() && type.containsOpaque();
return (type.isArray() && intermediate.getFlattenUniformArrays() && topLevel) ||
(type.isStruct() && type.containsOpaque());
default:
return type.isStruct() && type.containsOpaque();
};