diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index bd3d6a779f3..ad35b3d3e47 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -2,112 +2,8 @@
 # SPDX-License-Identifier: MIT
 
 files_libgallium = files(
-  'cso_cache/cso_cache.c',
-  'cso_cache/cso_cache.h',
-  'cso_cache/cso_context.c',
-  'cso_cache/cso_context.h',
-  'cso_cache/cso_hash.c',
-  'cso_cache/cso_hash.h',
-  'draw/draw_cliptest_tmp.h',
-  'draw/draw_context.c',
-  'draw/draw_context.h',
-  'draw/draw_decompose_tmp.h',
-  'draw/draw_fs.c',
-  'draw/draw_fs.h',
-  'draw/draw_gs.c',
-  'draw/draw_gs.h',
-  'draw/draw_gs_tmp.h',
-  'draw/draw_mesh.c',
-  'draw/draw_mesh.h',
-  'draw/draw_mesh_prim.c',
-  'draw/draw_mesh_prim.h',
-  'draw/draw_mesh_prim_tmp.h',
-  'draw/draw_pipe_aaline.c',
-  'draw/draw_pipe_aapoint.c',
-  'draw/draw_pipe.c',
-  'draw/draw_pipe.h',
-  'draw/draw_pipe_clip.c',
-  'draw/draw_pipe_cull.c',
-  'draw/draw_pipe_flatshade.c',
-  'draw/draw_pipe_offset.c',
-  'draw/draw_pipe_pstipple.c',
-  'draw/draw_pipe_stipple.c',
-  'draw/draw_pipe_twoside.c',
-  'draw/draw_pipe_unfilled.c',
-  'draw/draw_pipe_user_cull.c',
-  'draw/draw_pipe_util.c',
-  'draw/draw_pipe_validate.c',
-  'draw/draw_pipe_vbuf.c',
-  'draw/draw_pipe_wide_line.c',
-  'draw/draw_pipe_wide_point.c',
-  'draw/draw_prim_assembler.c',
-  'draw/draw_prim_assembler.h',
-  'draw/draw_prim_assembler_tmp.h',
-  'draw/draw_private.h',
-  'draw/draw_pt.c',
-  'draw/draw_pt_decompose.h',
-  'draw/draw_pt_emit.c',
-  'draw/draw_pt_fetch.c',
-  'draw/draw_pt_fetch_shade_emit.c',
-  'draw/draw_pt_fetch_shade_pipeline.c',
-  'draw/draw_pt_mesh_pipeline.c',
-  'draw/draw_pt.h',
-  'draw/draw_pt_post_vs.c',
-  'draw/draw_pt_so_emit.c',
-  'draw/draw_pt_util.c',
-  'draw/draw_pt_vsplit.c',
-  'draw/draw_pt_vsplit_tmp.h',
-  'draw/draw_so_emit_tmp.h',
-  'draw/draw_split_tmp.h',
-  'draw/draw_tess.c',
-  'draw/draw_tess.h',
-  'draw/draw_vbuf.h',
-  'draw/draw_vertex.c',
-  'draw/draw_vertex.h',
-  'draw/draw_vertex_header.h',
-  'draw/draw_vs.c',
-  'draw/draw_vs_exec.c',
-  'draw/draw_vs.h',
-  'draw/draw_vs_variant.c',
-  'driver_ddebug/dd_context.c',
   'driver_ddebug/dd_draw.c',
-  'driver_ddebug/dd_pipe.h',
-  'driver_ddebug/dd_public.h',
-  'driver_ddebug/dd_screen.c',
   'driver_ddebug/dd_util.h',
-  'driver_noop/noop_pipe.c',
-  'driver_noop/noop_public.h',
-  'driver_noop/noop_state.c',
-  'driver_trace/tr_context.c',
-  'driver_trace/tr_context.h',
-  'driver_trace/tr_dump.c',
-  'driver_trace/tr_dump_defines.h',
-  'driver_trace/tr_dump.h',
-  'driver_trace/tr_dump_state.c',
-  'driver_trace/tr_dump_state.h',
-  'driver_trace/tr_public.h',
-  'driver_trace/tr_screen.c',
-  'driver_trace/tr_screen.h',
-  'driver_trace/tr_texture.c',
-  'driver_trace/tr_texture.h',
-  'driver_trace/tr_video.c',
-  'driver_trace/tr_video.h',
-  'hud/font.c',
-  'hud/font.h',
-  'hud/hud_context.c',
-  'hud/hud_context.h',
-  'hud/hud_cpu.c',
-  'hud/hud_nic.c',
-  'hud/hud_cpufreq.c',
-  'hud/hud_diskstat.c',
-  'hud/hud_sensors_temp.c',
-  'hud/hud_driver_query.c',
-  'hud/hud_fps.c',
-  'hud/hud_private.h',
-  'indices/u_indices.h',
-  'indices/u_indices_priv.h',
-  'indices/u_primconvert.c',
-  'indices/u_primconvert.h',
   'pipebuffer/pb_buffer_fenced.c',
   'pipebuffer/pb_buffer_fenced.h',
   'pipebuffer/pb_buffer.h',
@@ -120,54 +16,6 @@ files_libgallium = files(
   'pipebuffer/pb_cache.h',
   'pipebuffer/pb_validate.c',
   'pipebuffer/pb_validate.h',
-  'rtasm/rtasm_execmem.c',
-  'rtasm/rtasm_execmem.h',
-  'rtasm/rtasm_x86sse.c',
-  'rtasm/rtasm_x86sse.h',
-  'tgsi/tgsi_aa_point.c',
-  'tgsi/tgsi_aa_point.h',
-  'tgsi/tgsi_build.c',
-  'tgsi/tgsi_build.h',
-  'tgsi/tgsi_dump.c',
-  'tgsi/tgsi_dump.h',
-  'tgsi/tgsi_dynamic_indexing.c',
-  'tgsi/tgsi_exec.c',
-  'tgsi/tgsi_exec.h',
-  'tgsi/tgsi_from_mesa.c',
-  'tgsi/tgsi_from_mesa.h',
-  'tgsi/tgsi_info.c',
-  'tgsi/tgsi_info.h',
-  'tgsi/tgsi_info_opcodes.h',
-  'tgsi/tgsi_iterate.c',
-  'tgsi/tgsi_iterate.h',
-  'tgsi/tgsi_opcode_tmp.h',
-  'tgsi/tgsi_parse.c',
-  'tgsi/tgsi_parse.h',
-  'tgsi/tgsi_point_sprite.c',
-  'tgsi/tgsi_point_sprite.h',
-  'tgsi/tgsi_sanity.c',
-  'tgsi/tgsi_sanity.h',
-  'tgsi/tgsi_scan.c',
-  'tgsi/tgsi_scan.h',
-  'tgsi/tgsi_strings.c',
-  'tgsi/tgsi_strings.h',
-  'tgsi/tgsi_text.c',
-  'tgsi/tgsi_text.h',
-  'tgsi/tgsi_transform.c',
-  'tgsi/tgsi_transform.h',
-  'tgsi/tgsi_two_side.c',
-  'tgsi/tgsi_two_side.h',
-  'tgsi/tgsi_ureg.c',
-  'tgsi/tgsi_ureg.h',
-  'tgsi/tgsi_util.c',
-  'tgsi/tgsi_util.h',
-  'tgsi/tgsi_vpos.c',
-  'translate/translate.c',
-  'translate/translate.h',
-  'translate/translate_cache.c',
-  'translate/translate_cache.h',
-  'translate/translate_generic.c',
-  'translate/translate_sse.c',
   'util/u_async_debug.h',
   'util/u_async_debug.c',
   'util/u_bitcast.h',
@@ -227,7 +75,6 @@ files_libgallium = files(
   'util/u_sampler.h',
   'util/u_screen.c',
   'util/u_screen.h',
-  'util/u_simple_shaders.c',
   'util/u_simple_shaders.h',
   'util/u_split_draw.c',
   'util/u_split_draw.h',
@@ -237,7 +84,6 @@ files_libgallium = files(
   'util/u_suballoc.h',
   'util/u_surface.c',
   'util/u_surface.h',
-  'util/u_tests.c',
   'util/u_tests.h',
   'util/u_texture.c',
   'util/u_texture.h',
@@ -260,14 +106,173 @@ files_libgallium = files(
   'util/u_vertex_state_cache.h',
   'util/u_video.h',
   'util/u_viewport.h',
-  'nir/tgsi_to_nir.c',
-  'nir/tgsi_to_nir.h',
-  'nir/nir_to_tgsi.c',
-  'nir/nir_to_tgsi.h',
-  'nir/nir_draw_helpers.c',
-  'nir/nir_draw_helpers.h',
 )
 
+if with_gfx_compute
+  files_libgallium += files(
+    'cso_cache/cso_cache.c',
+    'cso_cache/cso_cache.h',
+    'cso_cache/cso_context.c',
+    'cso_cache/cso_context.h',
+    'cso_cache/cso_hash.c',
+    'cso_cache/cso_hash.h',
+    'draw/draw_cliptest_tmp.h',
+    'draw/draw_context.c',
+    'draw/draw_context.h',
+    'draw/draw_decompose_tmp.h',
+    'draw/draw_fs.c',
+    'draw/draw_fs.h',
+    'draw/draw_gs.c',
+    'draw/draw_gs.h',
+    'draw/draw_gs_tmp.h',
+    'draw/draw_mesh.c',
+    'draw/draw_mesh.h',
+    'draw/draw_mesh_prim.c',
+    'draw/draw_mesh_prim.h',
+    'draw/draw_mesh_prim_tmp.h',
+    'draw/draw_pipe_aaline.c',
+    'draw/draw_pipe_aapoint.c',
+    'draw/draw_pipe.c',
+    'draw/draw_pipe.h',
+    'draw/draw_pipe_clip.c',
+    'draw/draw_pipe_cull.c',
+    'draw/draw_pipe_flatshade.c',
+    'draw/draw_pipe_offset.c',
+    'draw/draw_pipe_pstipple.c',
+    'draw/draw_pipe_stipple.c',
+    'draw/draw_pipe_twoside.c',
+    'draw/draw_pipe_unfilled.c',
+    'draw/draw_pipe_user_cull.c',
+    'draw/draw_pipe_util.c',
+    'draw/draw_pipe_validate.c',
+    'draw/draw_pipe_vbuf.c',
+    'draw/draw_pipe_wide_line.c',
+    'draw/draw_pipe_wide_point.c',
+    'draw/draw_prim_assembler.c',
+    'draw/draw_prim_assembler.h',
+    'draw/draw_prim_assembler_tmp.h',
+    'draw/draw_private.h',
+    'draw/draw_pt.c',
+    'draw/draw_pt_decompose.h',
+    'draw/draw_pt_emit.c',
+    'draw/draw_pt_fetch.c',
+    'draw/draw_pt_fetch_shade_emit.c',
+    'draw/draw_pt_fetch_shade_pipeline.c',
+    'draw/draw_pt_mesh_pipeline.c',
+    'draw/draw_pt.h',
+    'draw/draw_pt_post_vs.c',
+    'draw/draw_pt_so_emit.c',
+    'draw/draw_pt_util.c',
+    'draw/draw_pt_vsplit.c',
+    'draw/draw_pt_vsplit_tmp.h',
+    'draw/draw_so_emit_tmp.h',
+    'draw/draw_split_tmp.h',
+    'draw/draw_tess.c',
+    'draw/draw_tess.h',
+    'draw/draw_vbuf.h',
+    'draw/draw_vertex.c',
+    'draw/draw_vertex.h',
+    'draw/draw_vertex_header.h',
+    'draw/draw_vs.c',
+    'draw/draw_vs_exec.c',
+    'draw/draw_vs.h',
+    'draw/draw_vs_variant.c',
+    'driver_ddebug/dd_context.c',
+    'driver_ddebug/dd_pipe.h',
+    'driver_ddebug/dd_public.h',
+    'driver_ddebug/dd_screen.c',
+    'driver_noop/noop_pipe.c',
+    'driver_noop/noop_public.h',
+    'driver_noop/noop_state.c',
+    'driver_trace/tr_context.c',
+    'driver_trace/tr_context.h',
+    'driver_trace/tr_dump.c',
+    'driver_trace/tr_dump_defines.h',
+    'driver_trace/tr_dump.h',
+    'driver_trace/tr_dump_state.c',
+    'driver_trace/tr_dump_state.h',
+    'driver_trace/tr_public.h',
+    'driver_trace/tr_screen.c',
+    'driver_trace/tr_screen.h',
+    'driver_trace/tr_texture.c',
+    'driver_trace/tr_texture.h',
+    'driver_trace/tr_video.c',
+    'driver_trace/tr_video.h',
+    'hud/font.c',
+    'hud/font.h',
+    'hud/hud_context.c',
+    'hud/hud_context.h',
+    'hud/hud_cpu.c',
+    'hud/hud_nic.c',
+    'hud/hud_cpufreq.c',
+    'hud/hud_diskstat.c',
+    'hud/hud_sensors_temp.c',
+    'hud/hud_driver_query.c',
+    'hud/hud_fps.c',
+    'hud/hud_private.h',
+    'indices/u_indices.h',
+    'indices/u_indices_priv.h',
+    'indices/u_primconvert.c',
+    'indices/u_primconvert.h',
+    'rtasm/rtasm_execmem.c',
+    'rtasm/rtasm_execmem.h',
+    'rtasm/rtasm_x86sse.c',
+    'rtasm/rtasm_x86sse.h',
+    'tgsi/tgsi_aa_point.c',
+    'tgsi/tgsi_aa_point.h',
+    'tgsi/tgsi_build.c',
+    'tgsi/tgsi_build.h',
+    'tgsi/tgsi_dump.c',
+    'tgsi/tgsi_dump.h',
+    'tgsi/tgsi_dynamic_indexing.c',
+    'tgsi/tgsi_exec.c',
+    'tgsi/tgsi_exec.h',
+    'tgsi/tgsi_from_mesa.c',
+    'tgsi/tgsi_from_mesa.h',
+    'tgsi/tgsi_info.c',
+    'tgsi/tgsi_info.h',
+    'tgsi/tgsi_info_opcodes.h',
+    'tgsi/tgsi_iterate.c',
+    'tgsi/tgsi_iterate.h',
+    'tgsi/tgsi_opcode_tmp.h',
+    'tgsi/tgsi_parse.c',
+    'tgsi/tgsi_parse.h',
+    'tgsi/tgsi_point_sprite.c',
+    'tgsi/tgsi_point_sprite.h',
+    'tgsi/tgsi_sanity.c',
+    'tgsi/tgsi_sanity.h',
+    'tgsi/tgsi_scan.c',
+    'tgsi/tgsi_scan.h',
+    'tgsi/tgsi_strings.c',
+    'tgsi/tgsi_strings.h',
+    'tgsi/tgsi_text.c',
+    'tgsi/tgsi_text.h',
+    'tgsi/tgsi_transform.c',
+    'tgsi/tgsi_transform.h',
+    'tgsi/tgsi_two_side.c',
+    'tgsi/tgsi_two_side.h',
+    'tgsi/tgsi_ureg.c',
+    'tgsi/tgsi_ureg.h',
+    'tgsi/tgsi_util.c',
+    'tgsi/tgsi_util.h',
+    'tgsi/tgsi_vpos.c',
+    'translate/translate.c',
+    'translate/translate.h',
+    'translate/translate_cache.c',
+    'translate/translate_cache.h',
+    'translate/translate_generic.c',
+    'translate/translate_sse.c',
+    'nir/tgsi_to_nir.c',
+    'nir/tgsi_to_nir.h',
+    'nir/nir_to_tgsi.c',
+    'nir/nir_to_tgsi.h',
+    'nir/nir_draw_helpers.c',
+    'nir/nir_draw_helpers.h',
+    'util/u_simple_shaders.c',
+    'util/u_tests.c',
+  )
+endif
+
 if dep_libdrm.found()
   files_libgallium += files(
     'renderonly/renderonly.c',
diff --git a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
index 4710803ba46..45a020a15a7 100644
--- a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
@@ -28,13 +28,14 @@ extern "C" {
 static inline struct pipe_screen *
 debug_screen_wrap(struct pipe_screen *screen)
 {
+#if HAVE_GFX_COMPUTE
    screen = ddebug_screen_create(screen);
    screen = trace_screen_create(screen);
    screen = noop_screen_create(screen);
 
    if (debug_get_bool_option("GALLIUM_TESTS", false))
       util_run_tests(screen);
-
+#endif
    return screen;
 }
 
diff --git a/src/gallium/auxiliary/util/u_threaded_context.c b/src/gallium/auxiliary/util/u_threaded_context.c
index 1640d659fae..659a4f7b9c5 100644
--- a/src/gallium/auxiliary/util/u_threaded_context.c
+++ b/src/gallium/auxiliary/util/u_threaded_context.c
@@ -5495,6 +5495,10 @@ threaded_context_create(struct pipe_context *pipe,
    if (!pipe)
       return NULL;
 
+#ifndef HAVE_GFX_COMPUTE
+   return pipe;
+#endif
+
    if (!debug_get_bool_option("GALLIUM_THREAD", true))
       return pipe;