summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gallium/auxiliary/Makefile3
-rw-r--r--src/gallium/auxiliary/SConscript3
-rw-r--r--src/gallium/drivers/llvmpipe/Makefile3
-rw-r--r--src/gallium/drivers/llvmpipe/SConscript3
-rw-r--r--src/gallium/drivers/llvmpipe/lp_bld_blend.h (renamed from src/gallium/auxiliary/gallivm/lp_bld_blend.h)0
-rw-r--r--src/gallium/drivers/llvmpipe/lp_bld_blend_aos.c (renamed from src/gallium/auxiliary/gallivm/lp_bld_blend_aos.c)13
-rw-r--r--src/gallium/drivers/llvmpipe/lp_bld_blend_logicop.c (renamed from src/gallium/auxiliary/gallivm/lp_bld_blend_logicop.c)0
-rw-r--r--src/gallium/drivers/llvmpipe/lp_bld_blend_soa.c (renamed from src/gallium/auxiliary/gallivm/lp_bld_blend_soa.c)4
8 files changed, 15 insertions, 14 deletions
diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
index a2d01901e1..c672f32b7b 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 8bb3499694..42f2cffc81 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 c485c89eb3..fe87619ef3 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 7196ff1310..0b827281ff 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
index ebbdb1a604..ebbdb1a604 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_blend.h
+++ b/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
index 0215bb72ac..2bcf9174f2 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
index 1eac0a5c89..1eac0a5c89 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_blend_logicop.c
+++ b/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
index 6d5a45db7a..39ea9eddd8 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"