fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rusticl/kernel: move assign_locations into CompiledKernelArg

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30152>
This commit is contained in:
Karol Herbst 2024-08-12 15:04:51 +02:00 • committed by Marge Bot
parent 76b2236834
commit 36550d9da3
1 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/gallium/frontends/rusticl/core/kernel.rs
View file

@ -176,30 +176,6 @@ impl KernelArg {
res
}
fn assign_locations(
args: &mut [Self],
compiled_args: &mut [CompiledKernelArg],
nir: &mut NirShader,
) {
for var in nir.variables_with_mode(
nir_variable_mode::nir_var_uniform | nir_variable_mode::nir_var_image,
) {
let arg = &mut compiled_args[var.data.location as usize];
if let CompiledKernelArgType::APIArg(idx) = arg.kind {
args[idx as usize].dead = false;
}
let t = var.type_;
arg.offset = if unsafe {
glsl_type_is_image(t) || glsl_type_is_texture(t) || glsl_type_is_sampler(t)
} {
var.data.binding
} else {
var.data.driver_location
};
}
}
fn serialize(args: &[Self], blob: &mut blob) {
unsafe {
blob_write_uint16(blob, args.len() as u16);
@ -243,6 +219,26 @@ struct CompiledKernelArg {
}
impl CompiledKernelArg {
fn assign_locations(args: &mut [KernelArg], compiled_args: &mut [Self], nir: &mut NirShader) {
for var in nir.variables_with_mode(
nir_variable_mode::nir_var_uniform | nir_variable_mode::nir_var_image,
) {
let arg = &mut compiled_args[var.data.location as usize];
if let CompiledKernelArgType::APIArg(idx) = arg.kind {
args[idx as usize].dead = false;
}
let t = var.type_;
arg.offset = if unsafe {
glsl_type_is_image(t) || glsl_type_is_texture(t) || glsl_type_is_sampler(t)
} {
var.data.binding
} else {
var.data.driver_location
};
}
}
fn serialize(args: &[Self], blob: &mut blob) {
unsafe {
blob_write_uint16(blob, args.len() as u16);
@ -847,7 +843,7 @@ fn lower_and_optimize_nir(
/* before passing it into drivers, assign locations as drivers might remove nir_variables or
* other things we depend on
*/
KernelArg::assign_locations(&mut args, &mut compiled_args, nir);
CompiledKernelArg::assign_locations(&mut args, &mut compiled_args, nir);
/* update the has_variable_shared_mem info as we might have DCEed all of them */
nir.set_has_variable_shared_mem(