OSDN Git Service

Assembly output for NxM matrices
authorAlexis Hetu <sugoi@google.com>
Thu, 16 Apr 2015 15:49:11 +0000 (11:49 -0400)
committerAlexis Hétu <sugoi@google.com>
Mon, 20 Apr 2015 14:30:37 +0000 (14:30 +0000)
Made a few minor changes to adjust for
NxM matrices in assembly output.

Change-Id: I3dde37e0f4bd2623232eebf0dc06182d8071d751
Reviewed-on: https://swiftshader-review.googlesource.com/2863
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
src/OpenGL/compiler/OutputASM.cpp

index c8bb014..4334f38 100644 (file)
@@ -926,7 +926,13 @@ namespace glsl
                        }\r
                        break;\r
                case EOpConstructMat2:\r
+               case EOpConstructMat2x3:\r
+               case EOpConstructMat2x4:\r
+               case EOpConstructMat3x2:\r
                case EOpConstructMat3:\r
+               case EOpConstructMat3x4:\r
+               case EOpConstructMat4x2:\r
+               case EOpConstructMat4x3:\r
                case EOpConstructMat4:\r
                        if(visit == PostVisit)\r
                        {\r
@@ -2507,7 +2513,7 @@ namespace glsl
        {\r
                TIntermTyped *matrix = m->getAsTyped();\r
                ASSERT(matrix && matrix->isMatrix() && !matrix->isArray());\r
-               return matrix->getNominalSize();\r
+               return matrix->getSecondarySize();\r
        }\r
 \r
        // Returns ~0 if no loop count could be determined\r