Emit body for constructors in the right place.

Previously, the body of some vector constructors were added to the wrong
function signature, and the body of matrix constructors were just being
dumped in the main instruction stream.

diff --git a/glsl_types.cpp b/glsl_types.cpp
index e72a8fc39d4fdf7af815f259c22a6d9fab74eb52..508a75703d116ca5147c5e8227b27120d24d5830 100644 (file)
--- a/glsl_types.cpp
+++ b/glsl_types.cpp
@@ -454,7 +454,7 @@ generate_constructor(glsl_symbol_table *symtab, const struct glsl_type *types,
                                       declarations);
         f->add_signature(vec_sig);
 
-        generate_vec_body_from_N_scalars(&sig->body, declarations);
+        generate_vec_body_from_N_scalars(&vec_sig->body, declarations);
       } else {
         assert(types[i].is_matrix());
 
@@ -467,7 +467,7 @@ generate_constructor(glsl_symbol_table *symtab, const struct glsl_type *types,
                                       declarations);
         f->add_signature(mat_sig);
 
-        generate_mat_body_from_N_scalars(instructions, declarations);
+        generate_mat_body_from_N_scalars(&mat_sig->body, declarations);
       }
    }
 }