From c284a200b934f214c3fc831b058b28d9e5629b1a Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 19 May 2023 15:35:30 -0400 Subject: [PATCH] gallium: Drop Asahi-as-a-swrast hack Now that we've dropped macOS support, these paths are deadcode. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Adam Jackson Part-of: --- src/gallium/auxiliary/target-helpers/inline_sw_helper.h | 12 ------------ src/gallium/auxiliary/target-helpers/sw_helper.h | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h index d821008..494dece 100644 --- a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h +++ b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h @@ -29,10 +29,6 @@ #include "d3d12/d3d12_public.h" #endif -#if defined(GALLIUM_ASAHI) && __APPLE__ -#include "asahi/agx_public.h" -#endif - static inline struct pipe_screen * sw_screen_create_named(struct sw_winsys *winsys, const char *driver) { @@ -66,11 +62,6 @@ sw_screen_create_named(struct sw_winsys *winsys, const char *driver) screen = d3d12_create_dxcore_screen(winsys, NULL); #endif -#if defined(GALLIUM_ASAHI) && __APPLE__ - if (screen == NULL && strcmp(driver, "asahi") == 0) - screen = agx_screen_create(0, NULL, winsys); -#endif - return screen ? debug_screen_wrap(screen) : NULL; } @@ -84,9 +75,6 @@ sw_screen_create_vk(struct sw_winsys *winsys, bool sw_vk) #if defined(GALLIUM_D3D12) (sw_vk || only_sw) ? "" : "d3d12", #endif -#if defined(GALLIUM_ASAHI) && __APPLE__ - (sw_vk || only_sw) ? "" : "asahi", -#endif #if defined(GALLIUM_LLVMPIPE) "llvmpipe", #endif diff --git a/src/gallium/auxiliary/target-helpers/sw_helper.h b/src/gallium/auxiliary/target-helpers/sw_helper.h index 12c0964..db616aa 100644 --- a/src/gallium/auxiliary/target-helpers/sw_helper.h +++ b/src/gallium/auxiliary/target-helpers/sw_helper.h @@ -20,10 +20,6 @@ #include "d3d12/d3d12_public.h" #endif -#if defined(GALLIUM_ASAHI) && __APPLE__ -#include "asahi/agx_public.h" -#endif - #ifdef GALLIUM_SOFTPIPE #include "softpipe/sp_public.h" #endif @@ -70,11 +66,6 @@ sw_screen_create_named(struct sw_winsys *winsys, const struct pipe_screen_config screen = d3d12_create_dxcore_screen(winsys, NULL); #endif -#if defined(GALLIUM_ASAHI) && __APPLE__ - if (screen == NULL && strcmp(driver, "asahi") == 0) - screen = agx_screen_create(0, NULL, winsys); -#endif - return screen; } @@ -87,9 +78,6 @@ sw_screen_create_vk(struct sw_winsys *winsys, const struct pipe_screen_config *c #if defined(GALLIUM_D3D12) (sw_vk || only_sw) ? "" : "d3d12", #endif -#if defined(GALLIUM_ASAHI) && __APPLE__ - (sw_vk || only_sw) ? "" : "asahi", -#endif #if defined(GALLIUM_LLVMPIPE) "llvmpipe", #endif -- 2.7.4