glsl: fix gl_nir_set_uniform_initializers() for image arrays
authorTimothy Arceri <tarceri@itsqueeze.com>
Mon, 10 Feb 2020 00:22:32 +0000 (11:22 +1100)
committerMarge Bot <eric+marge@anholt.net>
Fri, 14 Feb 2020 01:37:03 +0000 (01:37 +0000)
commit676869e1d4bb1660430fcdb99443238a7de50eb8
treef1f896b4648fab8daf15f8a5dc9486513556806b
parent6baeca36899109cd9d8e06d1b5f4b9db8becd5fa
glsl: fix gl_nir_set_uniform_initializers() for image arrays

The if was incorrectly checking for an image type on what could
be an array of images. Here we change it to use the type stored
in uniform storage which has already been stripped of arrays,
this is what the above code for samplers does also.

Fixes: 2bf91733fcb5 ("nir/linker: Set the uniform initial values")
Reviewed-by: Alejandro PiƱeiro <apinheiro@igalia.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3757>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3757>
src/compiler/glsl/gl_nir_link_uniform_initializers.c