From 538e10f3ea371c9db94c4de3daa85d1719bbdc73 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 22 Apr 2013 12:10:27 -0700 Subject: [PATCH] build: Remove HAVE_PIPE_LOADER_SW. It guarded the function prototype of pipe_loader_sw_probe, whose use (in pipe_loader.c) and definition (in pipe_loader_sw.c) were not guarded. Both are built into libpipe_loader.la if HAVE_LOADER_GALLIUM, which is enable_gallium_loader in configure.ac. Tested-by: Tom Stellard Tested-by: Aaron Watry Reviewed-by: Brian Paul --- configure.ac | 1 - src/gallium/auxiliary/pipe-loader/pipe_loader.h | 4 ---- 2 files changed, 5 deletions(-) diff --git a/configure.ac b/configure.ac index 6567f36f0de..0cdde618dd0 100644 --- a/configure.ac +++ b/configure.ac @@ -1913,7 +1913,6 @@ AM_CONDITIONAL(NEED_GALLIUM_LLVMPIPE_DRIVER, test "x$HAVE_GALLIUM_I915" = xyes - if test "x$enable_gallium_loader" = xyes; then GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/null" - GALLIUM_PIPE_LOADER_DEFINES="-DHAVE_PIPE_LOADER_SW" GALLIUM_PIPE_LOADER_LIBS="\$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la" if test "x$NEED_WINSYS_XLIB" = xyes; then diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.h b/src/gallium/auxiliary/pipe-loader/pipe_loader.h index 21a609fce7e..444bdf1751f 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader.h +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.h @@ -99,8 +99,6 @@ pipe_loader_create_screen(struct pipe_loader_device *dev, void pipe_loader_release(struct pipe_loader_device **devs, int ndev); -#ifdef HAVE_PIPE_LOADER_SW - /** * Get a list of known software devices. * @@ -111,8 +109,6 @@ pipe_loader_release(struct pipe_loader_device **devs, int ndev); int pipe_loader_sw_probe(struct pipe_loader_device **devs, int ndev); -#endif - #ifdef HAVE_PIPE_LOADER_DRM /** -- 2.30.2