summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2013-01-18 14:13:08 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2013-02-04 20:38:08 +0000
commit37bc822190f36be7b021167ba4d306bbcd97957b (patch)
tree85b19477cf8b2074744bb1615fe1444117bac519
parent18f8d2291fbb53ac993b926c247ca981e1e5207b (diff)
build: Make generation of gen code depend on intel-gen4asm
This way, when a new intel-gen4asm is available (because one just hacked on it and has installed a new version for instance) the shaders will be recompiled. This helps catching regressions, testing the latest changes in the assembler haven't broken too many things. Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/render_program/Makefile.am8
-rw-r--r--src/xvmc/shader/mc/Makefile.am2
-rw-r--r--src/xvmc/shader/vld/Makefile.am2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/render_program/Makefile.am b/src/render_program/Makefile.am
index 734e7da0..1298625f 100644
--- a/src/render_program/Makefile.am
+++ b/src/render_program/Makefile.am
@@ -202,10 +202,10 @@ SUFFIXES = .g4a .g4b .g5a .g5b .g6a .g6b .g7a .g7b
.g7a.g7b:
$(AM_V_GEN)m4 -I$(srcdir) -s $< > $*.g7m && @INTEL_GEN4ASM@ -g 7 -o $@ $*.g7m && rm $*.g7m
-$(INTEL_G4B): $(INTEL_G4I)
-$(INTEL_G5B): $(INTEL_G4I)
-$(INTEL_G6B): $(INTEL_G4I) $(INTEL_G6I)
-$(INTEL_G7B): $(INTEL_G4I) $(INTEL_G6I)
+$(INTEL_G4B): $(INTEL_GEN4ASM) $(INTEL_G4I)
+$(INTEL_G5B): $(INTEL_GEN4ASM) $(INTEL_G4I)
+$(INTEL_G6B): $(INTEL_GEN4ASM) $(INTEL_G4I) $(INTEL_G6I)
+$(INTEL_G7B): $(INTEL_GEN4ASM) $(INTEL_G4I) $(INTEL_G6I)
BUILT_SOURCES= $(INTEL_G4B) $(INTEL_G5B) $(INTEL_G6B) $(INTEL_G7B)
diff --git a/src/xvmc/shader/mc/Makefile.am b/src/xvmc/shader/mc/Makefile.am
index b29fa781..8d657691 100644
--- a/src/xvmc/shader/mc/Makefile.am
+++ b/src/xvmc/shader/mc/Makefile.am
@@ -111,7 +111,7 @@ SUFFIXES = .g4a .g4b
.g4a.g4b:
$(AM_V_GEN)m4 -I$(srcdir) $(srcdir)/$*.g4a > $*.g4m && @INTEL_GEN4ASM@ -o $@ $*.g4m && @INTEL_GEN4ASM@ -g 5 -o $@.gen5 $*.g4m && rm $*.g4m
-$(INTEL_G4B): $(INTEL_G4I)
+$(INTEL_G4B): $(INTEL_GEN4ASM) $(INTEL_G4I)
BUILT_SOURCES= $(INTEL_G4B)
diff --git a/src/xvmc/shader/vld/Makefile.am b/src/xvmc/shader/vld/Makefile.am
index fcae0870..8f1047e0 100644
--- a/src/xvmc/shader/vld/Makefile.am
+++ b/src/xvmc/shader/vld/Makefile.am
@@ -64,7 +64,7 @@ SUFFIXES = .g4a .g4b
.g4a.g4b:
$(AM_V_GEN)m4 $*.g4a > $*.g4m && @INTEL_GEN4ASM@ -o $@ $*.g4m && @INTEL_GEN4ASM@ -g 5 -o $@.gen5 $*.g4m && rm $*.g4m
-$(INTEL_G4B): $(INTEL_G4I)
+$(INTEL_G4B): $(INTEL_GEN4ASM) $(INTEL_G4I)
BUILT_SOURCES= $(INTEL_G4B)