diff options
author | Samuel Iglesias Gonsalvez <[email protected]> | 2014-11-27 09:39:05 +0100 |
---|---|---|
committer | Samuel Iglesias Gonsalvez <[email protected]> | 2015-04-15 08:11:18 +0200 |
commit | 3cbefe3cf4c745c7c681cfc18a1e47461fec91db (patch) | |
tree | a97735249570fc5affbb1c6109867fd1eaf93624 /src/glsl/opt_swizzle_swizzle.cpp | |
parent | bc672e261c5f7ff56cd2b8f6b518ebfdc0163bb7 (diff) |
glsl: fix assignment of multiple scalar and vecs to matrices.
When a vec has more elements than row components in a matrix, the
code could end up failing an assert inside assign_to_matrix_column().
This patch makes sure that when there is still room in the matrix for
more elements (but in other columns of the matrix), the data is actually
assigned.
This patch fixes the following dEQP test:
dEQP-GLES3.functional.shaders.conversions.matrix_combine.float_bvec4_ivec2_bool_to_mat4x2_vertex
dEQP-GLES3.functional.shaders.conversions.matrix_combine.float_bvec4_ivec2_bool_to_mat4x2_fragment
Signed-off-by: Samuel Iglesias Gonsalvez <[email protected]>
Reviewed-by: Ben Widawsky <[email protected]>
Diffstat (limited to 'src/glsl/opt_swizzle_swizzle.cpp')
0 files changed, 0 insertions, 0 deletions