clover/nir: Use lower_vars_to_explicit for uniform and global
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6472>
diff --git a/src/gallium/frontends/clover/nir/invocation.cpp b/src/gallium/frontends/clover/nir/invocation.cpp
index 0811f1b..f2c53fc 100644
--- a/src/gallium/frontends/clover/nir/invocation.cpp
+++ b/src/gallium/frontends/clover/nir/invocation.cpp
@@ -220,18 +220,11 @@
auto args = sym.args;
NIR_PASS_V(nir, clover_lower_nir, args, dev.max_block_size().size());
- // Calculate input offsets.
- unsigned offset = 0;
- nir_foreach_uniform_variable(var, nir) {
- offset = align(offset, glsl_get_cl_alignment(var->type));
- var->data.driver_location = offset;
- offset += glsl_get_cl_size(var->type);
- }
-
NIR_PASS_V(nir, nir_lower_mem_constant_vars,
glsl_get_cl_type_size_align);
NIR_PASS_V(nir, nir_lower_vars_to_explicit_types,
- nir_var_mem_shared | nir_var_function_temp,
+ nir_var_uniform | nir_var_mem_shared |
+ nir_var_mem_global | nir_var_function_temp,
glsl_get_cl_type_size_align);
/* use offsets for kernel inputs (uniform) */
