Remove src/Vulkan directory from CMake include path

This change requires include directives to include the Vulkan/ path so
it's clearer when we have dependencies across layers/folders.

This was already the case for the other build files, so it avoids
build breakage as well.

Bug b/126557661

Change-Id: I4d8773e8c28e6677fd1e93ca9c9d2d843431343c
Reviewed-on: https://swiftshader-review.googlesource.com/c/25948
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58c2e37..4a9640c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1929,7 +1929,6 @@ set(OPENGL_INCLUDE_DIR
 )
 
 set(VULKAN_INCLUDE_DIR
-    ${VULKAN_DIR}
     ${COMMON_INCLUDE_DIR}
 )
 

diff --git a/src/WSI/VkSurfaceKHR.hpp b/src/WSI/VkSurfaceKHR.hpp
index 65f815f..4734097 100644 (file)
--- a/src/WSI/VkSurfaceKHR.hpp
+++ b/src/WSI/VkSurfaceKHR.hpp
@@ -15,7 +15,7 @@
 #ifndef SWIFTSHADER_VKSURFACEKHR_HPP_
 #define SWIFTSHADER_VKSURFACEKHR_HPP_
 
-#include "VkObject.hpp"
+#include "Vulkan/VkObject.hpp"
 #include <vulkan/vulkan.h>
 #include <vector>
 

diff --git a/src/WSI/XlibSurfaceKHR.hpp b/src/WSI/XlibSurfaceKHR.hpp
index 150ea4b..56540fe 100644 (file)
--- a/src/WSI/XlibSurfaceKHR.hpp
+++ b/src/WSI/XlibSurfaceKHR.hpp
@@ -15,7 +15,7 @@
 #ifndef SWIFTSHADER_XLIBSURFACEKHR_HPP
 #define SWIFTSHADER_XLIBSURFACEKHR_HPP
 
-#include "VkObject.hpp"
+#include "Vulkan/VkObject.hpp"
 #include "libX11.hpp"
 #include "VkSurfaceKHR.hpp"