From 56746d04d59f711d5ace0b86f2b2da96bd337ea1 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 27 Jun 2016 18:34:02 -0700 Subject: [PATCH] i965/blorp: Remove unused fields from blorp_surface_info The only reason why we need layer or level is that we need the z-offset for 3-D surfaces. Let's just have the one field for that. Reviewed-by: Topi Pohjolainen --- src/mesa/drivers/dri/i965/brw_blorp.c | 3 --- src/mesa/drivers/dri/i965/brw_blorp.h | 16 ---------------- 2 files changed, 19 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c index f66ed4670c5..5d2d1bde06d 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.c +++ b/src/mesa/drivers/dri/i965/brw_blorp.c @@ -168,9 +168,6 @@ brw_blorp_surface_info_init(struct brw_context *brw, info->z_offset = 0; } - info->level = level; - info->layer = layer; - if (format == MESA_FORMAT_NONE) format = mt->format; diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/i965/brw_blorp.h index 706d53e55c6..076d26dba1a 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.h +++ b/src/mesa/drivers/dri/i965/brw_blorp.h @@ -81,22 +81,6 @@ struct brw_blorp_surface_info /* Z offset into a 3-D texture or slice of a 2-D array texture. */ uint32_t z_offset; - /** - * The miplevel to use. - */ - uint32_t level; - - /** - * The 2D layer within the miplevel. Combined, level and layer define the - * 2D miptree slice to use. - * - * Note: if mt is a 2D multisample array texture on Gen7+ using - * INTEL_MSAA_LAYOUT_UMS or INTEL_MSAA_LAYOUT_CMS, layer is the physical - * layer holding sample 0. So, for example, if mt->num_samples == 4, then - * logical layer n corresponds to layer == 4*n. - */ - uint32_t layer; - uint32_t bo_offset; uint32_t tile_x_sa, tile_y_sa; }; -- 2.30.2