diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2022-04-11 10:41:22 -0400 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-04-13 00:14:57 +0000 |
| commit | 0c0ff57c619c065efd446c39aafa82361296e365 (patch) | |
| tree | 8c436e2a00ed90624bcd9298c859eb4f663208ed | |
| parent | d5ff82df38f3aa4dacc3bdf5cc802916c62fdeaa (diff) | |
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 <luoyonggang@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15857>
| -rw-r--r-- | src/gallium/auxiliary/driver_trace/tr_screen.c | 3 | ||||
| -rw-r--r-- | src/gallium/auxiliary/meson.build | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/driver_trace/tr_screen.c b/src/gallium/auxiliary/driver_trace/tr_screen.c index 7a9ec99d17f..c89e25c210b 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 d6cb65e2b28..1a01391d197 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], |