Fix CB emulation when copying the struct out of CB

When an entire struct was copied out of the uniform buffer, like so:

Foo foo = global_ubo.foos[3];

We didn't propagate the struct type correctly; this change fixes it.

Author: zeux

src/GLSLGenerator.cpp

@@ -486,7 +486,7 @@ void GLSLGenerator::OutputExpression(HLSLExpression* expression, const HLSLType*
 
     if (bufferAccess)
     {
-        OutputBufferAccessExpression(bufferAccess, expression, 0);
+        OutputBufferAccessExpression(bufferAccess, expression, expression->expressionType, 0);
     }
     else if (expression->nodeType == HLSLNodeType_IdentifierExpression)
     {
@@ -1312,10 +1312,8 @@ HLSLBuffer* GLSLGenerator::GetBufferAccessExpression(HLSLExpression* expression)
     return 0;
 }
 
-void GLSLGenerator::OutputBufferAccessExpression(HLSLBuffer* buffer, HLSLExpression* expression, unsigned int postOffset)
+void GLSLGenerator::OutputBufferAccessExpression(HLSLBuffer* buffer, HLSLExpression* expression, const HLSLType& type, unsigned int postOffset)
 {
-    const HLSLType& type = expression->expressionType;
-
     if (type.array)
     {
         Error("Constant buffer access is not supported for arrays (use indexing instead)");
@@ -1368,7 +1366,7 @@ void GLSLGenerator::OutputBufferAccessExpression(HLSLBuffer* buffer, HLSLExpress
 
             for (HLSLStructField* field = st->field; field; field = field->nextField)
             {
-                OutputBufferAccessExpression(buffer, expression, offset);
+                OutputBufferAccessExpression(buffer, expression, field->type, offset);
 
                 if (field->nextField)
                     m_writer.Write(",");

src/GLSLGenerator.h

@@ -96,7 +96,7 @@ class GLSLGenerator
     void LayoutBufferAlign(const HLSLType& type, unsigned int& offset);
 
     HLSLBuffer* GetBufferAccessExpression(HLSLExpression* expression);
-    void OutputBufferAccessExpression(HLSLBuffer* buffer, HLSLExpression* expression, unsigned int postOffset);
+    void OutputBufferAccessExpression(HLSLBuffer* buffer, HLSLExpression* expression, const HLSLType& type, unsigned int postOffset);
     unsigned int OutputBufferAccessIndex(HLSLExpression* expression, unsigned int postOffset);
 
     void OutputBuffer(int indent, HLSLBuffer* buffer);