fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

iris: fix a crash in disable_rb_aux_buffer

Browse source 
I have been running into crashes in this function when using blender.
Some of the entries in ice->state.framebuffer.base.cbufs[0] can
apparently have the texture field be null, which was causing a segfault
in this loop.

In my case, nr_cbufs was 3, and the first two cbufs entries had a null
texture and format set to PIPE_FORMAT_NONE. The last entry had format of
PIPE_FORMAT_R16G16_FLOAT and a non-null texture.

Adding this null check before attempting to dereference the texture
fixes the crash for me and allows blender to work normally.

Fixes: ca96f8517c ("iris: remove uses of pipe_surface as a pointer")
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40688>
This commit is contained in:
Adam Simpkins 2026-03-28 12:59:32 -07:00 • committed by Marge Bot
parent 3324abad06
commit e16c8cc579
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/iris/iris_resolve.c
View file

@ -42,7 +42,8 @@ disable_rb_aux_buffer(struct iris_context *ice,
struct pipe_surface *surf = &cso_fb->base.cbufs[i];
struct iris_resource *rb_res = (void *) surf->texture;
if (rb_res->bo == tex_res->bo &&
if (rb_res != NULL &&
rb_res->bo == tex_res->bo &&
surf->level >= min_level &&
surf->level < min_level + num_levels) {
found = draw_aux_buffer_disabled[i] = true;