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

Merge pull request #527 from steve-lunarg/array-flattening-fix

Browse Source 
HLSL: Restrict uniform array flattening to sampler and texture arrays
This commit is contained in:
John Kessenich 2016-10-01 11:40:27 -06:00 committed by GitHub
commit d4f48b8a5a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
StandAlone/StandAlone.cpp
View File

@ -941,7 +941,7 @@ void usage()
" explicit bindings.\n" " explicit bindings.\n"
" --amb synonym for --auto-map-bindings\n" " --amb synonym for --auto-map-bindings\n"
"\n" "\n"
" --flatten-uniform-arrays flatten uniform array references to scalars\n" " --flatten-uniform-arrays flatten uniform texture & sampler arrays to scalars\n"
" --fua synonym for --flatten-uniform-arrays\n" " --fua synonym for --flatten-uniform-arrays\n"
); );

4
hlsl/hlslParseHelper.cpp
View File

@ -736,7 +736,9 @@ bool HlslParseContext::shouldFlattenUniform(const TType& type) const
return type.isArray() && return type.isArray() &&
intermediate.getFlattenUniformArrays() && intermediate.getFlattenUniformArrays() &&
qualifier == EvqUniform; qualifier == EvqUniform &&
// Testing the EbtSampler basic type covers samplers and textures
type.getBasicType() == EbtSampler;
} }
void HlslParseContext::flatten(const TSourceLoc& loc, const TVariable& variable) void HlslParseContext::flatten(const TSourceLoc& loc, const TVariable& variable)