glsl: fix check for matrices in blocks when using nir uniform linker
authorTimothy Arceri <tarceri@itsqueeze.com>
Mon, 13 Jan 2020 00:36:10 +0000 (11:36 +1100)
committerMarge Bot <eric+marge@anholt.net>
Thu, 23 Jan 2020 01:02:25 +0000 (01:02 +0000)
commite5b3cf433e8b0e31e257a8e1216b6f8c08f7e780
tree6ad70fbc99e6a17c3d4bcf455b7bf61ac7b7e202
parent55e4410b34bb699cd3dbfc32f272b3c721e00760
glsl: fix check for matrices in blocks when using nir uniform linker

We need to stripe any arrays before checking the type. Here we
just use the uniform type which has already be stripped.

Reviewed-by: Alejandro PiƱeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3468>
src/compiler/glsl/gl_nir_link_uniforms.c