Module: Mesa Branch: main Commit: 6a4156f812f07592ffe3628411e4f39b164a3f30 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a4156f812f07592ffe3628411e4f39b164a3f30
Author: Caio Oliveira <caio.olive...@intel.com> Date: Wed Dec 13 10:28:16 2023 -0800 clover: Remove usage of glsl_type C++ helpers Preparation for removing the C++ helpers from glsl_type. Reviewed-by: Karol Herbst <kher...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26671> --- src/gallium/frontends/clover/nir/invocation.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/frontends/clover/nir/invocation.cpp b/src/gallium/frontends/clover/nir/invocation.cpp index 64c7fe6ced1..038b234b3ae 100644 --- a/src/gallium/frontends/clover/nir/invocation.cpp +++ b/src/gallium/frontends/clover/nir/invocation.cpp @@ -74,12 +74,12 @@ static void debug_function(void *private_data, static void clover_arg_size_align(const glsl_type *type, unsigned *size, unsigned *align) { - if (type == glsl_type::sampler_type || type->is_image()) { + if (glsl_type_is_sampler(type) || glsl_type_is_image(type)) { *size = 0; *align = 1; } else { - *size = type->cl_size(); - *align = type->cl_alignment(); + *size = glsl_get_cl_size(type); + *align = glsl_get_cl_alignment(type); } } @@ -264,9 +264,9 @@ nir_shader *clover::nir::load_libclc_nir(const device &dev, std::string &r_log) static bool can_remove_var(nir_variable *var, void *data) { - return !(var->type->is_sampler() || - var->type->is_texture() || - var->type->is_image()); + return !(glsl_type_is_sampler(var->type) || + glsl_type_is_texture(var->type) || + glsl_type_is_image(var->type)); } binary clover::nir::spirv_to_nir(const binary &mod, const device &dev,
