From 661d6198bbb9857d3fdc6df477e0742ed0b0765c Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Mon, 14 Aug 2023 16:23:19 -0700
Subject: Support per field matrix layout (#3101)

* Support per field matrix layout

* Fix warnings.

* Fix.

* Fix tests.

* Fix spiv gen.

* Fix.

* More test fixes.

* Fix.

* Run only GPU tests on self-hosted servers.

* Remove -use-glsl-matrix-layout-modifier.

* Fix.

---------

Co-authored-by: Yong He <yhe@nvidia.com>
---
 source/slang/slang-check-conversion.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'source/slang/slang-check-conversion.cpp')

diff --git a/source/slang/slang-check-conversion.cpp b/source/slang/slang-check-conversion.cpp
index 09a783fb4..5a9c8df12 100644
--- a/source/slang/slang-check-conversion.cpp
+++ b/source/slang/slang-check-conversion.cpp
@@ -894,6 +894,28 @@ namespace Slang
             }
             return true;
         }
+        // matrix type with different layouts are convertible
+        if (auto fromMatrixType = as<MatrixExpressionType>(fromType))
+        {
+            if (auto toMatrixType = as<MatrixExpressionType>(toType))
+            {
+                if (fromMatrixType->getElementType()->equals(toMatrixType->getElementType()) &&
+                    fromMatrixType->getRowCount()->equals(toMatrixType->getRowCount()) &&
+                    fromMatrixType->getColumnCount()->equals(toMatrixType->getColumnCount()))
+                {
+                    if (outCost)
+                    {
+                        *outCost = kConversionCost_MatrixLayout;
+                    }
+                    if (outToExpr)
+                    {
+                        *outToExpr = fromExpr;
+                    }
+                    return true;
+                }
+            }
+
+        }
 
         // A type is always convertible to any of its supertypes.
         //
-- 
cgit v1.2.3