Skip to content

S
swiftshader
Commit 37c024a6 by Nicolas Capens Committed by Nicolas Capens
Options

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/25948Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
parent dd1e37e3
Showing with 2 additions and 3 deletions
CMakeLists.txt
...@@ -1929,7 +1929,6 @@ set(OPENGL_INCLUDE_DIR ...@@ -1929,7 +1929,6 @@ set(OPENGL_INCLUDE_DIR
) )
set(VULKAN_INCLUDE_DIR set(VULKAN_INCLUDE_DIR
${VULKAN_DIR}
${COMMON_INCLUDE_DIR} ${COMMON_INCLUDE_DIR}
) )
......
src/WSI/VkSurfaceKHR.hpp
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#ifndef SWIFTSHADER_VKSURFACEKHR_HPP_ #ifndef SWIFTSHADER_VKSURFACEKHR_HPP_
#define SWIFTSHADER_VKSURFACEKHR_HPP_ #define SWIFTSHADER_VKSURFACEKHR_HPP_
#include "VkObject.hpp" #include "Vulkan/VkObject.hpp"
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
#include <vector> #include <vector>
......
src/WSI/XlibSurfaceKHR.hpp
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#ifndef SWIFTSHADER_XLIBSURFACEKHR_HPP #ifndef SWIFTSHADER_XLIBSURFACEKHR_HPP
#define SWIFTSHADER_XLIBSURFACEKHR_HPP #define SWIFTSHADER_XLIBSURFACEKHR_HPP
#include "VkObject.hpp" #include "Vulkan/VkObject.hpp"
#include "libX11.hpp" #include "libX11.hpp"
#include "VkSurfaceKHR.hpp" #include "VkSurfaceKHR.hpp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment