Replace vulkan.h includes with vulkan_core.h

vulkan_core.h only includes 'core' Vulkan declarations, while vulkan.h consists of vulkan_core.h plus platform-specific headers. Only Window System Integration (WSI) and closely related source files should have a need to include vulkan.h. Everything else, in particular our back-end, should not require anything Vulkan platform-specific. This avoids issues such as Xlib defining global macros which clash with C++ type and variable names. Bug b/124265819 Change-Id: I6c250f27aef39b98a2a8b677c169df060698f104 Reviewed-on: https://swiftshader-review.googlesource.com/c/24709Tested-by: Nicolas Capens <nicolascapens@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com>

Replace vulkan.h includes with vulkan_core.h
de16f327 · Nicolas Capens · Nicolas Capens · 73c3124c · de16f327 · de16f327
Commit de16f327 authored Feb 12, 2019 by Nicolas Capens Committed by Nicolas Capens Feb 13, 2019
7 changed files
--- a/src/Device/Surface.hpp
+++ b/src/Device/Surface.hpp
@@ -18,7 +18,7 @@
 #include "Color.hpp"
 #include "Device/Config.hpp"
 #include "System/Resource.hpp"
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 namespace sw
 {

--- a/src/Vulkan/VkGetProcAddress.h
+++ b/src/Vulkan/VkGetProcAddress.h
@@ -15,7 +15,7 @@
 #ifndef VK_UTILS_HPP_
 #define VK_UTILS_HPP_
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 namespace vk
 {

--- a/src/Vulkan/VkMemory.h
+++ b/src/Vulkan/VkMemory.h
@@ -15,7 +15,7 @@
 #ifndef VK_MEMORY_HPP_
 #define VK_MEMORY_HPP_
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 namespace vk
 {

--- a/src/Vulkan/VkObject.hpp
+++ b/src/Vulkan/VkObject.hpp
@@ -18,7 +18,8 @@
 #include "VkConfig.h"
 #include "VkDebug.hpp"
 #include "VkMemory.h"
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 #include <vulkan/vk_icd.h>
 namespace vk

--- a/src/Vulkan/VkPromotedExtensions.cpp
+++ b/src/Vulkan/VkPromotedExtensions.cpp
@@ -40,7 +40,7 @@
 // VK_KHR_storage_buffer_storage_class (no functions in this extension)
 // VK_KHR_variable_pointers (no functions in this extension)
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 extern "C"
 {

--- a/src/Vulkan/libVulkan.cpp
+++ b/src/Vulkan/libVulkan.cpp
--- a/tests/VulkanUnitTests/unittests.cpp
+++ b/tests/VulkanUnitTests/unittests.cpp
@@ -18,7 +18,7 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 #include <vulkan/vk_icd.h>
 #include <cstring>