From d464a21e2d796e396e7e4c0cfe971b41003e2d2a Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 7 Dec 2011 02:21:37 -0800 Subject: [PATCH] i965: Return BRW_DEPTHBUFFER_D32_FLOAT as the null-depthbuffer format. Fixes many crashes on Ivybridge due to upload_sf_state calling brw_depthbuffer_format without an actual depth buffer. This was a recent regression on master. +3992 piglits on Ivybridge. Signed-off-by: Kenneth Graunke Reviewed-by: Eric Anholt --- src/mesa/drivers/dri/i965/brw_misc_state.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c index 8a6ee70..3e8cb3f 100644 --- a/src/mesa/drivers/dri/i965/brw_misc_state.c +++ b/src/mesa/drivers/dri/i965/brw_misc_state.c @@ -212,6 +212,9 @@ brw_depthbuffer_format(struct brw_context *brw) drb = srb; } + if (!drb) + return BRW_DEPTHFORMAT_D32_FLOAT; + switch (drb->Base.Format) { case MESA_FORMAT_Z16: return BRW_DEPTHFORMAT_D16_UNORM; -- 2.7.4