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

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: 2bf91733fc ("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>
This commit is contained in:
Timothy Arceri 2020-02-10 11:22:32 +11:00 committed by Marge Bot
parent 6baeca3689
commit 676869e1d4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/glsl/gl_nir_link_uniform_initializers.c
View File

@ -87,7 +87,7 @@ set_opaque_binding(struct set_opaque_binding_closure *data,
storage->storage[i].i;
}
}
} else if (glsl_type_is_image(type)) {
} else if (glsl_type_is_image(storage->type)) {
for (unsigned i = 0; i < elements; i++) {
const unsigned index = storage->opaque[sh].index + i;