diff --git a/src/freedreno/fdl/fd5_layout.c b/src/freedreno/fdl/fd5_layout.c index 435e2841c43..d1ac960c306 100644 --- a/src/freedreno/fdl/fd5_layout.c +++ b/src/freedreno/fdl/fd5_layout.c @@ -11,28 +11,6 @@ #include "freedreno_layout.h" -void -fdl5_layout(struct fdl_layout *layout, enum pipe_format format, - uint32_t nr_samples, uint32_t width0, uint32_t height0, - uint32_t depth0, uint32_t mip_levels, uint32_t array_size, - bool is_3d) -{ - struct fdl_image_params params = { - .format = format, - .nr_samples = nr_samples, - .width0 = width0, - .height0 = height0, - .depth0 = depth0, - .mip_levels = mip_levels, - .array_size = array_size, - .tile_mode = layout->tile_mode, - .ubwc = layout->ubwc, - .is_3d = is_3d, - }; - - return fdl5_layout_image(layout, ¶ms); -} - void fdl5_layout_image(struct fdl_layout *layout, const struct fdl_image_params *params) { diff --git a/src/freedreno/fdl/fd6_layout.c b/src/freedreno/fdl/fd6_layout.c index 49c8b92db73..d5464ee624a 100644 --- a/src/freedreno/fdl/fd6_layout.c +++ b/src/freedreno/fdl/fd6_layout.c @@ -111,32 +111,6 @@ fdl6_tile_alignment(struct fdl_layout *layout, uint32_t *heightalign) /* NOTE: good way to test this is: (for example) * piglit/bin/texelFetch fs sampler3D 100x100x8 */ -bool -fdl6_layout(struct fdl_layout *layout, const struct fd_dev_info *info, - enum pipe_format format, uint32_t nr_samples, uint32_t width0, - uint32_t height0, uint32_t depth0, uint32_t mip_levels, - uint32_t array_size, bool is_3d, bool is_mutable, - bool force_ubwc, - struct fdl_explicit_layout *explicit_layout) -{ - struct fdl_image_params params = { - .format = format, - .nr_samples = nr_samples, - .width0 = width0, - .height0 = height0, - .depth0 = depth0, - .mip_levels = mip_levels, - .array_size = array_size, - .tile_mode = layout->tile_mode, - .ubwc = layout->ubwc, - .force_ubwc = force_ubwc, - .is_3d = is_3d, - .is_mutable = is_mutable, - }; - - return fdl6_layout_image(layout, info, ¶ms, explicit_layout); -} - bool fdl6_layout_image(struct fdl_layout *layout, const struct fd_dev_info *info, const struct fdl_image_params *params, diff --git a/src/freedreno/fdl/freedreno_layout.h b/src/freedreno/fdl/freedreno_layout.h index 8ddb49f4738..7b63372095d 100644 --- a/src/freedreno/fdl/freedreno_layout.h +++ b/src/freedreno/fdl/freedreno_layout.h @@ -268,18 +268,6 @@ bool fdl6_layout_image(struct fdl_layout *layout, const struct fd_dev_info *info const struct fdl_image_params *params, const struct fdl_explicit_layout *explicit_layout); -void fdl5_layout(struct fdl_layout *layout, enum pipe_format format, - uint32_t nr_samples, uint32_t width0, uint32_t height0, - uint32_t depth0, uint32_t mip_levels, uint32_t array_size, - bool is_3d); - -bool fdl6_layout(struct fdl_layout *layout, const struct fd_dev_info *info, - enum pipe_format format, uint32_t nr_samples, uint32_t width0, - uint32_t height0, uint32_t depth0, uint32_t mip_levels, - uint32_t array_size, bool is_3d, bool is_mutable, - bool force_ubwc, - struct fdl_explicit_layout *plane_layout); - static inline void fdl_set_pitchalign(struct fdl_layout *layout, unsigned pitchalign) {