From a8388e6eb293e10ad9233af125406ce3e178ce58 Mon Sep 17 00:00:00 2001 From: Ian Forbes Date: Mon, 24 Nov 2025 10:12:25 -0600 Subject: [PATCH] svga: Check if Stencil buffer is NULL Fixes a nullptr dereference on older HW versions. Fixes: f29d9398242 ("svga: rework framebuffer state") Signed-off-by: Ian Forbes Part-of: (cherry picked from commit 4e16a5b68bbec9351a524e369176a3e62c7e72f5) --- .pick_status.json | 2 +- src/gallium/drivers/svga/svga_state_framebuffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 7a1357d684f..00fccf318f7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3494,7 +3494,7 @@ "description": "svga: Check if Stencil buffer is NULL", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "f29d93982420f26c25b78e65fad78b09dc71f187", "notes": null diff --git a/src/gallium/drivers/svga/svga_state_framebuffer.c b/src/gallium/drivers/svga/svga_state_framebuffer.c index 75e172629a8..e5ee4935d3b 100644 --- a/src/gallium/drivers/svga/svga_state_framebuffer.c +++ b/src/gallium/drivers/svga/svga_state_framebuffer.c @@ -84,7 +84,7 @@ emit_fb_vgpu9(struct svga_context *svga) if (svga_surface_needs_propagation(hwfb->zsbuf)) svga_propagate_surface(svga, hwfb->zsbuf, true); - if (currfb->zsbuf->base.texture && + if (currfb->zsbuf && currfb->zsbuf->base.texture && util_format_is_depth_and_stencil(currfb->zsbuf->base.format)) { ret = SVGA3D_SetRenderTarget(svga->swc, SVGA3D_RT_STENCIL, currfb->zsbuf);