i-g-t/debugger: Only allow the shader debugger if the user has specified a gen4asm

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
This commit is contained in:
Ben Widawsky 2011-10-31 13:36:50 -07:00
parent 3291023151
commit 15830ea54b
2 changed files with 10 additions and 6 deletions

View File

@ -93,8 +93,13 @@ AC_ARG_ENABLE(shader-debugger,
[SHADER_DEBUGGER=no]) [SHADER_DEBUGGER=no])
AM_CONDITIONAL(HAVE_SHADER_DEBUGGER, [test "x$SHADER_DEBUGGER" = xyes]) AM_CONDITIONAL(HAVE_SHADER_DEBUGGER, [test "x$SHADER_DEBUGGER" = xyes])
if test "x$SHADER_DEBUGGER" = xyes; then if test "x$SHADER_DEBUGGER" = xyes; then
AC_CHECK_PROG([GEN4ASM], intel-gen4asm, intel-gen4asm)
if test -z "$GEN4ASM"; then
AC_MSG_ERROR([Cannot find intel-gen4asm in your path; please set GEN4ASM env variable])
else
AC_DEFINE(HAVE_SHADER_DEBUGGER, 1, [Have shader debugging support]) AC_DEFINE(HAVE_SHADER_DEBUGGER, 1, [Have shader debugging support])
fi fi
fi
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3) XORG_MACROS_VERSION(1.3)

View File

@ -27,8 +27,7 @@ OBJCOPY?=objcopy
PRECPP=./pre_cpp.py PRECPP=./pre_cpp.py
CPP_FLAGS=-x assembler-with-cpp -P CPP_FLAGS=-x assembler-with-cpp -P
GEN_AS?=~/intel-gfx/intel-gen4asm/src/intel-gen4asm GEN4ASM_FLAGS?=-g6 -a -b
GEN_AS_FLAGS?=-g6 -a -b
TEMP:=$(shell mktemp) TEMP:=$(shell mktemp)
TEMP2:=$(shell mktemp) TEMP2:=$(shell mktemp)
@ -41,7 +40,7 @@ all: sr
sr.c: sr.g4a eviction_macro evict.h sr.c: sr.g4a eviction_macro evict.h
$(PRECPP) $^ > $(TEMP) $(PRECPP) $^ > $(TEMP)
$(CPP) $(CPP_FLAGS) $(DEFINES) -o $(TEMP2) $(TEMP) $(CPP) $(CPP_FLAGS) $(DEFINES) -o $(TEMP2) $(TEMP)
$(GEN_AS) $(GEN_AS_FLAGS) $(TEMP2) -o $@ $(GEN4ASM) $(GEN4ASM_FLAGS) $(TEMP2) -o $@
sr : sr.o sr : sr.o
$(OBJCOPY) -O binary -K gen_eu_bytes $^ $@ $(OBJCOPY) -O binary -K gen_eu_bytes $^ $@
@ -51,7 +50,7 @@ sr : sr.o
test.c: test.g4a test.c: test.g4a
$(PRECPP) $^ > $(TEMP) $(PRECPP) $^ > $(TEMP)
$(CPP) $(CPP_FLAGS) $(DEFINES) -o $(TEMP2) $(TEMP) $(CPP) $(CPP_FLAGS) $(DEFINES) -o $(TEMP2) $(TEMP)
$(GEN_AS) $(GEN_AS_FLAGS) $(TEMP2) -o $@ $(GEN4ASM) $(GEN4ASM_FLAGS) $(TEMP2) -o $@
test : test.o test : test.o
$(OBJCOPY) -O binary -K gen_eu_bytes $^ $@ $(OBJCOPY) -O binary -K gen_eu_bytes $^ $@
@ -59,7 +58,7 @@ test : test.o
helper: sr.g4a eviction_macro helper: sr.g4a eviction_macro
$(PRECPP) $^ > help $(PRECPP) $^ > help
$(CPP) $(CPP_FLAGS) $(DEFINES) -o help2 help $(CPP) $(CPP_FLAGS) $(DEFINES) -o help2 help
$(GEN_AS) $(GEN_AS_FLAGS) help2 -o $@ $(GEN4ASM) $(GEN4ASM_FLAGS) help2 -o $@
eviction_macro : eviction_macro :