KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nir/spirv: Create the correct type if a matrix-vector multiply produces a vector

This commit is contained in:
Jason Ekstrand 2015-12-23 13:17:00 -08:00
parent 5b30132388
commit 452ba4db2b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/glsl/nir/spirv_to_nir.c
View File

@ -2369,9 +2369,14 @@ vtn_matrix_multiply(struct vtn_builder *b,
unsigned src0_columns = glsl_get_matrix_columns(src0->type);
unsigned src1_columns = glsl_get_matrix_columns(src1->type);
struct vtn_ssa_value *dest =
vtn_create_ssa_value(b, glsl_matrix_type(glsl_get_base_type(src0->type),
src0_rows, src1_columns));
const struct glsl_type *dest_type;
if (src1_columns > 1) {
dest_type = glsl_matrix_type(glsl_get_base_type(src0->type),
src0_rows, src1_columns);
} else {
dest_type = glsl_vector_type(glsl_get_base_type(src0->type), src0_rows);
}
struct vtn_ssa_value *dest = vtn_create_ssa_value(b, dest_type);
dest = vtn_wrap_matrix(b, dest);