commit | 2a59292dabe7eb730f00c5826cc96d588816ea5b | [log] [tgz] |
---|---|---|
author | Nicolas Capens <nicolascapens@chromium.org> | Wed Jun 11 16:22:57 2014 -0400 |
committer | Nicolas Capens <nicolascapens@chromium.org> | Tue Jun 17 15:48:03 2014 +0000 |
tree | 2bfb7066ce7b964ab6e028f5b9a9f314f6193cb7 | |
parent | 5bf98290459ca4ccab2f5be62f5fba2337fe8b7a [diff] [blame] |
Implement support for constructing a 2x2 matrix from a vector. BUG=380353 Change-Id: Ica0b94104e39f87b4a3439df40221b1f682fd678 Reviewed-on: https://chromium-review.googlesource.com/203293 Tested-by: Nicolas Capens <nicolascapens@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
diff --git a/src/compiler/translator/OutputHLSL.cpp b/src/compiler/translator/OutputHLSL.cpp index 4e94103..dc79c51 100644 --- a/src/compiler/translator/OutputHLSL.cpp +++ b/src/compiler/translator/OutputHLSL.cpp
@@ -3590,7 +3590,12 @@ } } } - else UNREACHABLE(); + else + { + ASSERT(rows == 2 && cols == 2 && parameter.isVector() && parameter.getNominalSize() == 4); + + constructor += "x0"; + } } else {