HLSL: Handle swizzles on vectors of size 1. Addresses issue #453.

2016-09-02 22:21:25 -06:00 · 2016-09-02 22:21:25 -06:00 · 7d01bd6f0b
commit 7d01bd6f0b
parent 841db35bb3
5 changed files with 34 additions and 9 deletions
--- a/glslang/MachineIndependent/Intermediate.cpp
+++ b/glslang/MachineIndependent/Intermediate.cpp
@ -274,7 +274,8 @@ TIntermTyped* TIntermediate::addUnaryMath(TOperator op, TIntermTyped* child, TSo
    if (newType != EbtVoid) {
        child = addConversion(op, TType(newType, EvqTemporary, child->getVectorSize(),
                                                               child->getMatrixCols(),
-                                                               child->getMatrixRows()),
+                                                               child->getMatrixRows(),
+                                                               child->isVector()),
                              child);
        if (child == 0)
            return 0;