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

nvk,nil: Stop panicing in image creation

Browse source 
If an image gets created with unsupported parameters (which is a pretty
complex thing to check), it's probably better to just return an error
rather than panic, especially since Rust panics happen even in release
builds.

Reviewed-by: Mel Henning <mhenning@darkrefraction.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33990>
This commit is contained in:
Faith Ekstrand 2025-03-10 14:46:52 -05:00 • committed by Marge Bot
parent 917cecb3c2
commit e029d2b45a
2 changed files with 52 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/nouveau/nil/image.rs
View file

@ -10,6 +10,8 @@ use crate::Minify;
use nil_rs_bindings::*;
use nvidia_headers::classes::{cl9097, clc597};
use std::panic;
pub const MAX_LEVELS: usize = 16;
pub type ImageUsageFlags = u8;
@ -186,24 +188,40 @@ pub struct Image {
impl Image {
#[no_mangle]
pub extern "C" fn nil_image_new(
pub extern "C" fn nil_image_init(
dev: &nil_rs_bindings::nv_device_info,
image_out: *mut Self,
info: &ImageInitInfo,
) -> Self {
Self::new(dev, std::slice::from_ref(info), 0)
) -> bool {
panic::catch_unwind(|| {
let image = Self::new(dev, std::slice::from_ref(info), 0);
unsafe {
assert!(!image_out.is_null());
image_out.write(image);
}
})
.is_ok()
}
#[no_mangle]
pub extern "C" fn nil_image_new_planar(
pub extern "C" fn nil_image_init_planar(
dev: &nil_rs_bindings::nv_device_info,
image_out: *mut Self,
info: *const ImageInitInfo,
plane: usize,
plane_count: usize,
) -> Self {
assert!(plane < plane_count);
let infos = unsafe { std::slice::from_raw_parts(info, plane_count) };
Self::new(dev, infos, plane)
) -> bool {
panic::catch_unwind(|| {
assert!(plane < plane_count);
let infos =
unsafe { std::slice::from_raw_parts(info, plane_count) };
let image = Self::new(dev, infos, plane);
unsafe {
assert!(!image_out.is_null());
image_out.write(image);
}
})
.is_ok()
}
fn new_linear(

33
src/nouveau/vulkan/nvk_image.c
View file

@ -861,8 +861,12 @@ nvk_image_init(struct nvk_device *dev,
.samples = image->vk.samples,
.usage = usage & ~NIL_IMAGE_USAGE_LINEAR_BIT,
};
image->linear_tiled_shadow.nil =
nil_image_new(&pdev->info, &tiled_shadow_nil_info);
bool ok = nil_image_init(&pdev->info,
&image->linear_tiled_shadow.nil,
&tiled_shadow_nil_info);
if (!ok)
return vk_errorf(dev, VK_ERROR_UNKNOWN,
"Invalid image creation parameters");
}
}
@ -903,13 +907,22 @@ nvk_image_init(struct nvk_device *dev,
if (usage & NIL_IMAGE_USAGE_VIDEO_BIT) {
assert(!image->disjoint);
for (uint8_t plane = 0; plane < image->plane_count; plane++) {
image->planes[plane].nil =
nil_image_new_planar(&pdev->info, nil_info, plane, image->plane_count);
bool ok = nil_image_init_planar(&pdev->info,
&image->planes[plane].nil,
nil_info, plane,
image->plane_count);
if (!ok)
return vk_errorf(dev, VK_ERROR_UNKNOWN,
"Invalid image creation parameters");
}
} else {
for (uint8_t plane = 0; plane < image->plane_count; plane++) {
image->planes[plane].nil =
nil_image_new(&pdev->info, &nil_info[plane]);
bool ok = nil_image_init(&pdev->info,
&image->planes[plane].nil,
&nil_info[plane]);
if (!ok)
return vk_errorf(dev, VK_ERROR_UNKNOWN,
"Invalid image creation parameters");
}
}
@ -929,8 +942,12 @@ nvk_image_init(struct nvk_device *dev,
.usage = usage,
};
image->stencil_copy_temp.nil =
nil_image_new(&pdev->info, &stencil_nil_info);
bool ok = nil_image_init(&pdev->info,
&image->stencil_copy_temp.nil,
&stencil_nil_info);
if (!ok)
return vk_errorf(dev, VK_ERROR_UNKNOWN,
"Invalid image creation parameters");
}
return VK_SUCCESS;