Merge pull request #1368 from danginsburg/issue_1367

Fix issue #1367 - change the I/O remapper to ignore push constants so…

glslang/MachineIndependent/iomapper.cpp

@@ -132,7 +132,7 @@ public:
             target = &inputList;
         else if (base->getQualifier().storage == EvqVaryingOut)
             target = &outputList;
-        else if (base->getQualifier().isUniformOrBuffer())
+        else if (base->getQualifier().isUniformOrBuffer() && !base->getQualifier().layoutPushConstant)
             target = &uniformList;
 
         if (target) {