From 964675082231963816a60271390bd04d561888fd Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Fri, 22 Feb 2019 12:54:53 +0000
Subject: [PATCH] vulkan/overlay: fix includes

The Loader/Validation-Layers repository allow the user to choose where
header files are installed. On my system I choose /usr/include
thinking it was the obvious "base" location, but it turns out the
headers end up being installed right there rather in a vulkan
subdirectory. On Debian/Ubuntu the selected installation path is
/usr/include/vulkan, so just go with that.

Hopefully other distro don't choose another path.

Note that the validation layer doesn't provide a .pc file so we have
no way of querying where the headers are installed.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109739
Acked-by: Eric Engestrom <eric.engestrom@intel.com>
---
 src/vulkan/overlay-layer/overlay.cpp        | 8 ++++----
 src/vulkan/overlay-layer/vk_layer_table.cpp | 4 ++--
 src/vulkan/overlay-layer/vk_layer_table.h   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/vulkan/overlay-layer/overlay.cpp b/src/vulkan/overlay-layer/overlay.cpp
index cdde7ea1e17..fb86312ba3f 100644
--- a/src/vulkan/overlay-layer/overlay.cpp
+++ b/src/vulkan/overlay-layer/overlay.cpp
@@ -25,13 +25,13 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include <vk_loader_platform.h>
 #include <vulkan/vulkan.h>
-#include <vk_dispatch_table_helper.h>
+#include <vulkan/vk_dispatch_table_helper.h>
 #include <vulkan/vk_layer.h>
-#include "vk_layer_data.h"
+#include <vulkan/vk_layer_data.h>
+#include <vulkan/vk_layer_extension_utils.h>
+#include <vulkan/vk_loader_platform.h>
 #include "vk_layer_table.h"
-#include "vk_layer_extension_utils.h"
 
 #include "imgui.h"
 
diff --git a/src/vulkan/overlay-layer/vk_layer_table.cpp b/src/vulkan/overlay-layer/vk_layer_table.cpp
index 4a033b9add6..0be2c0afe95 100644
--- a/src/vulkan/overlay-layer/vk_layer_table.cpp
+++ b/src/vulkan/overlay-layer/vk_layer_table.cpp
@@ -19,8 +19,8 @@
  */
 #include <assert.h>
 #include <unordered_map>
-#include "vk_dispatch_table_helper.h"
-#include "vulkan/vk_layer.h"
+#include <vulkan/vk_dispatch_table_helper.h>
+#include <vulkan/vk_layer.h>
 #include "vk_layer_table.h"
 static device_table_map tableMap;
 static instance_table_map tableInstanceMap;
diff --git a/src/vulkan/overlay-layer/vk_layer_table.h b/src/vulkan/overlay-layer/vk_layer_table.h
index 45b8f6e1770..33f124b591d 100644
--- a/src/vulkan/overlay-layer/vk_layer_table.h
+++ b/src/vulkan/overlay-layer/vk_layer_table.h
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include "vulkan/vk_layer.h"
-#include "vulkan/vulkan.h"
+#include <vulkan/vk_layer.h>
+#include <vulkan/vulkan.h>
 #include <unordered_map>
 
 typedef std::unordered_map<void *, VkLayerDispatchTable *> device_table_map;