From 7bcd5bedcc16ad1be989cef7a05e6aa7711213e9 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 21 Apr 2010 15:00:29 -0700 Subject: [PATCH] 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. --- glsl_types.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glsl_types.cpp b/glsl_types.cpp index e72a8fc39d4..508a75703d1 100644 --- 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); } } } -- 2.30.2