commit c2141fb314ecb6aa36861de57b7744649e51ea1b
author Jamie Madill <jmadill@chromium.org> Fri Aug 30 13:21:08 2013 -0400
committer Jamie Madill <jmadill@chromium.org> Mon Sep 09 15:27:51 2013 -0400
tree 4c3350fcfb822984403295e40b897d28d80f0b40
parent 77456f28ad98ee30b75b85c5f5a4a6e6bdddd870

Consolidate the register counting functions to a single location in the HLSL layout encoder source.

This new method explicitly depends on HLSL packing rules, instead of a GL idiom.

TRAC #23748

Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens

src/libGLESv2/ProgramBinary.cpp

diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
index c670fec..78db619 100644
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -24,6 +24,8 @@
 #include "libGLESv2/Context.h"
 #include "libGLESv2/Buffer.h"
 
+#include "compiler/HLSLLayoutEncoder.h"
+
 #undef near
 #undef far
 
@@ -2375,7 +2377,7 @@
                 {
                     return false;
                 }
-                fieldRegisterIndex += totalRegisterCount(field);
+                fieldRegisterIndex += sh::HLSLVariableRegisterCount(field);
             }
         }