diff options
| author | Timur Kristóf <[email protected]> | 2019-09-27 10:29:51 +0200 |
|---|---|---|
| committer | Bas Nieuwenhuizen <[email protected]> | 2019-10-08 00:44:08 +0000 |
| commit | 3a08110d43ce268747d034cae03787080967bf71 (patch) | |
| tree | ee02037354a4a3846f9cb75df486b036345a5acc /src/gallium/winsys/amdgpu | |
| parent | 738bbee603fd3fd8ea29edab7b681e48bc981467 (diff) | |
amd: Move all amd/common code that depends on LLVM to amd/llvm.
This commit is a step towards the goal of being able to build RADV
without LLVM. In the future we would like to offer the option to
use RADV solely with ACO. There is still a need for the common AMD
code located in amd/common but the LLVM specific parts need to be
separated.
Signed-off-by: Timur Kristóf <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Acked-by: Marek Olšák <[email protected]>
Acked-by: Samuel Pitoiset <[email protected]>
Diffstat (limited to 'src/gallium/winsys/amdgpu')
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 4 | ||||
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/meson.build | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c index a89432d8594..7864b21e3c7 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c @@ -39,8 +39,8 @@ #include <stdio.h> #include <sys/stat.h> #include <fcntl.h> -#include "amd/common/ac_llvm_util.h" -#include "amd/common/sid.h" +#include "ac_llvm_util.h" +#include "sid.h" #ifndef AMDGPU_INFO_NUM_VRAM_CPU_PAGE_FAULTS #define AMDGPU_INFO_NUM_VRAM_CPU_PAGE_FAULTS 0x1E diff --git a/src/gallium/winsys/amdgpu/drm/meson.build b/src/gallium/winsys/amdgpu/drm/meson.build index 65a5e64dc62..ef2705d52ad 100644 --- a/src/gallium/winsys/amdgpu/drm/meson.build +++ b/src/gallium/winsys/amdgpu/drm/meson.build @@ -27,6 +27,7 @@ libamdgpuwinsys = static_library( ), include_directories : [ inc_amd, inc_gallium, inc_gallium_aux, inc_include, inc_src, + inc_amd_common, inc_amd_common_llvm, ], c_args : [c_vis_args], cpp_args : [cpp_vis_args], |