diff options
| author | Jason Ekstrand <[email protected]> | 2017-05-16 09:28:31 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-05-26 07:58:01 -0700 |
| commit | 8bce7bda45f6f46197e4851b83afd73c3198111c (patch) | |
| tree | 2d28aebddcb300204504a2a22b598fe8aeff5184 | |
| parent | 110061afa214fbefb97ed5efb3bbe277d0354f67 (diff) | |
intel/blorp: Make convert_to_single_slice available outside blorp_blit
Reviewed-by: Topi Pohjolainen <[email protected]>
| -rw-r--r-- | src/intel/blorp/blorp_blit.c | 16 | ||||
| -rw-r--r-- | src/intel/blorp/blorp_priv.h | 3 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c index 75fc3f5080b..8408ebc5081 100644 --- a/src/intel/blorp/blorp_blit.c +++ b/src/intel/blorp/blorp_blit.c @@ -1378,9 +1378,9 @@ surf_get_intratile_offset_px(struct brw_blorp_surface_info *info, } } -static void -surf_convert_to_single_slice(const struct isl_device *isl_dev, - struct brw_blorp_surface_info *info) +void +blorp_surf_convert_to_single_slice(const struct isl_device *isl_dev, + struct brw_blorp_surface_info *info) { bool ok UNUSED; @@ -1453,7 +1453,7 @@ surf_fake_interleaved_msaa(const struct isl_device *isl_dev, assert(info->surf.msaa_layout == ISL_MSAA_LAYOUT_INTERLEAVED); /* First, we need to convert it to a simple 1-level 1-layer 2-D surface */ - surf_convert_to_single_slice(isl_dev, info); + blorp_surf_convert_to_single_slice(isl_dev, info); info->surf.logical_level0_px = info->surf.phys_level0_sa; info->surf.samples = 1; @@ -1467,7 +1467,7 @@ surf_retile_w_to_y(const struct isl_device *isl_dev, assert(info->surf.tiling == ISL_TILING_W); /* First, we need to convert it to a simple 1-level 1-layer 2-D surface */ - surf_convert_to_single_slice(isl_dev, info); + blorp_surf_convert_to_single_slice(isl_dev, info); /* On gen7+, we don't have interleaved multisampling for color render * targets so we have to fake it. @@ -1558,7 +1558,7 @@ surf_fake_rgb_with_red(const struct isl_device *isl_dev, struct brw_blorp_surface_info *info, uint32_t *x, uint32_t *width) { - surf_convert_to_single_slice(isl_dev, info); + blorp_surf_convert_to_single_slice(isl_dev, info); info->surf.logical_level0_px.width *= 3; info->surf.phys_level0_sa.width *= 3; @@ -1890,7 +1890,7 @@ shrink_surface_params(const struct isl_device *dev, struct isl_extent2d px_size_sa; int adjust; - surf_convert_to_single_slice(dev, info); + blorp_surf_convert_to_single_slice(dev, info); px_size_sa = get_px_size_sa(&info->surf); @@ -2324,7 +2324,7 @@ surf_convert_to_uncompressed(const struct isl_device *isl_dev, * ones with the same bpb) and divide x, y, width, and height by the * block size. */ - surf_convert_to_single_slice(isl_dev, info); + blorp_surf_convert_to_single_slice(isl_dev, info); if (width || height) { #ifndef NDEBUG diff --git a/src/intel/blorp/blorp_priv.h b/src/intel/blorp/blorp_priv.h index 39da5af5be8..5f3362a1c6d 100644 --- a/src/intel/blorp/blorp_priv.h +++ b/src/intel/blorp/blorp_priv.h @@ -71,6 +71,9 @@ brw_blorp_surface_info_init(struct blorp_context *blorp, const struct blorp_surf *surf, unsigned int level, unsigned int layer, enum isl_format format, bool is_render_target); +void +blorp_surf_convert_to_single_slice(const struct isl_device *isl_dev, + struct brw_blorp_surface_info *info); struct brw_blorp_coord_transform |