From 796d3fe9e0f628fd57a68dc0448ba1a182ca5725 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 27 Aug 2020 15:56:38 -0500 Subject: [PATCH] clover/nir: Use lower_vars_to_explicit for uniform and global Reviewed-by: Jesse Natalie Reviewed-by: Karol Herbst Part-of: --- src/gallium/frontends/clover/nir/invocation.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/gallium/frontends/clover/nir/invocation.cpp b/src/gallium/frontends/clover/nir/invocation.cpp index 0811f1b24be..f2c53fc4b22 100644 --- a/src/gallium/frontends/clover/nir/invocation.cpp +++ b/src/gallium/frontends/clover/nir/invocation.cpp @@ -220,18 +220,11 @@ module clover::nir::spirv_to_nir(const module &mod, const device &dev, 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) */ -- 2.30.2