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

HLSL: Restrict uniform array flattening to sampler and texture arrays

StandAlone/StandAlone.cpp

@@ -941,7 +941,7 @@ void usage()
            "                                          explicit bindings.\n"
            "  --amb                                   synonym for --auto-map-bindings\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"
            );
 

hlsl/hlslParseHelper.cpp

@@ -736,7 +736,9 @@ bool HlslParseContext::shouldFlattenUniform(const TType& type) const
 
     return type.isArray() &&
         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)