From 85aa4074a29b5fcb6dbf0d34b85b36c05eeecc02 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Sun, 12 Nov 2017 18:31:56 -0800 Subject: [PATCH] i965/blorp: Use a designated initializer for blorp_surf This way uninitialized fields get automatically zeroed and it's safe to add more fields to blorp_surf. Reviewed-by: Lionel Landwerlin Reviewed-by: Nanley Chery --- src/mesa/drivers/dri/i965/brw_blorp.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c index 38284d3b855..5393c7236e3 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.c +++ b/src/mesa/drivers/dri/i965/brw_blorp.c @@ -139,16 +139,17 @@ blorp_surf_for_miptree(struct brw_context *brw, intel_miptree_check_level_layer(mt, *level, start_layer + i); } - surf->surf = &mt->surf; - surf->addr = (struct blorp_address) { - .buffer = mt->bo, - .offset = mt->offset, - .reloc_flags = is_render_target ? EXEC_OBJECT_WRITE : 0, - .mocs = brw_get_bo_mocs(devinfo, mt->bo), + *surf = (struct blorp_surf) { + .surf = &mt->surf, + .addr = (struct blorp_address) { + .buffer = mt->bo, + .offset = mt->offset, + .reloc_flags = is_render_target ? EXEC_OBJECT_WRITE : 0, + .mocs = brw_get_bo_mocs(devinfo, mt->bo), + }, + .aux_usage = aux_usage, }; - surf->aux_usage = aux_usage; - struct isl_surf *aux_surf = NULL; if (mt->mcs_buf) aux_surf = &mt->mcs_buf->surf;