misc: Update to header version 1.0.6
Change-Id: Idf7a9d40278b796e16effa54e9b60668d275b8ec
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index aa6c38a..501f387 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -163,7 +163,7 @@
};
static const VkLayerProperties cv_global_layers[] = {{
- "VK_LAYER_LUNARG_core_validation", VK_API_VERSION, 1, "LunarG Validation Layer",
+ "VK_LAYER_LUNARG_core_validation", VK_LAYER_API_VERSION, 1, "LunarG Validation Layer",
}};
template <class TCreateInfo> void ValidateLayerOrdering(const TCreateInfo &createInfo) {
@@ -4825,7 +4825,7 @@
// TODO: Why does this exist - can we just use global?
static const VkLayerProperties cv_device_layers[] = {{
- "VK_LAYER_LUNARG_core_validation", VK_API_VERSION, 1, "LunarG Validation Layer",
+ "VK_LAYER_LUNARG_core_validation", VK_LAYER_API_VERSION, 1, "LunarG Validation Layer",
}};
VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice,
diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp
index cda1ae7..ff761f6 100644
--- a/layers/device_limits.cpp
+++ b/layers/device_limits.cpp
@@ -118,7 +118,7 @@
}
static const VkLayerProperties dl_global_layers[] = {{
- "VK_LAYER_LUNARG_device_limits", VK_API_VERSION, 1, "LunarG Validation Layer",
+ "VK_LAYER_LUNARG_device_limits", VK_LAYER_API_VERSION, 1, "LunarG Validation Layer",
}};
VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL
diff --git a/layers/image.cpp b/layers/image.cpp
index 409bcb9..a95584e 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -211,7 +211,7 @@
}
static const VkLayerProperties pc_global_layers[] = {{
- "VK_LAYER_LUNARG_image", VK_API_VERSION, 1, "LunarG Validation Layer",
+ "VK_LAYER_LUNARG_image", VK_LAYER_API_VERSION, 1, "LunarG Validation Layer",
}};
VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL
diff --git a/layers/linux/VkLayer_core_validation.json b/layers/linux/VkLayer_core_validation.json
index adccb56..e819cc1 100644
--- a/layers/linux/VkLayer_core_validation.json
+++ b/layers/linux/VkLayer_core_validation.json
@@ -4,7 +4,7 @@
"name": "VK_LAYER_LUNARG_core_validation",
"type": "GLOBAL",
"library_path": "./libVkLayer_core_validation.so",
- "api_version": "1.0.5",
+ "api_version": "1.0.6",
"implementation_version": "1",
"description": "LunarG Validation Layer",
"instance_extensions": [
diff --git a/layers/linux/VkLayer_device_limits.json b/layers/linux/VkLayer_device_limits.json
index 29911c3..1974af6 100644
--- a/layers/linux/VkLayer_device_limits.json
+++ b/layers/linux/VkLayer_device_limits.json
@@ -4,7 +4,7 @@
"name": "VK_LAYER_LUNARG_device_limits",
"type": "GLOBAL",
"library_path": "./libVkLayer_device_limits.so",
- "api_version": "1.0.5",
+ "api_version": "1.0.6",
"implementation_version": "1",
"description": "LunarG Validation Layer",
"instance_extensions": [
diff --git a/layers/linux/VkLayer_image.json b/layers/linux/VkLayer_image.json
index 344f3e3..6caf23a 100644
--- a/layers/linux/VkLayer_image.json
+++ b/layers/linux/VkLayer_image.json
@@ -4,7 +4,7 @@
"name": "VK_LAYER_LUNARG_image",
"type": "GLOBAL",
"library_path": "./libVkLayer_image.so",
- "api_version": "1.0.5",
+ "api_version": "1.0.6",
"implementation_version": "1",
"description": "LunarG Validation Layer",
"instance_extensions": [
diff --git a/layers/linux/VkLayer_object_tracker.json b/layers/linux/VkLayer_object_tracker.json
index b4cc615..42b9758 100644
--- a/layers/linux/VkLayer_object_tracker.json
+++ b/layers/linux/VkLayer_object_tracker.json
@@ -4,7 +4,7 @@
"name": "VK_LAYER_LUNARG_object_tracker",
"type": "GLOBAL",
"library_path": "./libVkLayer_object_tracker.so",
- "api_version": "1.0.5",
+ "api_version": "1.0.6",
"implementation_version": "1",
"description": "LunarG Validation Layer",
"instance_extensions": [
diff --git a/layers/linux/VkLayer_parameter_validation.json b/layers/linux/VkLayer_parameter_validation.json
index a268ce4..a9d1fa1 100644
--- a/layers/linux/VkLayer_parameter_validation.json
+++ b/layers/linux/VkLayer_parameter_validation.json
@@ -4,7 +4,7 @@
"name": "VK_LAYER_LUNARG_parameter_validation",
"type": "GLOBAL",
"library_path": "./libVkLayer_parameter_validation.so",
- "api_version": "1.0.5",
+ "api_version": "1.0.6",
"implementation_version": "1",
"description": "LunarG Validation Layer",
"instance_extensions": [
diff --git a/layers/linux/VkLayer_swapchain.json b/layers/linux/VkLayer_swapchain.json
index b514958..c9e2845 100644
--- a/layers/linux/VkLayer_swapchain.json
+++ b/layers/linux/VkLayer_swapchain.json
@@ -4,7 +4,7 @@
"name": "VK_LAYER_LUNARG_swapchain",
"type": "GLOBAL",
"library_path": "./libVkLayer_swapchain.so",
- "api_version": "1.0.5",
+ "api_version": "1.0.6",
"implementation_version": "1",
"description": "LunarG Validation Layer",
"instance_extensions": [
diff --git a/layers/linux/VkLayer_threading.json b/layers/linux/VkLayer_threading.json
index 948b6c8..5c1f3eb 100644
--- a/layers/linux/VkLayer_threading.json
+++ b/layers/linux/VkLayer_threading.json
@@ -4,7 +4,7 @@
"name": "VK_LAYER_GOOGLE_threading",
"type": "GLOBAL",
"library_path": "./libVkLayer_threading.so",
- "api_version": "1.0.5",
+ "api_version": "1.0.6",
"implementation_version": "1",
"description": "Google Validation Layer",
"instance_extensions": [
diff --git a/layers/linux/VkLayer_unique_objects.json b/layers/linux/VkLayer_unique_objects.json
index 2e29d73..3466740 100644
--- a/layers/linux/VkLayer_unique_objects.json
+++ b/layers/linux/VkLayer_unique_objects.json
@@ -4,7 +4,7 @@
"name": "VK_LAYER_GOOGLE_unique_objects",
"type": "GLOBAL",
"library_path": "./libVkLayer_unique_objects.so",
- "api_version": "1.0.5",
+ "api_version": "1.0.6",
"implementation_version": "1",
"description": "Google Validation Layer"
}
diff --git a/layers/parameter_validation.cpp b/layers/parameter_validation.cpp
index 092bd8b..4302e9c 100644
--- a/layers/parameter_validation.cpp
+++ b/layers/parameter_validation.cpp
@@ -136,7 +136,7 @@
}
static const VkLayerProperties pc_global_layers[] = {{
- "VK_LAYER_LUNARG_parameter_validation", VK_API_VERSION, 1, "LunarG Validation Layer",
+ "VK_LAYER_LUNARG_parameter_validation", VK_LAYER_API_VERSION, 1, "LunarG Validation Layer",
}};
VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL
diff --git a/layers/swapchain.cpp b/layers/swapchain.cpp
index 3134e36..d513208 100644
--- a/layers/swapchain.cpp
+++ b/layers/swapchain.cpp
@@ -63,7 +63,7 @@
}
static const VkLayerProperties swapchain_layers[] = {{
- "VK_LAYER_LUNARG_swapchain", VK_API_VERSION, 1, "LunarG Validation Layer",
+ "VK_LAYER_LUNARG_swapchain", VK_LAYER_API_VERSION, 1, "LunarG Validation Layer",
}};
VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL
diff --git a/layers/threading.cpp b/layers/threading.cpp
index e7c4b39..a75bcdc 100644
--- a/layers/threading.cpp
+++ b/layers/threading.cpp
@@ -160,7 +160,7 @@
static const VkLayerProperties globalLayerProps[] = {{
"VK_LAYER_GOOGLE_threading",
- VK_API_VERSION, // specVersion
+ VK_LAYER_API_VERSION, // specVersion
1, "Google Validation Layer",
}};
@@ -170,7 +170,7 @@
static const VkLayerProperties deviceLayerProps[] = {{
"VK_LAYER_GOOGLE_threading",
- VK_API_VERSION, // specVersion
+ VK_LAYER_API_VERSION, // specVersion
1, "Google Validation Layer",
}};
diff --git a/layers/unique_objects.h b/layers/unique_objects.h
index 4200844..b8effcf 100644
--- a/layers/unique_objects.h
+++ b/layers/unique_objects.h
@@ -43,6 +43,7 @@
#include "vk_layer_logging.h"
#include "vk_layer_extension_utils.h"
#include "vk_safe_struct.h"
+#include "vk_layer_utils.h"
struct layer_data {
bool wsi_enabled;
diff --git a/layers/vk_layer_utils.h b/layers/vk_layer_utils.h
index 1dc2e0e..d349ffe 100644
--- a/layers/vk_layer_utils.h
+++ b/layers/vk_layer_utils.h
@@ -40,6 +40,7 @@
extern "C" {
#endif
+#define VK_LAYER_API_VERSION (VK_VERSION_MAJOR(1) | VK_VERSION_MINOR(0) | VK_VERSION_PATCH(VK_HEADER_VERSION))
typedef enum VkFormatCompatibilityClass {
VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT = 0,
VK_FORMAT_COMPATIBILITY_CLASS_8_BIT = 1,
diff --git a/layers/windows/VkLayer_core_validation.json b/layers/windows/VkLayer_core_validation.json
index b21a8df..4fbae55 100644
--- a/layers/windows/VkLayer_core_validation.json
+++ b/layers/windows/VkLayer_core_validation.json
@@ -4,7 +4,7 @@
"name": "VK_LAYER_LUNARG_core_validation",
"type": "GLOBAL",
"library_path": ".\\VkLayer_core_validation.dll",
- "api_version": "1.0.5",
+ "api_version": "1.0.6",
"implementation_version": "1",
"description": "LunarG Validation Layer",
"instance_extensions": [
diff --git a/layers/windows/VkLayer_device_limits.json b/layers/windows/VkLayer_device_limits.json
index d3313bf..79c744a 100644
--- a/layers/windows/VkLayer_device_limits.json
+++ b/layers/windows/VkLayer_device_limits.json
@@ -4,7 +4,7 @@
"name": "VK_LAYER_LUNARG_device_limits",
"type": "GLOBAL",
"library_path": ".\\VkLayer_device_limits.dll",
- "api_version": "1.0.5",
+ "api_version": "1.0.6",
"implementation_version": "1",
"description": "LunarG Validation Layer",
"instance_extensions": [
diff --git a/layers/windows/VkLayer_image.json b/layers/windows/VkLayer_image.json
index c06b98f..dbcbfb2 100644
--- a/layers/windows/VkLayer_image.json
+++ b/layers/windows/VkLayer_image.json
@@ -4,7 +4,7 @@
"name": "VK_LAYER_LUNARG_image",
"type": "GLOBAL",
"library_path": ".\\VkLayer_image.dll",
- "api_version": "1.0.5",
+ "api_version": "1.0.6",
"implementation_version": "1",
"description": "LunarG Validation Layer",
"instance_extensions": [
diff --git a/layers/windows/VkLayer_object_tracker.json b/layers/windows/VkLayer_object_tracker.json
index 51c1145..04c2809 100644
--- a/layers/windows/VkLayer_object_tracker.json
+++ b/layers/windows/VkLayer_object_tracker.json
@@ -4,7 +4,7 @@
"name": "VK_LAYER_LUNARG_object_tracker",
"type": "GLOBAL",
"library_path": ".\\VkLayer_object_tracker.dll",
- "api_version": "1.0.5",
+ "api_version": "1.0.6",
"implementation_version": "1",
"description": "LunarG Validation Layer",
"instance_extensions": [
diff --git a/layers/windows/VkLayer_parameter_validation.json b/layers/windows/VkLayer_parameter_validation.json
index 84245d2..8d75f27 100644
--- a/layers/windows/VkLayer_parameter_validation.json
+++ b/layers/windows/VkLayer_parameter_validation.json
@@ -4,7 +4,7 @@
"name": "VK_LAYER_LUNARG_parameter_validation",
"type": "GLOBAL",
"library_path": ".\\VkLayer_parameter_validation.dll",
- "api_version": "1.0.5",
+ "api_version": "1.0.6",
"implementation_version": "1",
"description": "LunarG Validation Layer",
"instance_extensions": [
diff --git a/layers/windows/VkLayer_swapchain.json b/layers/windows/VkLayer_swapchain.json
index 1e058b6..52feca2 100644
--- a/layers/windows/VkLayer_swapchain.json
+++ b/layers/windows/VkLayer_swapchain.json
@@ -4,7 +4,7 @@
"name": "VK_LAYER_LUNARG_swapchain",
"type": "GLOBAL",
"library_path": ".\\VkLayer_swapchain.dll",
- "api_version": "1.0.5",
+ "api_version": "1.0.6",
"implementation_version": "1",
"description": "LunarG Validation Layer",
"instance_extensions": [
diff --git a/layers/windows/VkLayer_threading.json b/layers/windows/VkLayer_threading.json
index bfc686f..228a148 100644
--- a/layers/windows/VkLayer_threading.json
+++ b/layers/windows/VkLayer_threading.json
@@ -4,7 +4,7 @@
"name": "VK_LAYER_GOOGLE_threading",
"type": "GLOBAL",
"library_path": ".\\VkLayer_threading.dll",
- "api_version": "1.0.5",
+ "api_version": "1.0.6",
"implementation_version": "1",
"description": "Google Validation Layer",
"instance_extensions": [
diff --git a/layers/windows/VkLayer_unique_objects.json b/layers/windows/VkLayer_unique_objects.json
index 2383e1a..11f5343 100644
--- a/layers/windows/VkLayer_unique_objects.json
+++ b/layers/windows/VkLayer_unique_objects.json
@@ -4,7 +4,7 @@
"name": "VK_LAYER_GOOGLE_unique_objects",
"type": "GLOBAL",
"library_path": ".\\VkLayer_unique_objects.dll",
- "api_version": "1.0.5",
+ "api_version": "1.0.6",
"implementation_version": "1",
"description": "Google Validation Layer"
}