From c3b5c2ca19717b139c7de25b98827ec3efd4811c Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 12 Jun 2017 18:57:45 -0700 Subject: [PATCH] i965/screen: Drop get_tiled_height It's no longer used. Reviewed-by: Topi Pohjolainen Reviewed-by: Chad Versace --- src/mesa/drivers/dri/i965/intel_screen.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index d2620dc9edf..6d0588e9cfa 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -299,14 +299,13 @@ static const struct { uint32_t tiling; uint64_t modifier; unsigned since_gen; - unsigned height_align; } tiling_modifier_map[] = { { .tiling = I915_TILING_NONE, .modifier = DRM_FORMAT_MOD_LINEAR, - .since_gen = 1, .height_align = 1 }, + .since_gen = 1 }, { .tiling = I915_TILING_X, .modifier = I915_FORMAT_MOD_X_TILED, - .since_gen = 1, .height_align = 8 }, + .since_gen = 1 }, { .tiling = I915_TILING_Y, .modifier = I915_FORMAT_MOD_Y_TILED, - .since_gen = 6, .height_align = 32 }, + .since_gen = 6 }, }; static bool @@ -335,19 +334,6 @@ tiling_to_modifier(uint32_t tiling) unreachable("tiling_to_modifier received unknown tiling mode"); } -static unsigned -get_tiled_height(uint64_t modifier, unsigned height) -{ - int i; - - for (i = 0; i < ARRAY_SIZE(tiling_modifier_map); i++) { - if (tiling_modifier_map[i].modifier == modifier) - return ALIGN(height, tiling_modifier_map[i].height_align); - } - - unreachable("get_tiled_height received unknown tiling mode"); -} - static void intel_image_warn_if_unaligned(__DRIimage *image, const char *func) { -- 2.30.2