From 85aaeb4bf852848cc49eb1b014af63d0847086f0 Mon Sep 17 00:00:00 2001
From: LingMan <18294-LingMan@users.noreply.gitlab.freedesktop.org>
Date: Fri, 11 Oct 2024 02:19:12 +0200
Subject: [PATCH] rusticl: Use C-string literals for NirShader::add_var

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31510>
---
 src/gallium/frontends/rusticl/core/kernel.rs  | 20 +++++++++----------
 .../frontends/rusticl/mesa/compiler/nir.rs    |  7 +++----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/gallium/frontends/rusticl/core/kernel.rs b/src/gallium/frontends/rusticl/core/kernel.rs
index b60d1adcb8d..a614c908014 100644
--- a/src/gallium/frontends/rusticl/core/kernel.rs
+++ b/src/gallium/frontends/rusticl/core/kernel.rs
@@ -781,7 +781,7 @@ fn compile_nir_variant(
                        var_loc: &mut usize,
                        kind: CompiledKernelArgType,
                        glsl_type: *const glsl_type,
-                       name: &str| {
+                       name| {
         *var_loc = compiled_args.len();
         compiled_args.push(CompiledKernelArg {
             kind: kind,
@@ -803,7 +803,7 @@ fn compile_nir_variant(
             &mut lower_state.base_global_invoc_id_loc,
             CompiledKernelArgType::GlobalWorkOffsets,
             unsafe { glsl_vector_type(address_bits_base_type, 3) },
-            "base_global_invocation_id",
+            c"base_global_invocation_id",
         )
     }
 
@@ -813,7 +813,7 @@ fn compile_nir_variant(
             &mut lower_state.global_size_loc,
             CompiledKernelArgType::GlobalWorkSize,
             unsafe { glsl_vector_type(address_bits_base_type, 3) },
-            "global_size",
+            c"global_size",
         )
     }
 
@@ -824,7 +824,7 @@ fn compile_nir_variant(
             &mut lower_state.base_workgroup_id_loc,
             CompiledKernelArgType::WorkGroupOffsets,
             unsafe { glsl_vector_type(address_bits_base_type, 3) },
-            "base_workgroup_id",
+            c"base_workgroup_id",
         );
     }
 
@@ -834,7 +834,7 @@ fn compile_nir_variant(
             &mut lower_state.num_workgroups_loc,
             CompiledKernelArgType::NumWorkgroups,
             unsafe { glsl_vector_type(glsl_base_type::GLSL_TYPE_UINT, 3) },
-            "num_workgroups",
+            c"num_workgroups",
         );
     }
 
@@ -844,7 +844,7 @@ fn compile_nir_variant(
             &mut lower_state.const_buf_loc,
             CompiledKernelArgType::ConstantBuffer,
             address_bits_ptr_type,
-            "constant_buffer_addr",
+            c"constant_buffer_addr",
         );
     }
     if nir.has_printf() {
@@ -853,7 +853,7 @@ fn compile_nir_variant(
             &mut lower_state.printf_buf_loc,
             CompiledKernelArgType::PrintfBuffer,
             address_bits_ptr_type,
-            "printf_buffer_addr",
+            c"printf_buffer_addr",
         );
     }
 
@@ -865,7 +865,7 @@ fn compile_nir_variant(
             &mut lower_state.format_arr_loc,
             CompiledKernelArgType::FormatArray,
             unsafe { glsl_array_type(glsl_int16_t_type(), count as u32, 2) },
-            "image_formats",
+            c"image_formats",
         );
 
         add_var(
@@ -873,7 +873,7 @@ fn compile_nir_variant(
             &mut lower_state.order_arr_loc,
             CompiledKernelArgType::OrderArray,
             unsafe { glsl_array_type(glsl_int16_t_type(), count as u32, 2) },
-            "image_orders",
+            c"image_orders",
         );
     }
 
@@ -883,7 +883,7 @@ fn compile_nir_variant(
             &mut lower_state.work_dim_loc,
             CompiledKernelArgType::WorkDim,
             unsafe { glsl_uint8_t_type() },
-            "work_dim",
+            c"work_dim",
         );
     }
 
diff --git a/src/gallium/frontends/rusticl/mesa/compiler/nir.rs b/src/gallium/frontends/rusticl/mesa/compiler/nir.rs
index e8e9f078fd3..05db2896d38 100644
--- a/src/gallium/frontends/rusticl/mesa/compiler/nir.rs
+++ b/src/gallium/frontends/rusticl/mesa/compiler/nir.rs
@@ -3,7 +3,7 @@ use mesa_rust_util::bitset;
 use mesa_rust_util::offset_of;
 
 use std::convert::TryInto;
-use std::ffi::CString;
+use std::ffi::CStr;
 use std::marker::PhantomData;
 use std::ptr;
 use std::ptr::NonNull;
@@ -226,7 +226,7 @@ impl NirShader {
 
     #[cfg(debug_assertions)]
     pub fn validate(&self, when: &str) {
-        let cstr = CString::new(when).unwrap();
+        let cstr = std::ffi::CString::new(when).unwrap();
         unsafe { nir_validate_shader(self.nir.as_ptr(), cstr.as_ptr()) }
     }
 
@@ -474,9 +474,8 @@ impl NirShader {
         mode: nir_variable_mode,
         glsl_type: *const glsl_type,
         loc: usize,
-        name: &str,
+        name: &CStr,
     ) {
-        let name = CString::new(name).unwrap();
         unsafe {
             let var = nir_variable_create(self.nir.as_ptr(), mode, glsl_type, name.as_ptr());
             (*var).data.location = loc.try_into().unwrap();