AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rusticl: fix a bunch of warnings

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36780>
This commit is contained in:
Karol Herbst
2025-08-14 19:06:03 +02:00
committed by Marge Bot
parent d6a79f7e9f
commit 060a084a12
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/frontends/rusticl/api/program.rs
+2 -6
View File
@@ -329,13 +329,11 @@ fn build_program(
}
let options = c_string_to_string(options);
let res = program.build(devices, options, callback);
program.build(devices, options, callback)
//• CL_INVALID_BINARY if program is created with clCreateProgramWithBinary and devices listed in device_list do not have a valid program binary loaded.
//• CL_INVALID_BUILD_OPTIONS if the build options specified by options are invalid.
//• CL_INVALID_OPERATION if program was not created with clCreateProgramWithSource, clCreateProgramWithIL or clCreateProgramWithBinary.
res
}
#[cl_entrypoint(clCompileProgram)]
@@ -413,11 +411,9 @@ fn compile_program(
}
let options = c_string_to_string(options);
let res = program.compile(devices, options, headers, callback);
program.compile(devices, options, headers, callback)
// • CL_INVALID_COMPILER_OPTIONS if the compiler options specified by options are invalid.
res
}
pub fn link_program(
src/gallium/frontends/rusticl/core/program.rs
+5 -5
View File
@@ -135,7 +135,7 @@ impl ProgramBuild {
}
let build_result =
convert_spirv_to_nir(&build, kernel_name, &args, &self.spec_constants, dev);
convert_spirv_to_nir(build, kernel_name, &args, &self.spec_constants, dev);
kernel_info_set.insert(build_result.kernel_info);
self.builds_by_device.get_mut(dev).unwrap().kernels.insert(
@@ -639,7 +639,7 @@ impl Program {
spirv::CLCHeader {
name: &header.name,
source: &header_src,
source: header_src,
}
})
.collect();
@@ -824,7 +824,7 @@ impl Program {
is_lib: bool,
device_for_validation: Option<&Device>,
) {
let (spirv, log) = spirv::SPIRVBin::link(&bins, is_lib);
let (spirv, log) = spirv::SPIRVBin::link(bins, is_lib);
let (spirv, log) = if let Some(device) = device_for_validation {
if let Some(spirv) = spirv {
let val_options = clc_validator_options(device);
@@ -1040,10 +1040,10 @@ fn create_link_closure(
.map(|l| l.dev_build(device).spirv.as_ref().unwrap())
.collect();
let mut device_build = build_info.dev_build_mut(device);
let device_build = build_info.dev_build_mut(device);
let device_for_validation = Platform::dbg().validate_spirv.then_some(device);
Program::do_link(&mut device_build, &bins, is_lib, device_for_validation);
Program::do_link(device_build, &bins, is_lib, device_for_validation);
}
// Pre build nir kernels