diff options
Diffstat (limited to 'src/gallium/drivers/r300')
-rw-r--r-- | src/gallium/drivers/r300/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/drivers/r300/Makefile.sources | 1 | ||||
-rw-r--r-- | src/gallium/drivers/r300/compiler/radeon_pair_regalloc.c | 2 | ||||
l--------- | src/gallium/drivers/r300/ralloc.c | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am index 2c5951b8f6d..ae6e8d2e466 100644 --- a/src/gallium/drivers/r300/Makefile.am +++ b/src/gallium/drivers/r300/Makefile.am @@ -4,7 +4,7 @@ include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ - -I$(top_srcdir)/src/util \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/src/mesa/program \ -I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/glsl \ diff --git a/src/gallium/drivers/r300/Makefile.sources b/src/gallium/drivers/r300/Makefile.sources index 0e9ab52c2b1..f987cf8540f 100644 --- a/src/gallium/drivers/r300/Makefile.sources +++ b/src/gallium/drivers/r300/Makefile.sources @@ -67,5 +67,4 @@ COMPILER_TESTS_SOURCES := \ compiler/tests/unit_test.c HELPER_SOURCES := \ - ralloc.c \ register_allocate.c diff --git a/src/gallium/drivers/r300/compiler/radeon_pair_regalloc.c b/src/gallium/drivers/r300/compiler/radeon_pair_regalloc.c index 1970a346d1d..7b02e53a482 100644 --- a/src/gallium/drivers/r300/compiler/radeon_pair_regalloc.c +++ b/src/gallium/drivers/r300/compiler/radeon_pair_regalloc.c @@ -33,7 +33,7 @@ #include "main/glheader.h" #include "program/register_allocate.h" #include "util/u_memory.h" -#include "ralloc.h" +#include "util/ralloc.h" #include "r300_fragprog_swizzle.h" #include "radeon_compiler.h" diff --git a/src/gallium/drivers/r300/ralloc.c b/src/gallium/drivers/r300/ralloc.c deleted file mode 120000 index 7ad6def37c5..00000000000 --- a/src/gallium/drivers/r300/ralloc.c +++ /dev/null @@ -1 +0,0 @@ -../../../util/ralloc.c
\ No newline at end of file |