fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 20:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: use intermediate var for glsl non-array type during shader create

Browse source 
minor readability change

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9624>
This commit is contained in:
Mike Blumenkrantz 2020-12-01 13:48:17 -05:00 • committed by Marge Bot
parent 2b4609b66c
commit 10bfe8759b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/zink/zink_compiler.c
View file

@ -623,9 +623,10 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir,
nir_var_mem_ubo |
nir_var_mem_ssbo)) {
enum zink_descriptor_type ztype;
const struct glsl_type *type = glsl_without_array(var->type);
if (var->data.mode == nir_var_mem_ubo) {
/* ignore variables being accessed if they aren't the base of the UBO */
bool ubo_array = glsl_type_is_array(var->type) && glsl_type_is_interface(glsl_without_array(var->type));
bool ubo_array = glsl_type_is_array(var->type) && glsl_type_is_interface(type);
if (var->data.location && !ubo_array && var->type != var->interface_type)
continue;
var->data.binding = cur_ubo;
@ -652,7 +653,7 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir,
}
} else if (var->data.mode == nir_var_mem_ssbo) {
/* same-ish mechanics as ubos */
bool bo_array = glsl_type_is_array(var->type) && glsl_type_is_interface(glsl_without_array(var->type));
bool bo_array = glsl_type_is_array(var->type) && glsl_type_is_interface(type);
if (var->data.location && !bo_array)
continue;
if (!var->data.explicit_binding) {
@ -675,7 +676,6 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir,
}
} else {
assert(var->data.mode == nir_var_uniform);
const struct glsl_type *type = glsl_without_array(var->type);
if (glsl_type_is_sampler(type) || glsl_type_is_image(type)) {
VkDescriptorType vktype = glsl_type_is_image(type) ? zink_image_type(type) : zink_sampler_type(type);
ztype = zink_desc_type_from_vktype(vktype);