gallivm/llvmpipe: move lp_bld_alpha.c to llvmpipe/ directory

diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
index 36c2622..a2d0190 100644 (file)
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@ -144,7 +144,6 @@ C_SOURCES = \
        #vl/vl_shader_build.c \
 
 GALLIVM_SOURCES = \
-        gallivm/lp_bld_alpha.c \
         gallivm/lp_bld_arit.c \
         gallivm/lp_bld_blend_aos.c \
         gallivm/lp_bld_blend_logicop.c \

diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
index d8eea52..8bb3499 100644 (file)
--- a/src/gallium/auxiliary/SConscript
+++ b/src/gallium/auxiliary/SConscript
@@ -193,7 +193,6 @@ source = [
 
 if env['llvm']:
     source += [
-    'gallivm/lp_bld_alpha.c',
     'gallivm/lp_bld_arit.c',
     'gallivm/lp_bld_blend_aos.c',
     'gallivm/lp_bld_blend_logicop.c',

diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
index 239afab..c485c89 100644 (file)
--- 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_alpha.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 258b858..7196ff1 100644 (file)
--- 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_alpha.c',
                'lp_bld_depth.c',
                'lp_bld_interp.c',
                'lp_clear.c',

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_alpha.c b/src/gallium/drivers/llvmpipe/lp_bld_alpha.c
similarity index 92%
rename from src/gallium/auxiliary/gallivm/lp_bld_alpha.c
rename to src/gallium/drivers/llvmpipe/lp_bld_alpha.c
index 7245730..8514030 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_alpha.c
+++ b/src/gallium/drivers/llvmpipe/lp_bld_alpha.c
@@ -33,11 +33,12 @@
 
 #include "pipe/p_state.h"
 
-#include "lp_bld_type.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_const.h"
+#include "gallivm/lp_bld_logic.h"
+#include "gallivm/lp_bld_flow.h"
+#include "gallivm/lp_bld_debug.h"
+
 #include "lp_bld_alpha.h"
 
 

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_alpha.h b/src/gallium/drivers/llvmpipe/lp_bld_alpha.h
similarity index 100%
rename from src/gallium/auxiliary/gallivm/lp_bld_alpha.h
rename to src/gallium/drivers/llvmpipe/lp_bld_alpha.h