diff options
| author | Paul Berry <[email protected]> | 2013-04-09 05:58:43 -0700 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2013-04-10 13:17:53 -0700 |
| commit | 42767dc22fdc69d72622c13521f2e703470170b3 (patch) | |
| tree | 3f613dddc449f66ee4bd9e2cbe4b2d181a7e409a | |
| parent | 34c3f986419340ae695d75103bcc7907a97d0f13 (diff) | |
i965/blorp: Remove unnecessary test in gen7_blorp_emit_depth_stencil_config.
gen7_blorp_emit_depth_stencil_config() is only called when
params->depth.mt is non-null. Therefore, it's not necessary to do an
"if (params->depth.mt)" test inside it. The presence of this if test
was misleading static analysis tools (and briefly, me) into thinking
that gen7_blorp_emit_depth_stencil_config() might sometimes access
uninitialized data and dereference a null pointer.
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_blorp.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_blorp.cpp b/src/mesa/drivers/dri/i965/gen7_blorp.cpp index 423dd3c8295..290ad359cf7 100644 --- a/src/mesa/drivers/dri/i965/gen7_blorp.cpp +++ b/src/mesa/drivers/dri/i965/gen7_blorp.cpp @@ -584,13 +584,11 @@ gen7_blorp_emit_depth_stencil_config(struct brw_context *brw, uint32_t draw_y = params->depth.y_offset; uint32_t tile_mask_x, tile_mask_y; - if (params->depth.mt) { - brw_get_depthstencil_tile_masks(params->depth.mt, - params->depth.level, - params->depth.layer, - NULL, - &tile_mask_x, &tile_mask_y); - } + brw_get_depthstencil_tile_masks(params->depth.mt, + params->depth.level, + params->depth.layer, + NULL, + &tile_mask_x, &tile_mask_y); /* 3DSTATE_DEPTH_BUFFER */ { |