diff options
author | Brian Paul <brianp@vmware.com> | 2010-04-16 10:17:38 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2010-04-16 10:17:38 -0600 |
commit | cf88dcf7313b6a0112c36c2f05ce6a7e846d268c (patch) | |
tree | ac3d35dcd2ef96d4baf05b97c918b202ee34191c | |
parent | d293c43c9a9658caa5224f710b95a848a912faa1 (diff) | |
download | external_mesa3d-cf88dcf7313b6a0112c36c2f05ce6a7e846d268c.zip external_mesa3d-cf88dcf7313b6a0112c36c2f05ce6a7e846d268c.tar.gz external_mesa3d-cf88dcf7313b6a0112c36c2f05ce6a7e846d268c.tar.bz2 |
gallivm/llvmpipe: move lp_bld_interp.c to llvmpipe/ directory
This file is specific to the llvmpipe driver and not re-usable.
-rw-r--r-- | src/gallium/auxiliary/Makefile | 1 | ||||
-rw-r--r-- | src/gallium/auxiliary/SConscript | 1 | ||||
-rw-r--r-- | src/gallium/drivers/llvmpipe/Makefile | 1 | ||||
-rw-r--r-- | src/gallium/drivers/llvmpipe/SConscript | 1 | ||||
-rw-r--r-- | src/gallium/drivers/llvmpipe/lp_bld_interp.c (renamed from src/gallium/auxiliary/gallivm/lp_bld_interp.c) | 8 | ||||
-rw-r--r-- | src/gallium/drivers/llvmpipe/lp_bld_interp.h (renamed from src/gallium/auxiliary/gallivm/lp_bld_interp.h) | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile index c4d6b52..f491a11 100644 --- a/src/gallium/auxiliary/Makefile +++ b/src/gallium/auxiliary/Makefile @@ -156,7 +156,6 @@ GALLIVM_SOURCES = \ gallivm/lp_bld_flow.c \ gallivm/lp_bld_format_soa.c \ gallivm/lp_bld_init.c \ - gallivm/lp_bld_interp.c \ gallivm/lp_bld_intr.c \ gallivm/lp_bld_logic.c \ gallivm/lp_bld_pack.c \ diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript index 3ad0600..09665b9 100644 --- a/src/gallium/auxiliary/SConscript +++ b/src/gallium/auxiliary/SConscript @@ -204,7 +204,6 @@ if env['llvm']: 'gallivm/lp_bld_depth.c', 'gallivm/lp_bld_flow.c', 'gallivm/lp_bld_format_soa.c', - 'gallivm/lp_bld_interp.c', 'gallivm/lp_bld_intr.c', 'gallivm/lp_bld_logic.c', 'gallivm/lp_bld_init.c', diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile index a35a24f..85eaf59 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_interp.c \ lp_clear.c \ lp_context.c \ lp_draw_arrays.c \ diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript index 8e3267c..d8a5e91 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_interp.c', 'lp_clear.c', 'lp_context.c', 'lp_draw_arrays.c', diff --git a/src/gallium/auxiliary/gallivm/lp_bld_interp.c b/src/gallium/drivers/llvmpipe/lp_bld_interp.c index 09efb16..cb1d7b2 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_interp.c +++ b/src/gallium/drivers/llvmpipe/lp_bld_interp.c @@ -38,10 +38,10 @@ #include "util/u_memory.h" #include "util/u_math.h" #include "tgsi/tgsi_parse.h" -#include "lp_bld_debug.h" -#include "lp_bld_const.h" -#include "lp_bld_arit.h" -#include "lp_bld_swizzle.h" +#include "gallivm/lp_bld_debug.h" +#include "gallivm/lp_bld_const.h" +#include "gallivm/lp_bld_arit.h" +#include "gallivm/lp_bld_swizzle.h" #include "lp_bld_interp.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_interp.h b/src/gallium/drivers/llvmpipe/lp_bld_interp.h index a4937bb..d9e3fd1 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_interp.h +++ b/src/gallium/drivers/llvmpipe/lp_bld_interp.h @@ -42,10 +42,10 @@ #include "gallivm/lp_bld.h" +#include "gallivm/lp_bld_type.h" #include "tgsi/tgsi_exec.h" -#include "lp_bld_type.h" struct tgsi_token; |