From b80c8ebc4587a15c823b5223419eadb0ca51cdd1 Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Thu, 3 Mar 2016 15:40:13 -0800 Subject: isl: Get rid of isl_surf_fill_state_info::level0_extent_px This field is no longer needed. Signed-off-by: Nanley Chery Reviewed-by: Jason Ekstrand --- src/intel/isl/isl.h | 9 --------- src/intel/isl/isl_surface_state.c | 8 ++++---- 2 files changed, 4 insertions(+), 13 deletions(-) (limited to 'src/intel/isl') diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h index 5a48bce6c64..248a94d64eb 100644 --- a/src/intel/isl/isl.h +++ b/src/intel/isl/isl.h @@ -772,15 +772,6 @@ struct isl_surf_fill_state_info { */ uint32_t mocs; - /** - * This allows the caller to over-ride the dimensions of the surface. - * This is used at the moment for compressed surfaces to let us hack - * around the fact that we can't actually render to them. - * - * FIXME: We really need to get rid of this. It's a lie. - */ - struct isl_extent4d level0_extent_px; - /** * The clear color for this surface * diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c index 1607aa6233d..fe8f07cfe30 100644 --- a/src/intel/isl/isl_surface_state.c +++ b/src/intel/isl/isl_surface_state.c @@ -257,8 +257,8 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state, .SurfaceQPitch = get_qpitch(info->surf) >> 2, #endif - .Width = info->level0_extent_px.width - 1, - .Height = info->level0_extent_px.height - 1, + .Width = info->surf->logical_level0_px.width - 1, + .Height = info->surf->logical_level0_px.height - 1, .Depth = 0, /* TEMPLATE */ .SurfacePitch = info->surf->row_pitch - 1, @@ -338,7 +338,7 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state, * If the volume texture is MIP-mapped, this field specifies the * depth of the base MIP level. */ - s.Depth = info->level0_extent_px.depth - 1; + s.Depth = info->surf->logical_level0_px.depth - 1; /* From the Broadwell PRM >> RENDER_SURFACE_STATE::RenderTargetViewExtent: * @@ -346,7 +346,7 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state, * indicates the extent of the accessible 'R' coordinates minus 1 on * the LOD currently being rendered to. */ - s.RenderTargetViewExtent = info->level0_extent_px.depth - 1; + s.RenderTargetViewExtent = info->surf->logical_level0_px.depth - 1; break; default: unreachable(!"bad SurfaceType"); -- cgit v1.2.3