We have a handy little function is ISL that does exactly the same thing.
---
src/mesa/drivers/dri/i965/brw_blorp.c | 34 +++++-----------------------------
src/mesa/drivers/dri/i965/brw_blorp.h | 5 -----
2 files changed, 5 insertions(+), 34 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c
b/src/mesa/drivers/dri/i965/brw_blorp.c
index c934913..353cc78 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.c
+++ b/src/mesa/drivers/dri/i965/brw_blorp.c
@@ -120,34 +120,6 @@ brw_blorp_surface_info_init(struct brw_context *brw,
}
-/**
- * Split x_offset and y_offset into a base offset (in bytes) and a remaining
- * x/y offset (in pixels). Note: we can't do this by calling
- * intel_renderbuffer_tile_offsets(), because the offsets may have been
- * adjusted to account for Y vs. W tiling differences. So we compute it
- * directly from the adjusted offsets.
- */
-uint32_t
-brw_blorp_compute_tile_offsets(const struct brw_blorp_surface_info *info,
- uint32_t *tile_x, uint32_t *tile_y)
-{
- uint32_t mask_x, mask_y;
- uint32_t tiling = info->mt->tiling;
- if (info->map_stencil_as_y_tiled)
- tiling = I915_TILING_Y;
-
- intel_get_tile_masks(tiling, info->mt->tr_mode, info->mt->cpp,
- &mask_x, &mask_y);
-
- *tile_x = info->x_offset & mask_x;
- *tile_y = info->y_offset & mask_y;
-
- return intel_miptree_get_aligned_offset(info->mt, info->x_offset & ~mask_x,
- info->y_offset & ~mask_y,
- info->map_stencil_as_y_tiled);
-}
-
-
void
brw_blorp_params_init(struct brw_blorp_params *params)
{
@@ -365,7 +337,11 @@ brw_blorp_emit_surface_state(struct brw_context *brw,
};
uint32_t offset, tile_x, tile_y;
- offset = brw_blorp_compute_tile_offsets(surface, &tile_x, &tile_y);
+ isl_tiling_get_intratile_offset_el(&brw->isl_dev, surf.tiling,
+ isl_format_get_layout(view.format)->bs,
+ surf.row_pitch,
+ surface->x_offset, surface->y_offset,
+ &offset, &tile_x, &tile_y);
uint32_t surf_offset;
uint32_t *dw = brw_state_batch(brw, AUB_TRACE_SURFACE_STATE,
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h
b/src/mesa/drivers/dri/i965/brw_blorp.h
index 0c5b7de..7611a8f 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.h
+++ b/src/mesa/drivers/dri/i965/brw_blorp.h
@@ -172,11 +172,6 @@ brw_blorp_surface_info_init(struct brw_context *brw,
unsigned int level, unsigned int layer,
mesa_format format, bool is_render_target);
-uint32_t
-brw_blorp_compute_tile_offsets(const struct brw_blorp_surface_info *info,
- uint32_t *tile_x, uint32_t *tile_y);
-
-
struct brw_blorp_coord_transform
{
--
2.5.0.400.gff86faf
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
