Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> --- src/intel/isl/isl.c | 45 ++++++++++++++++++++++++++++++++------------- src/intel/isl/isl.h | 20 ++++++++++++++++++++ 2 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index 359293cfcb2..ffcede1ef61 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -2163,20 +2163,13 @@ isl_surf_get_image_offset_B_tile_sa(const struct isl_surf *surf, { const struct isl_format_layout *fmtl = isl_format_get_layout(surf->format); - uint32_t total_x_offset_el, total_y_offset_el; - isl_surf_get_image_offset_el(surf, level, logical_array_layer, - logical_z_offset_px, - &total_x_offset_el, - &total_y_offset_el); - uint32_t x_offset_el, y_offset_el; - isl_tiling_get_intratile_offset_el(surf->tiling, fmtl->bpb, - surf->row_pitch_B, - total_x_offset_el, - total_y_offset_el, - offset_B, - &x_offset_el, - &y_offset_el); + isl_surf_get_image_offset_B_tile_el(surf, level, + logical_array_layer, + logical_z_offset_px, + offset_B, + &x_offset_el, + &y_offset_el); if (x_offset_sa) { *x_offset_sa = x_offset_el * fmtl->bw; @@ -2191,6 +2184,32 @@ isl_surf_get_image_offset_B_tile_sa(const struct isl_surf *surf, } } +void +isl_surf_get_image_offset_B_tile_el(const struct isl_surf *surf, + uint32_t level, + uint32_t logical_array_layer, + uint32_t logical_z_offset_px, + uint32_t *offset_B, + uint32_t *x_offset_el, + uint32_t *y_offset_el) +{ + const struct isl_format_layout *fmtl = isl_format_get_layout(surf->format); + + uint32_t total_x_offset_el, total_y_offset_el; + isl_surf_get_image_offset_el(surf, level, logical_array_layer, + logical_z_offset_px, + &total_x_offset_el, + &total_y_offset_el); + + isl_tiling_get_intratile_offset_el(surf->tiling, fmtl->bpb, + surf->row_pitch_B, + total_x_offset_el, + total_y_offset_el, + offset_B, + x_offset_el, + y_offset_el); +} + void isl_surf_get_image_surf(const struct isl_device *dev, const struct isl_surf *surf, diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h index d53c69adbde..df3f2f75d63 100644 --- a/src/intel/isl/isl.h +++ b/src/intel/isl/isl.h @@ -1983,6 +1983,26 @@ isl_surf_get_image_offset_B_tile_sa(const struct isl_surf *surf, uint32_t *x_offset_sa, uint32_t *y_offset_sa); +/** + * Calculate the offset, in bytes and intratile surface elements, to a + * subimage in the surface. + * + * This is equivalent to calling isl_surf_get_image_offset_el, passing the + * result to isl_tiling_get_intratile_offset_el. + * + * @invariant level < surface levels + * @invariant logical_array_layer < logical array length of surface + * @invariant logical_z_offset_px < logical depth of surface at level + */ +void +isl_surf_get_image_offset_B_tile_el(const struct isl_surf *surf, + uint32_t level, + uint32_t logical_array_layer, + uint32_t logical_z_offset_px, + uint32_t *offset_B, + uint32_t *x_offset_el, + uint32_t *y_offset_el); + /** * Create an isl_surf that represents a particular subimage in the surface. * -- 2.19.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev