From 075e59505804711c517a00c110421e021b4a2abd Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 18 Jan 2024 17:51:36 -0400 Subject: [PATCH] ail: port tiling routines to c++ to fix macro hell Signed-off-by: Alyssa Rosenzweig Part-of: --- src/asahi/layout/meson.build | 2 +- src/asahi/layout/{tiling.c => tiling.cc} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/asahi/layout/{tiling.c => tiling.cc} (98%) diff --git a/src/asahi/layout/meson.build b/src/asahi/layout/meson.build index 593aeec4738..5afae0019a9 100644 --- a/src/asahi/layout/meson.build +++ b/src/asahi/layout/meson.build @@ -3,7 +3,7 @@ libasahi_layout_files = files( 'layout.c', - 'tiling.c', + 'tiling.cc', ) libasahi_layout = static_library( diff --git a/src/asahi/layout/tiling.c b/src/asahi/layout/tiling.cc similarity index 98% rename from src/asahi/layout/tiling.c rename to src/asahi/layout/tiling.cc index 7fa6ceacb66..c8741f67482 100644 --- a/src/asahi/layout/tiling.c +++ b/src/asahi/layout/tiling.cc @@ -90,8 +90,8 @@ ail_space_mask(unsigned x) unsigned log2_tile_width_el = util_logbase2(tile_size.width_el); \ unsigned log2_tile_height_el = util_logbase2(tile_size.height_el); \ \ - element_t *linear = _linear; \ - element_t *tiled = _tiled; \ + element_t *linear = (element_t *)_linear; \ + element_t *tiled = (element_t *)_tiled; \ \ for (unsigned y_el = sy_el; y_el < sy_end_el; ++y_el) { \ unsigned y_rowtile = y_el >> log2_tile_height_el; \