Move vulkan headers from third_party to include/third_party.
Bug: skia:
Change-Id: I7174c6da075c0fd3d6238a5556439f42d6b97659
Reviewed-on: https://skia-review.googlesource.com/c/176680
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
diff --git a/BUILD.gn b/BUILD.gn
index 5b6f7e2..201b86c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -189,7 +189,7 @@
if (skia_enable_gpu) {
include_dirs += [ "src/gpu" ]
if (is_skia_dev_build && skia_use_vulkan) {
- include_dirs += [ "third_party/vulkan" ]
+ include_dirs += [ "include/third_party/vulkan" ]
include_dirs += [ "tools/gpu/vk" ]
}
}
@@ -1174,7 +1174,7 @@
# We add this directory to simulate the client already have
# vulkan/vulkan_core.h on their path.
- include_dirs = [ "third_party/vulkan" ]
+ include_dirs = [ "include/third_party/vulkan" ]
}
template("test_lib") {
@@ -1432,7 +1432,7 @@
deps += [ "//third_party/angle2" ]
sources += [ "tools/gpu/gl/angle/GLTestContext_angle.cpp" ]
}
- public_include_dirs += [ "third_party/vulkan" ]
+
if (skia_use_vulkan) {
sources += [ "tools/gpu/vk/VkTestContext.cpp" ]
sources += [ "tools/gpu/vk/VkTestUtils.cpp" ]
diff --git a/include/gpu/vk/GrVkTypes.h b/include/gpu/vk/GrVkTypes.h
index 51747f8..d3f1a5c 100644
--- a/include/gpu/vk/GrVkTypes.h
+++ b/include/gpu/vk/GrVkTypes.h
@@ -12,7 +12,7 @@
#ifdef SK_VULKAN
#include <vulkan/vulkan_core.h>
#else
-#include "../../../third_party/vulkan/vulkan/vulkan_core.h"
+#include "../../third_party/vulkan/vulkan/vulkan_core.h"
#endif
#ifndef VK_VERSION_1_1
#error Skia requires the use of Vulkan 1.1 headers
diff --git a/third_party/vulkan/LICENSE b/include/third_party/vulkan/LICENSE
similarity index 100%
rename from third_party/vulkan/LICENSE
rename to include/third_party/vulkan/LICENSE
diff --git a/third_party/vulkan/vulkan/vk_platform.h b/include/third_party/vulkan/vulkan/vk_platform.h
similarity index 100%
rename from third_party/vulkan/vulkan/vk_platform.h
rename to include/third_party/vulkan/vulkan/vk_platform.h
diff --git a/third_party/vulkan/vulkan/vulkan.h b/include/third_party/vulkan/vulkan/vulkan.h
similarity index 100%
rename from third_party/vulkan/vulkan/vulkan.h
rename to include/third_party/vulkan/vulkan/vulkan.h
diff --git a/third_party/vulkan/vulkan/vulkan_android.h b/include/third_party/vulkan/vulkan/vulkan_android.h
similarity index 100%
rename from third_party/vulkan/vulkan/vulkan_android.h
rename to include/third_party/vulkan/vulkan/vulkan_android.h
diff --git a/third_party/vulkan/vulkan/vulkan_core.h b/include/third_party/vulkan/vulkan/vulkan_core.h
similarity index 99%
rename from third_party/vulkan/vulkan/vulkan_core.h
rename to include/third_party/vulkan/vulkan/vulkan_core.h
index c27b84d..9965ed0 100644
--- a/third_party/vulkan/vulkan/vulkan_core.h
+++ b/include/third_party/vulkan/vulkan/vulkan_core.h
@@ -47,7 +47,7 @@
#define VK_NULL_HANDLE 0
-
+
#define VK_DEFINE_HANDLE(object) typedef struct object##_T* object;
@@ -60,7 +60,7 @@
#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object;
#endif
#endif
-
+
typedef uint32_t VkFlags;
diff --git a/third_party/vulkan/vulkan/vulkan_ios.h b/include/third_party/vulkan/vulkan/vulkan_ios.h
similarity index 100%
rename from third_party/vulkan/vulkan/vulkan_ios.h
rename to include/third_party/vulkan/vulkan/vulkan_ios.h
diff --git a/third_party/vulkan/vulkan/vulkan_macos.h b/include/third_party/vulkan/vulkan/vulkan_macos.h
similarity index 100%
rename from third_party/vulkan/vulkan/vulkan_macos.h
rename to include/third_party/vulkan/vulkan/vulkan_macos.h
diff --git a/third_party/vulkan/vulkan/vulkan_win32.h b/include/third_party/vulkan/vulkan/vulkan_win32.h
similarity index 100%
rename from third_party/vulkan/vulkan/vulkan_win32.h
rename to include/third_party/vulkan/vulkan/vulkan_win32.h
diff --git a/third_party/vulkan/vulkan/vulkan_xcb.h b/include/third_party/vulkan/vulkan/vulkan_xcb.h
similarity index 100%
rename from third_party/vulkan/vulkan/vulkan_xcb.h
rename to include/third_party/vulkan/vulkan/vulkan_xcb.h
diff --git a/src/gpu/vk/GrVkVulkan.h b/src/gpu/vk/GrVkVulkan.h
index 9cf1444..a44ce75 100644
--- a/src/gpu/vk/GrVkVulkan.h
+++ b/src/gpu/vk/GrVkVulkan.h
@@ -14,14 +14,14 @@
#error "Skia's private vulkan header must be included before any other vulkan header."
#endif
-#include "../../../third_party/vulkan/vulkan/vulkan_core.h"
+#include "../../third_party/vulkan/vulkan/vulkan_core.h"
#ifdef SK_BUILD_FOR_ANDROID
#ifdef VULKAN_ANDROID_H_
#error "Skia's private vulkan android header must be included before any other vulkan header."
#endif
// This is needed to get android extensions for external memory
-#include "../../../third_party/vulkan/vulkan/vulkan_android.h"
+#include "../../third_party/vulkan/vulkan/vulkan_android.h"
#endif
#endif
diff --git a/third_party/vulkanmemoryallocator/BUILD.gn b/third_party/vulkanmemoryallocator/BUILD.gn
index b865ca0..8b5115b 100644
--- a/third_party/vulkanmemoryallocator/BUILD.gn
+++ b/third_party/vulkanmemoryallocator/BUILD.gn
@@ -10,7 +10,7 @@
source_set("vulkanmemoryallocator") {
public_configs = [ ":vulkanmemoryallocator_public" ]
- include_dirs = [ "../vulkan" ]
+ include_dirs = [ "../../include/third_party/vulkan" ]
# Need to add this so when we include GrVkDefines.h it internally can find SkTypes.h which is
# needed in case the user set defines in SkUserConfig.h.
diff --git a/tools/check-headers-self-sufficient b/tools/check-headers-self-sufficient
index 59c4d79..fe8a8ac 100755
--- a/tools/check-headers-self-sufficient
+++ b/tools/check-headers-self-sufficient
@@ -30,10 +30,10 @@
'-Iinclude/ports',
'-Iinclude/private',
'-Iinclude/svg',
+ '-Iinclude/third_party/vulkan',
'-Iinclude/utils',
'-Iinclude/utils/mac',
'-Iinclude/views',
- '-Ithird_party/vulkan',
]
all_header_args = [
@@ -49,6 +49,7 @@
'-Iinclude/ports',
'-Iinclude/private',
'-Iinclude/svg',
+ '-Iinclude/third_party/vulkan',
'-Iinclude/utils',
'-Iinclude/utils/mac',
'-Iinclude/views',
@@ -82,7 +83,6 @@
'-Ithird_party/externals/sfntly/cpp/src',
'-Ithird_party/externals/zlib',
'-Ithird_party/gif',
- '-Ithird_party/vulkan',
]
ignore = [