[Mesa-dev] [PATCH 09/15] gallivm: Move duplicate LP_MAX_INSTRUCTIONS def into common headers

Tom Stellard tstellar at gmail.com
Fri Dec 9 14:16:01 PST 2011


---
 src/gallium/auxiliary/gallivm/lp_bld_tgsi.h     |    2 ++
 src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c |    3 ---
 src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c |    2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h
index 04d5a72..5d31318 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h
@@ -49,6 +49,8 @@
 #define CHAN_W 3
 #define NUM_CHANNELS 4
 
+#define LP_MAX_INSTRUCTIONS 256
+
 
 struct tgsi_full_declaration;
 struct tgsi_full_instruction;
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c
index 35e8d43..f9d1942 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c
@@ -58,9 +58,6 @@
 #include "lp_bld_debug.h"
 
 
-#define LP_MAX_INSTRUCTIONS 256
-
-
 /**
  * Wrapper around lp_build_swizzle_aos which translates swizzles to another 
  * ordering.
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
index c09a8d7..f504fed 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
@@ -75,8 +75,6 @@
    FOR_EACH_CHANNEL( CHAN )\
       IF_IS_DST0_CHANNEL_ENABLED( INST, CHAN )
 
-#define LP_MAX_INSTRUCTIONS 256
-
 
 static void lp_exec_mask_init(struct lp_exec_mask *mask, struct lp_build_context *bld)
 {
-- 
1.7.6.4



More information about the mesa-dev mailing list