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

rusticl/kernel: fix local buffers

Browse source 
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15439>
This commit is contained in:
Karol Herbst 2022-05-04 19:43:26 +02:00 • committed by Marge Bot
parent 98188391a2
commit a438533181
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -749,7 +749,7 @@ impl Kernel {
let offsets = create_kernel_arr::<u64>(offsets, 0);
let mut input: Vec<u8> = Vec::new();
let mut resource_info = Vec::new();
let mut local_size: u32 = nir.shared_size();
let mut local_size: u64 = nir.shared_size() as u64;
let printf_size = q.device.printf_buffer_size() as u32;
let mut samplers = Vec::new();
let mut iviews = Vec::new();
@ -804,8 +804,10 @@ impl Kernel {
}
KernelArgValue::LocalMem(size) => {
// TODO 32 bit
input.extend_from_slice(&[0; 8]);
local_size += *size as u32;
let pot = cmp::min(*size, 0x80);
local_size = align(local_size, pot.next_power_of_two() as u64);
input.extend_from_slice(&local_size.to_ne_bytes());
local_size += *size as u64;
}
KernelArgValue::Sampler(sampler) => {
samplers.push(sampler.pipe());
@ -900,7 +902,7 @@ impl Kernel {
init_data.len() as u32,
);
}
let cso = ctx.create_compute_state(nir, input.len() as u32, local_size);
let cso = ctx.create_compute_state(nir, input.len() as u32, local_size as u32);
ctx.bind_compute_state(cso);
ctx.bind_sampler_states(&samplers);

19
src/gallium/frontends/rusticl/util/math.rs
View file

@ -1,4 +1,6 @@
use std::ops::Add;
use std::ops::Rem;
use std::ops::Sub;
pub fn gcd<T>(mut a: T, mut b: T) -> T
where
@ -14,3 +16,20 @@ where
b
}
pub fn align<T>(val: T, a: T) -> T
where
T: Add<Output = T>,
T: Copy,
T: Default,
T: PartialEq,
T: Rem<Output = T>,
T: Sub<Output = T>,
{
let tmp = val % a;
if tmp == T::default() {
val
} else {
val + (a - tmp)
}
}