[vulkan] Fix build errors from v1.2.174 ecosystem update.
Change-Id: I4bd25f75bcb1299ab89bc4bd2c24dc66687dfde8
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/Vulkan-ValidationLayers/+/518823
Reviewed-by: John Bauman <jbauman@google.com>
diff --git a/BUILD.gn b/BUILD.gn
index 8b053d8..53997c7 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -72,12 +72,12 @@
"layers/buffer_validation.h",
"layers/convert_to_renderpass2.cpp",
"layers/convert_to_renderpass2.h",
+ "layers/core_error_location.cpp",
+ "layers/core_error_location.h",
"layers/core_validation.cpp",
"layers/core_validation.h",
"layers/core_validation_error_enums.h",
"layers/core_validation_types.h",
- "layers/core_error_location.cpp",
- "layers/core_error_location.h",
"layers/descriptor_sets.cpp",
"layers/descriptor_sets.h",
"layers/drawdispatch.cpp",
@@ -86,10 +86,6 @@
"layers/generated/spirv_validation_helper.cpp",
"layers/generated/synchronization_validation_types.cpp",
"layers/generated/synchronization_validation_types.h",
- "layers/sync_utils.cpp",
- "layers/sync_utils.h",
- "layers/sync_vuid_maps.cpp",
- "layers/sync_vuid_maps.h",
"layers/gpu_utils.cpp",
"layers/gpu_utils.h",
"layers/gpu_validation.cpp",
@@ -104,6 +100,10 @@
"layers/state_tracker.h",
"layers/subresource_adapter.cpp",
"layers/subresource_adapter.h",
+ "layers/sync_utils.cpp",
+ "layers/sync_utils.h",
+ "layers/sync_vuid_maps.cpp",
+ "layers/sync_vuid_maps.h",
"layers/synchronization_validation.cpp",
"layers/synchronization_validation.h",
]
@@ -179,12 +179,8 @@
action("vulkan_gen_json_files") {
script = "build-gn/generate_vulkan_layers_json.py"
- json_names = [
- "VkLayer_khronos_validation.json",
- ]
- sources = [
- "$vulkan_headers_dir/include/vulkan/vulkan_core.h",
- ]
+ json_names = [ "VkLayer_khronos_validation.json" ]
+ sources = [ "$vulkan_headers_dir/include/vulkan/vulkan_core.h" ]
outputs = []
foreach(json_name, json_names) {
sources += [ "layers/json/$json_name.in" ]
@@ -212,6 +208,7 @@
if (is_fuchsia) {
args += [ "--no-path-prefix" ]
}
+
# The layer JSON files are part of the necessary data deps.
data = outputs
}
@@ -253,7 +250,10 @@
"layers/xxhash.h",
]
if (is_fuchsia) {
- sources += [ "layers/vk_layer_utils_minimal.cpp", "layers/vk_layer_utils_minimal.h" ]
+ sources += [
+ "layers/vk_layer_utils_minimal.cpp",
+ "layers/vk_layer_utils_minimal.h",
+ ]
}
public_configs = [
"$vulkan_headers_dir:vulkan_headers_config",
@@ -263,9 +263,7 @@
configs -= vulkan_undefine_configs
if (is_fuchsia) {
- public_deps += [
- "//third_party/Vulkan-Loader:dlopen_fuchsia",
- ]
+ public_deps += [ "//third_party/Vulkan-Loader:dlopen_fuchsia" ]
} else if (build_with_chromium) {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -273,9 +271,7 @@
}
config("vulkan_core_validation_config") {
- include_dirs = [
- "$vvl_glslang_dir",
- ]
+ include_dirs = [ "$vvl_glslang_dir" ]
}
source_set("vulkan_core_validation_glslang") {
@@ -313,14 +309,12 @@
} else if (build_with_chromium) {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
- configs += [ "//build/config/compiler:rtti"]
}
+ configs += [ "//build/config:rtti" ]
configs -= vulkan_undefine_configs
configs += [ ":generated_layers_config" ]
public_configs = [ ":vulkan_layer_config" ]
- deps = [
- ":vulkan_layer_utils",
- ]
+ deps = [ ":vulkan_layer_utils" ]
if (layer_info[2] != "") {
deps += layer_info[2]
}
@@ -359,36 +353,6 @@
}
}
-source_set("micro_layer_common") {
- # For layers defined outside this repo
- public_configs = [ ":vulkan_layer_config" ]
-
- sources = [
- "$vulkan_headers_dir/include/vulkan/vk_layer.h",
- "$vulkan_headers_dir/include/vulkan/vk_sdk_platform.h",
- "$vulkan_headers_dir/include/vulkan/vulkan.h",
- "layers/vk_format_utils.cpp",
- "layers/vk_format_utils.h",
- "layers/vk_layer_extension_utils.cpp",
- "layers/vk_layer_extension_utils.h",
- "layers/vk_layer_utils_minimal.cpp",
- "layers/vk_layer_utils_minimal.h",
- ]
- public_configs += [
- ":vulkan_internal_config",
- ]
- public_deps = [ "$vulkan_headers_dir:vulkan_headers" ]
- configs -= vulkan_undefine_configs
- if (is_fuchsia) {
- public_deps += [
- "//third_party/Vulkan-Loader:dlopen_fuchsia",
- ]
- } else if (build_with_chromium) {
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [ "//build/config/compiler:no_chromium_code" ]
- }
-}
-
group("tests") {
# TODO(MA-684)
}
diff --git a/layers/core_validation.h b/layers/core_validation.h
index b6e2ec0..322665a 100644
--- a/layers/core_validation.h
+++ b/layers/core_validation.h
@@ -1280,20 +1280,17 @@
bool PreCallValidateFlushMappedMemoryRanges(VkDevice device, uint32_t memRangeCount,
const VkMappedMemoryRange* pMemRanges) const override;
bool PreCallValidateInvalidateMappedMemoryRanges(VkDevice device, uint32_t memRangeCount,
- const VkMappedMemoryRange* pMemRanges) const;
- void PostCallRecordInvalidateMappedMemoryRanges(VkDevice device, uint32_t memRangeCount, const VkMappedMemoryRange* pMemRanges,
- VkResult result);
+ const VkMappedMemoryRange* pMemRanges) const override;
#ifdef VK_USE_PLATFORM_FUCHSIA
bool PreCallValidateImportSemaphoreZirconHandleFUCHSIA(
- VkDevice device, const VkImportSemaphoreZirconHandleInfoFUCHSIA* pImportSemaphoreZirconHandleInfo) const;
+ VkDevice device, const VkImportSemaphoreZirconHandleInfoFUCHSIA* pImportSemaphoreZirconHandleInfo) const override;
void PostCallRecordImportSemaphoreZirconHandleFUCHSIA(
- VkDevice device, const VkImportSemaphoreZirconHandleInfoFUCHSIA* pImportSemaphoreZirconHandleInfo, VkResult result);
+ VkDevice device, const VkImportSemaphoreZirconHandleInfoFUCHSIA* pImportSemaphoreZirconHandleInfo, VkResult result) override;
void PostCallRecordGetSemaphoreZirconHandleFUCHSIA(VkDevice device,
const VkSemaphoreGetZirconHandleInfoFUCHSIA* pGetZirconHandleInfo,
- zx_handle_t* pZirconHandle, VkResult result);
+ zx_handle_t* pZirconHandle, VkResult result) override;
#endif
- const VkMappedMemoryRange* pMemRanges) const override;
bool PreCallValidateBindImageMemory(VkDevice device, VkImage image, VkDeviceMemory mem,
VkDeviceSize memoryOffset) const override;
bool PreCallValidateBindImageMemory2(VkDevice device, uint32_t bindInfoCount,
diff --git a/layers/state_tracker.h b/layers/state_tracker.h
index 672952d..a5a90de 100644
--- a/layers/state_tracker.h
+++ b/layers/state_tracker.h
@@ -1234,7 +1234,7 @@
#ifdef VK_USE_PLATFORM_FUCHSIA
void PostCallRecordCreateImagePipeSurfaceFUCHSIA(VkInstance instance, const VkImagePipeSurfaceCreateInfoFUCHSIA* pCreateInfo,
const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface,
- VkResult result);
+ VkResult result) override;
#endif // VK_USE_PLATFORM_FUCHSIA
#ifdef VK_USE_PLATFORM_IOS_MVK
void PostCallRecordCreateIOSSurfaceMVK(VkInstance instance, const VkIOSSurfaceCreateInfoMVK* pCreateInfo,
