From 0c0ff57c619c065efd446c39aafa82361296e365 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 11 Apr 2022 10:41:22 -0400 Subject: [PATCH] aux/trace: clean up some zink+lavapipe tracing awfulness now that it's easier to determine whether zink is being used (mostly), this whole thing can be simplified Reviewed-by: Yonggang Luo Reviewed-by: Dave Airlie Part-of: --- src/gallium/auxiliary/driver_trace/tr_screen.c | 3 +-- src/gallium/auxiliary/meson.build | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/gallium/auxiliary/driver_trace/tr_screen.c b/src/gallium/auxiliary/driver_trace/tr_screen.c index 7a9ec99..c89e25c 100644 --- a/src/gallium/auxiliary/driver_trace/tr_screen.c +++ b/src/gallium/auxiliary/driver_trace/tr_screen.c @@ -1264,7 +1264,6 @@ trace_screen_create(struct pipe_screen *screen) { struct trace_screen *tr_scr; -#ifdef ZINK_WITH_SWRAST_VK /* if zink+lavapipe is enabled, ensure that only one driver is traced */ const char *driver = debug_get_option("MESA_LOADER_DRIVER_OVERRIDE", NULL); if (driver && !strcmp(driver, "zink")) { @@ -1280,7 +1279,7 @@ trace_screen_create(struct pipe_screen *screen) return screen; } } -#endif + if (!trace_enabled()) goto error1; diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index d6cb65e..1a01391 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -515,9 +515,6 @@ idep_u_tracepoints = declare_dependency( ) libgallium_extra_c_args = [] -if with_swrast_vk and with_gallium_zink - libgallium_extra_c_args += '-DZINK_WITH_SWRAST_VK' -endif libgallium = static_library( 'gallium', [files_libgallium], -- 2.7.4