From d75129dd13c2aac4053340487b87127420449ee8 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 16 Apr 2010 10:28:21 -0600 Subject: [PATCH] gallivm/llvmpipe: move lp_bld_blend* files to llvmpipe/ directory --- src/gallium/auxiliary/Makefile | 3 --- src/gallium/auxiliary/SConscript | 3 --- src/gallium/drivers/llvmpipe/Makefile | 3 +++ src/gallium/drivers/llvmpipe/SConscript | 3 +++ .../{auxiliary/gallivm => drivers/llvmpipe}/lp_bld_blend.h | 0 .../gallivm => drivers/llvmpipe}/lp_bld_blend_aos.c | 13 +++++++------ .../gallivm => drivers/llvmpipe}/lp_bld_blend_logicop.c | 0 .../gallivm => drivers/llvmpipe}/lp_bld_blend_soa.c | 4 ++-- 8 files changed, 15 insertions(+), 14 deletions(-) rename src/gallium/{auxiliary/gallivm => drivers/llvmpipe}/lp_bld_blend.h (100%) rename src/gallium/{auxiliary/gallivm => drivers/llvmpipe}/lp_bld_blend_aos.c (98%) rename src/gallium/{auxiliary/gallivm => drivers/llvmpipe}/lp_bld_blend_logicop.c (100%) rename src/gallium/{auxiliary/gallivm => drivers/llvmpipe}/lp_bld_blend_soa.c (99%) diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile index a2d0190..c672f32 100644 --- a/src/gallium/auxiliary/Makefile +++ b/src/gallium/auxiliary/Makefile @@ -145,9 +145,6 @@ C_SOURCES = \ GALLIVM_SOURCES = \ gallivm/lp_bld_arit.c \ - gallivm/lp_bld_blend_aos.c \ - gallivm/lp_bld_blend_logicop.c \ - gallivm/lp_bld_blend_soa.c \ gallivm/lp_bld_const.c \ gallivm/lp_bld_conv.c \ gallivm/lp_bld_debug.c \ diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript index 8bb3499..42f2cff 100644 --- a/src/gallium/auxiliary/SConscript +++ b/src/gallium/auxiliary/SConscript @@ -194,9 +194,6 @@ source = [ if env['llvm']: source += [ 'gallivm/lp_bld_arit.c', - 'gallivm/lp_bld_blend_aos.c', - 'gallivm/lp_bld_blend_logicop.c', - 'gallivm/lp_bld_blend_soa.c', 'gallivm/lp_bld_const.c', 'gallivm/lp_bld_conv.c', 'gallivm/lp_bld_debug.c', diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile index c485c89..fe87619 100644 --- a/src/gallium/drivers/llvmpipe/Makefile +++ b/src/gallium/drivers/llvmpipe/Makefile @@ -7,6 +7,9 @@ DEFINES += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS C_SOURCES = \ lp_bld_alpha.c \ + lp_bld_blend_aos.c \ + lp_bld_blend_logicop.c \ + lp_bld_blend_soa.c \ lp_bld_depth.c \ lp_bld_interp.c \ lp_clear.c \ diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript index 7196ff1..0b82728 100644 --- a/src/gallium/drivers/llvmpipe/SConscript +++ b/src/gallium/drivers/llvmpipe/SConscript @@ -27,6 +27,9 @@ llvmpipe = env.ConvenienceLibrary( target = 'llvmpipe', source = [ 'lp_bld_alpha.c', + 'lp_bld_blend_aos.c', + 'lp_bld_blend_logicop.c', + 'lp_bld_blend_soa.c', 'lp_bld_depth.c', 'lp_bld_interp.c', 'lp_clear.c', diff --git a/src/gallium/auxiliary/gallivm/lp_bld_blend.h b/src/gallium/drivers/llvmpipe/lp_bld_blend.h similarity index 100% rename from src/gallium/auxiliary/gallivm/lp_bld_blend.h rename to src/gallium/drivers/llvmpipe/lp_bld_blend.h diff --git a/src/gallium/auxiliary/gallivm/lp_bld_blend_aos.c b/src/gallium/drivers/llvmpipe/lp_bld_blend_aos.c similarity index 98% rename from src/gallium/auxiliary/gallivm/lp_bld_blend_aos.c rename to src/gallium/drivers/llvmpipe/lp_bld_blend_aos.c index 0215bb7..2bcf917 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_blend_aos.c +++ b/src/gallium/drivers/llvmpipe/lp_bld_blend_aos.c @@ -46,13 +46,14 @@ #include "pipe/p_state.h" #include "util/u_debug.h" -#include "lp_bld_type.h" -#include "lp_bld_const.h" -#include "lp_bld_arit.h" -#include "lp_bld_logic.h" -#include "lp_bld_swizzle.h" +#include "gallivm/lp_bld_type.h" +#include "gallivm/lp_bld_const.h" +#include "gallivm/lp_bld_arit.h" +#include "gallivm/lp_bld_logic.h" +#include "gallivm/lp_bld_swizzle.h" +#include "gallivm/lp_bld_debug.h" + #include "lp_bld_blend.h" -#include "lp_bld_debug.h" /** diff --git a/src/gallium/auxiliary/gallivm/lp_bld_blend_logicop.c b/src/gallium/drivers/llvmpipe/lp_bld_blend_logicop.c similarity index 100% rename from src/gallium/auxiliary/gallivm/lp_bld_blend_logicop.c rename to src/gallium/drivers/llvmpipe/lp_bld_blend_logicop.c diff --git a/src/gallium/auxiliary/gallivm/lp_bld_blend_soa.c b/src/gallium/drivers/llvmpipe/lp_bld_blend_soa.c similarity index 99% rename from src/gallium/auxiliary/gallivm/lp_bld_blend_soa.c rename to src/gallium/drivers/llvmpipe/lp_bld_blend_soa.c index 6d5a45d..39ea9ed 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_blend_soa.c +++ b/src/gallium/drivers/llvmpipe/lp_bld_blend_soa.c @@ -71,8 +71,8 @@ #include "pipe/p_state.h" #include "util/u_debug.h" -#include "lp_bld_type.h" -#include "lp_bld_arit.h" +#include "gallivm/lp_bld_type.h" +#include "gallivm/lp_bld_arit.h" #include "lp_bld_blend.h" -- 2.7.4