commit c7ae02ec7e09860e1218830e0e2ae764107f2162
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 21:13:11 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 21:13:11 2012 +0000
tree 4c8065bdb8e1f77127fa82032f006f0108d44cd0
parent 7aa6afff14140cf9c220aa29ee1d4662fb1eea5a

Fixed declaring arrays within structures.

TRAC #22326
Signed-off-by: Daniel Koch
Signed-off-by: Shannon Woods
Author: Nicolas Capens

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

src/compiler/OutputHLSL.cpp

diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/OutputHLSL.cpp
index f1d5c67..ff966fb 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -2673,7 +2673,7 @@
 
                     const TString uniformName = name + "[" + str(i) + "]." + fieldName;
                     declareUniform(fieldType, uniformName, elementIndex);
-                    elementIndex += fieldType.elementRegisterCount();
+                    elementIndex += fieldType.totalRegisterCount();
                 }
             }
         }