From f17d1513ac1912d8cc090bba9206a08ff991f64f Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 16 Apr 2010 10:20:32 -0600 Subject: [PATCH] gallivm/llvmpipe: move lp_bld_depth.[ch] to llvmpipe/ directory This is specific to the llvmpipe driver and not re-usable. --- src/gallium/auxiliary/Makefile | 1 - src/gallium/auxiliary/SConscript | 1 - src/gallium/drivers/llvmpipe/Makefile | 1 + src/gallium/drivers/llvmpipe/SConscript | 1 + .../gallivm => drivers/llvmpipe}/lp_bld_depth.c | 15 ++++++++------- .../gallivm => drivers/llvmpipe}/lp_bld_depth.h | 0 6 files changed, 10 insertions(+), 9 deletions(-) rename src/gallium/{auxiliary/gallivm => drivers/llvmpipe}/lp_bld_depth.c (98%) rename src/gallium/{auxiliary/gallivm => drivers/llvmpipe}/lp_bld_depth.h (100%) diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile index f491a1178bc..36c26225621 100644 --- a/src/gallium/auxiliary/Makefile +++ b/src/gallium/auxiliary/Makefile @@ -152,7 +152,6 @@ GALLIVM_SOURCES = \ gallivm/lp_bld_const.c \ gallivm/lp_bld_conv.c \ gallivm/lp_bld_debug.c \ - gallivm/lp_bld_depth.c \ gallivm/lp_bld_flow.c \ gallivm/lp_bld_format_soa.c \ gallivm/lp_bld_init.c \ diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript index 09665b96031..d8eea52c4df 100644 --- a/src/gallium/auxiliary/SConscript +++ b/src/gallium/auxiliary/SConscript @@ -201,7 +201,6 @@ if env['llvm']: 'gallivm/lp_bld_const.c', 'gallivm/lp_bld_conv.c', 'gallivm/lp_bld_debug.c', - 'gallivm/lp_bld_depth.c', 'gallivm/lp_bld_flow.c', 'gallivm/lp_bld_format_soa.c', 'gallivm/lp_bld_intr.c', diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile index 85eaf5935de..239afabce5a 100644 --- a/src/gallium/drivers/llvmpipe/Makefile +++ b/src/gallium/drivers/llvmpipe/Makefile @@ -6,6 +6,7 @@ LIBNAME = llvmpipe DEFINES += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS C_SOURCES = \ + lp_bld_depth.c \ lp_bld_interp.c \ lp_clear.c \ lp_context.c \ diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript index d8a5e915d99..258b858b205 100644 --- a/src/gallium/drivers/llvmpipe/SConscript +++ b/src/gallium/drivers/llvmpipe/SConscript @@ -26,6 +26,7 @@ env.Depends('lp_tile_soa.c', [ llvmpipe = env.ConvenienceLibrary( target = 'llvmpipe', source = [ + 'lp_bld_depth.c', 'lp_bld_interp.c', 'lp_clear.c', 'lp_context.c', diff --git a/src/gallium/auxiliary/gallivm/lp_bld_depth.c b/src/gallium/drivers/llvmpipe/lp_bld_depth.c similarity index 98% rename from src/gallium/auxiliary/gallivm/lp_bld_depth.c rename to src/gallium/drivers/llvmpipe/lp_bld_depth.c index 564ea2e3189..a181a037f8d 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_depth.c +++ b/src/gallium/drivers/llvmpipe/lp_bld_depth.c @@ -67,14 +67,15 @@ #include "pipe/p_state.h" #include "util/u_format.h" -#include "lp_bld_type.h" -#include "lp_bld_arit.h" -#include "lp_bld_const.h" -#include "lp_bld_logic.h" -#include "lp_bld_flow.h" -#include "lp_bld_debug.h" +#include "gallivm/lp_bld_type.h" +#include "gallivm/lp_bld_arit.h" +#include "gallivm/lp_bld_const.h" +#include "gallivm/lp_bld_logic.h" +#include "gallivm/lp_bld_flow.h" +#include "gallivm/lp_bld_debug.h" +#include "gallivm/lp_bld_swizzle.h" + #include "lp_bld_depth.h" -#include "lp_bld_swizzle.h" /** Used to select fields from pipe_stencil_state */ diff --git a/src/gallium/auxiliary/gallivm/lp_bld_depth.h b/src/gallium/drivers/llvmpipe/lp_bld_depth.h similarity index 100% rename from src/gallium/auxiliary/gallivm/lp_bld_depth.h rename to src/gallium/drivers/llvmpipe/lp_bld_depth.h -- 2.30.2