diff options
author | Alex Smith <asmith@feralinteractive.com> | 2017-06-06 12:31:05 +0100 |
---|---|---|
committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2017-06-06 08:17:13 -0700 |
commit | 621b3410f5f88e2a3743bc025b100717cac26e63 (patch) | |
tree | 1b3714721de48490a4a25f361e93c400f0e03f7b /src/intel/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 <asmith@feralinteractive.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Diffstat (limited to 'src/intel/vulkan')
-rw-r--r-- | src/intel/vulkan/anv_device.c | 2 | ||||
-rw-r--r-- | src/intel/vulkan/anv_formats.c | 3 | ||||
-rw-r--r-- | src/intel/vulkan/anv_pass.c | 2 | ||||
-rw-r--r-- | src/intel/vulkan/anv_private.h | 2 | ||||
-rw-r--r-- | src/intel/vulkan/anv_queue.c | 2 | ||||
-rw-r--r-- | src/intel/vulkan/anv_wsi.c | 2 | ||||
-rw-r--r-- | src/intel/vulkan/genX_cmd_buffer.c | 2 |
7 files changed, 7 insertions, 8 deletions
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index ab484ed0f9a..52e5d7b0252 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -35,7 +35,7 @@ #include "util/debug.h" #include "util/build_id.h" #include "util/mesa-sha1.h" -#include "util/vk_util.h" +#include "vk_util.h" #include "genxml/gen7_pack.h" diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c index 25801e8b065..104d4f7a5fe 100644 --- a/src/intel/vulkan/anv_formats.c +++ b/src/intel/vulkan/anv_formats.c @@ -23,8 +23,7 @@ #include "anv_private.h" #include "vk_format_info.h" - -#include "util/vk_util.h" +#include "vk_util.h" /* * gcc-4 and earlier don't allow compound literals where a constant diff --git a/src/intel/vulkan/anv_pass.c b/src/intel/vulkan/anv_pass.c index 93f14830cc5..1b30c1409d9 100644 --- a/src/intel/vulkan/anv_pass.c +++ b/src/intel/vulkan/anv_pass.c @@ -23,7 +23,7 @@ #include "anv_private.h" -#include "util/vk_util.h" +#include "vk_util.h" static unsigned num_subpass_attachments(const VkSubpassDescription *desc) diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index c261faa78b8..fe6ac3bc1bd 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -47,7 +47,7 @@ #include "util/macros.h" #include "util/list.h" #include "util/u_vector.h" -#include "util/vk_alloc.h" +#include "vk_alloc.h" /* Pre-declarations needed for WSI entrypoints */ struct wl_surface; diff --git a/src/intel/vulkan/anv_queue.c b/src/intel/vulkan/anv_queue.c index be7fd310081..fd4d36297f0 100644 --- a/src/intel/vulkan/anv_queue.c +++ b/src/intel/vulkan/anv_queue.c @@ -30,7 +30,7 @@ #include <sys/eventfd.h> #include "anv_private.h" -#include "util/vk_util.h" +#include "vk_util.h" #include "genxml/gen7_pack.h" diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c index 7575f58ff24..9369f26a8fa 100644 --- a/src/intel/vulkan/anv_wsi.c +++ b/src/intel/vulkan/anv_wsi.c @@ -24,7 +24,7 @@ #include "anv_private.h" #include "wsi_common.h" #include "vk_format_info.h" -#include "util/vk_util.h" +#include "vk_util.h" #ifdef VK_USE_PLATFORM_WAYLAND_KHR static const struct wsi_callbacks wsi_cbs = { diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 072d0d50325..59430a24eb9 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -26,7 +26,7 @@ #include "anv_private.h" #include "vk_format_info.h" -#include "util/vk_util.h" +#include "vk_util.h" #include "common/gen_l3_config.h" #include "genxml/gen_macros.h" |