Browse Source

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>
tags/19.1-branchpoint
Lionel Landwerlin 6 years ago
parent
commit
9646750822

+ 4
- 4
src/vulkan/overlay-layer/overlay.cpp View File

@@ -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"


+ 2
- 2
src/vulkan/overlay-layer/vk_layer_table.cpp View File

@@ -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;

+ 2
- 2
src/vulkan/overlay-layer/vk_layer_table.h View File

@@ -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;

Loading…
Cancel
Save