diff options
| author | Emil Velikov <[email protected]> | 2014-08-16 17:58:25 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-08-28 21:24:37 +0100 |
| commit | a131263a2f19507ca0d2f6093672d930a7c054d1 (patch) | |
| tree | 249244d472578081e2cf3f35d1c1fcafacbaedd3 /src/gallium/drivers/r600 | |
| parent | 22a13f5b09b62557fcbc72f38421bbd9328bcb37 (diff) | |
gallium/radeon: cleanup header inclusion
- Add top_srcdir/src/gallium/winsys to GALLIUM_DRIVER_C{XXFLAGS}.
- Remove top_srcdir/src/gallium/drivers/radeon from the includes.
As a result:
- Common radeon headers are prefixed with 'radeon/'
- Winsys header inclusion is prefixed 'radeon/drm'
Cc: Marek Olšák <[email protected]>
Cc: Michel Dänzer <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/Makefile.am | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_llvm.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_llvm.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am index 30e098e1770..ff84cd0f5f4 100644 --- a/src/gallium/drivers/r600/Makefile.am +++ b/src/gallium/drivers/r600/Makefile.am @@ -20,8 +20,7 @@ libr600_la_SOURCES = \ if NEED_RADEON_LLVM AM_CFLAGS += \ - $(LLVM_CFLAGS) \ - -I$(top_srcdir)/src/gallium/drivers/radeon/ + $(LLVM_CFLAGS) libr600_la_SOURCES += \ $(LLVM_C_SOURCES) diff --git a/src/gallium/drivers/r600/r600_llvm.c b/src/gallium/drivers/r600/r600_llvm.c index d1e3255be85..766141968a0 100644 --- a/src/gallium/drivers/r600/r600_llvm.c +++ b/src/gallium/drivers/r600/r600_llvm.c @@ -13,8 +13,8 @@ #include "r600_opcodes.h" #include "r600_shader.h" #include "r600_pipe.h" -#include "radeon_llvm.h" -#include "radeon_llvm_emit.h" +#include "radeon/radeon_llvm.h" +#include "radeon/radeon_llvm_emit.h" #include <stdio.h> diff --git a/src/gallium/drivers/r600/r600_llvm.h b/src/gallium/drivers/r600/r600_llvm.h index e036bfffac2..3840a5a2933 100644 --- a/src/gallium/drivers/r600/r600_llvm.h +++ b/src/gallium/drivers/r600/r600_llvm.h @@ -4,7 +4,7 @@ #if defined R600_USE_LLVM || defined HAVE_OPENCL -#include "radeon_llvm.h" +#include "radeon/radeon_llvm.h" #include <llvm-c/Core.h> struct r600_bytecode; diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index e277269cccb..8907d41a377 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -26,8 +26,8 @@ #ifndef R600_PIPE_H #define R600_PIPE_H -#include "../radeon/r600_pipe_common.h" -#include "../radeon/r600_cs.h" +#include "radeon/r600_pipe_common.h" +#include "radeon/r600_cs.h" #include "r600_llvm.h" #include "r600_public.h" |