commit 8da034cc6a9ccecd0ce32ac6d25af6b1fd72defd
author shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:19:15 2013 +0000
committer shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:19:15 2013 +0000
tree c675934aea97e1c0009ce187b068ca7135002e69
parent 50733334c67ffe61a58fba9bbec5ad04b57a6ec0

Add non-square mat support to the shader language interface.

TRAC #23081

Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2397 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/compiler/VariableInfo.cpp

diff --git a/src/compiler/VariableInfo.cpp b/src/compiler/VariableInfo.cpp
index a1f41ad..388fe7d 100644
--- a/src/compiler/VariableInfo.cpp
+++ b/src/compiler/VariableInfo.cpp
@@ -19,11 +19,32 @@
     switch (type.getBasicType()) {
       case EbtFloat:
           if (type.isMatrix()) {
-              switch (type.getRows()) {
-                case 2: return SH_FLOAT_MAT2;
-                case 3: return SH_FLOAT_MAT3;
-                case 4: return SH_FLOAT_MAT4;
-                default: UNREACHABLE();
+              switch (type.getCols())
+              {
+                case 2:
+                  switch (type.getRows())
+                  {
+                    case 2: return SH_FLOAT_MAT2;
+                    case 3: return SH_FLOAT_MAT2x3;
+                    case 4: return SH_FLOAT_MAT2x4;
+                    default: UNREACHABLE();
+                  }
+                case 3:
+                  switch (type.getRows())
+                  {
+                    case 2: return SH_FLOAT_MAT3x2;
+                    case 3: return SH_FLOAT_MAT3;
+                    case 4: return SH_FLOAT_MAT3x4;
+                    default: UNREACHABLE();
+                  }
+                case 4:
+                  switch (type.getRows())
+                  {
+                    case 2: return SH_FLOAT_MAT4x2;
+                    case 3: return SH_FLOAT_MAT4x3;
+                    case 4: return SH_FLOAT_MAT4;
+                    default: UNREACHABLE();
+                  }
               }
           } else if (type.isVector()) {
               switch (type.getNominalSize()) {

src/compiler/VariablePacker.cpp

diff --git a/src/compiler/VariablePacker.cpp b/src/compiler/VariablePacker.cpp
index 8957287..ee70b9e 100644
--- a/src/compiler/VariablePacker.cpp
+++ b/src/compiler/VariablePacker.cpp
@@ -13,6 +13,10 @@
 {
     switch (type) {
         case SH_FLOAT_MAT4:
+        case SH_FLOAT_MAT2x4:
+        case SH_FLOAT_MAT3x4:
+        case SH_FLOAT_MAT4x2:
+        case SH_FLOAT_MAT4x3:
             return 0;
         case SH_FLOAT_MAT2:
             return 1;
@@ -21,6 +25,8 @@
         case SH_BOOL_VEC4:
             return 2;
         case SH_FLOAT_MAT3:
+        case SH_FLOAT_MAT2x3:
+        case SH_FLOAT_MAT3x2:
             return 3;
         case SH_FLOAT_VEC3:
         case SH_INT_VEC3:
@@ -50,11 +56,17 @@
     switch (type) {
         case SH_FLOAT_MAT4:
         case SH_FLOAT_MAT2:
+        case SH_FLOAT_MAT2x4:
+        case SH_FLOAT_MAT3x4:
+        case SH_FLOAT_MAT4x2:
+        case SH_FLOAT_MAT4x3:
         case SH_FLOAT_VEC4:
         case SH_INT_VEC4:
         case SH_BOOL_VEC4:
             return 4;
         case SH_FLOAT_MAT3:
+        case SH_FLOAT_MAT2x3:
+        case SH_FLOAT_MAT3x2:
         case SH_FLOAT_VEC3:
         case SH_INT_VEC3:
         case SH_BOOL_VEC3:
@@ -81,8 +93,14 @@
 {
     switch (type) {
         case SH_FLOAT_MAT4:
+        case SH_FLOAT_MAT2x4:
+        case SH_FLOAT_MAT3x4:
+        case SH_FLOAT_MAT4x3:
+        case SH_FLOAT_MAT4x2:
             return 4;
         case SH_FLOAT_MAT3:
+        case SH_FLOAT_MAT2x3:
+        case SH_FLOAT_MAT3x2:
             return 3;
         case SH_FLOAT_MAT2:
             return 2;