diff options
| author | Alex Smith <[email protected]> | 2017-06-06 12:31:05 +0100 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-06-06 08:17:13 -0700 |
| commit | 621b3410f5f88e2a3743bc025b100717cac26e63 (patch) | |
| tree | 1b3714721de48490a4a25f361e93c400f0e03f7b /src/amd/vulkan | |
| parent | 2ef73473c8eedab679637334a0af597d26222e0a (diff) | |
util/vulkan: Move Vulkan utilities to src/vulkan/util
We have Vulkan utilities in both src/util and src/vulkan/util. The
latter seems a more appropriate place for Vulkan-specific things, so
move them there.
v2: Android build system changes (from Tapani Pälli)
Signed-off-by: Alex Smith <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/amd/vulkan')
| -rw-r--r-- | src/amd/vulkan/radv_device.c | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_formats.c | 3 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_private.h | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_wsi.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 887916f558f..a812527ebe4 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -33,7 +33,7 @@ #include "radv_cs.h" #include "util/disk_cache.h" #include "util/strtod.h" -#include "util/vk_util.h" +#include "vk_util.h" #include <xf86drm.h> #include <amdgpu.h> #include <amdgpu_drm.h> diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c index 6cff0a5384e..b13adb9abdc 100644 --- a/src/amd/vulkan/radv_formats.c +++ b/src/amd/vulkan/radv_formats.c @@ -28,7 +28,8 @@ #include "sid.h" #include "r600d_common.h" -#include "util/vk_util.h" +#include "vk_util.h" + #include "util/u_half.h" #include "util/format_srgb.h" #include "util/format_r11g11b10f.h" diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index ed80ba79e7f..a3920a72702 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -47,8 +47,8 @@ #include "compiler/shader_enums.h" #include "util/macros.h" #include "util/list.h" -#include "util/vk_alloc.h" #include "main/macros.h" +#include "vk_alloc.h" #include "radv_radeon_winsys.h" #include "ac_binary.h" diff --git a/src/amd/vulkan/radv_wsi.c b/src/amd/vulkan/radv_wsi.c index 51fe159aaf8..cdb04ca9628 100644 --- a/src/amd/vulkan/radv_wsi.c +++ b/src/amd/vulkan/radv_wsi.c @@ -26,7 +26,7 @@ #include "radv_private.h" #include "radv_meta.h" #include "wsi_common.h" -#include "util/vk_util.h" +#include "vk_util.h" static const struct wsi_callbacks wsi_cbs = { .get_phys_device_format_properties = radv_GetPhysicalDeviceFormatProperties, |