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/vulkan/wsi | |
| 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/vulkan/wsi')
| -rw-r--r-- | src/vulkan/wsi/wsi_common.h | 2 | ||||
| -rw-r--r-- | src/vulkan/wsi/wsi_common_wayland.c | 2 | ||||
| -rw-r--r-- | src/vulkan/wsi/wsi_common_x11.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/vulkan/wsi/wsi_common.h b/src/vulkan/wsi/wsi_common.h index 8aee9c73513..8166b7dd344 100644 --- a/src/vulkan/wsi/wsi_common.h +++ b/src/vulkan/wsi/wsi_common.h @@ -26,7 +26,7 @@ #include <stdint.h> #include <stdbool.h> -#include "util/vk_alloc.h" +#include "vk_alloc.h" #include <vulkan/vulkan.h> #include <vulkan/vk_icd.h> diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c index 644ed62b414..dd283a12111 100644 --- a/src/vulkan/wsi/wsi_common_wayland.c +++ b/src/vulkan/wsi/wsi_common_wayland.c @@ -31,7 +31,7 @@ #include <string.h> #include <pthread.h> -#include "util/vk_util.h" +#include "vk_util.h" #include "wsi_common_wayland.h" #include "wayland-drm-client-protocol.h" diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c index 5be56f1232f..ecdaf914344 100644 --- a/src/vulkan/wsi/wsi_common_x11.c +++ b/src/vulkan/wsi/wsi_common_x11.c @@ -38,7 +38,7 @@ #include <xf86drm.h> #include "util/hash_table.h" -#include "util/vk_util.h" +#include "vk_util.h" #include "wsi_common.h" #include "wsi_common_x11.h" #include "wsi_common_queue.h" |