From 8960903c90e65c4d824e4ec247e5135d6909caa1 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 9 Apr 2018 22:45:43 -0700 Subject: [PATCH] i965: Remove brw_bo_alloc_tiled_2d from intel_detect_swizzling. I'd like to drop this pre-isl function. This drops one of the two uses. Reviewed-by: Iago Toral Quiroga --- src/mesa/drivers/dri/i965/intel_screen.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 29cb7ad57d7..7f3c82fab8d 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1828,24 +1828,18 @@ intel_init_bufmgr(struct intel_screen *screen) static bool intel_detect_swizzling(struct intel_screen *screen) { - struct brw_bo *buffer; - unsigned flags = 0; - uint32_t aligned_pitch; uint32_t tiling = I915_TILING_X; uint32_t swizzle_mode = 0; - - buffer = brw_bo_alloc_tiled_2d(screen->bufmgr, "swizzle test", - 64, 64, 4, tiling, &aligned_pitch, flags); + struct brw_bo *buffer = + brw_bo_alloc_tiled(screen->bufmgr, "swizzle test", 32768, + tiling, 512, 0); if (buffer == NULL) return false; brw_bo_get_tiling(buffer, &tiling, &swizzle_mode); brw_bo_unreference(buffer); - if (swizzle_mode == I915_BIT_6_SWIZZLE_NONE) - return false; - else - return true; + return swizzle_mode != I915_BIT_6_SWIZZLE_NONE; } static int -- 2.30.2