misc: Update to header version 1.0.6

Change-Id: Idf7a9d40278b796e16effa54e9b60668d275b8ec

diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index e6fe59c..5505b87 100644 (file)
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -1178,9 +1178,9 @@ int main(int argc, char **argv) {
         ConsoleEnlarge();
 #endif
 
-    major = VK_API_VERSION >> 22;
-    minor = (VK_API_VERSION >> 12) & 0x3ff;
-    patch = VK_API_VERSION & 0xfff;
+    major = VK_API_VERSION_1_0 >> 22;
+    minor = (VK_API_VERSION_1_0 >> 12) & 0x3ff;
+    patch = VK_HEADER_VERSION & 0xfff;
     printf("===========\n");
     printf("VULKAN INFO\n");
     printf("===========\n\n");

diff --git a/include/vulkan/vk_platform.h b/include/vulkan/vk_platform.h
index 075a18c..f5a5243 100644 (file)
--- a/include/vulkan/vk_platform.h
+++ b/include/vulkan/vk_platform.h
@@ -2,7 +2,7 @@
 // File: vk_platform.h
 //
 /*
-** Copyright (c) 2014-2016 The Khronos Group Inc.
+** Copyright (c) 2014-2015 The Khronos Group Inc.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and/or associated documentation files (the
@@ -25,8 +25,8 @@
 */
 
 
-#ifndef __VK_PLATFORM_H__
-#define __VK_PLATFORM_H__
+#ifndef VK_PLATFORM_H_
+#define VK_PLATFORM_H_
 
 #ifdef __cplusplus
 extern "C"
@@ -124,4 +124,4 @@ extern "C"
 #include <xcb/xcb.h>
 #endif
 
-#endif // __VK_PLATFORM_H__
+#endif

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index f57c4d9..567671a 100644 (file)
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -40,12 +40,18 @@ extern "C" {
 #define VK_MAKE_VERSION(major, minor, patch) \
     (((major) << 22) | ((minor) << 12) | (patch))
 
-// Vulkan API version supported by this file
-#define VK_API_VERSION VK_MAKE_VERSION(1, 0, 5)
+// DEPRECATED: This define has been removed. Specific version defines (e.g. VK_API_VERSION_1_0), or the VK_MAKE_VERSION macro, should be used instead.
+//#define VK_API_VERSION VK_MAKE_VERSION(1, 0, 0)
+
+// Vulkan 1.0 version number
+#define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0)
 
 #define VK_VERSION_MAJOR(version) ((uint32_t)(version) >> 22)
 #define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff)
 #define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff)
+// Version of this file
+#define VK_HEADER_VERSION 6
+
 
 #define VK_NULL_HANDLE 0
         
@@ -680,6 +686,7 @@ typedef enum VkDynamicState {
 typedef enum VkFilter {
     VK_FILTER_NEAREST = 0,
     VK_FILTER_LINEAR = 1,
+    VK_FILTER_CUBIC_IMG = 1000015000,
     VK_FILTER_BEGIN_RANGE = VK_FILTER_NEAREST,
     VK_FILTER_END_RANGE = VK_FILTER_LINEAR,
     VK_FILTER_RANGE_SIZE = (VK_FILTER_LINEAR - VK_FILTER_NEAREST + 1),
@@ -809,6 +816,7 @@ typedef enum VkFormatFeatureFlagBits {
     VK_FORMAT_FEATURE_BLIT_SRC_BIT = 0x00000400,
     VK_FORMAT_FEATURE_BLIT_DST_BIT = 0x00000800,
     VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT = 0x00001000,
+    VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG = 0x00002000,
 } VkFormatFeatureFlagBits;
 typedef VkFlags VkFormatFeatureFlags;
 
@@ -3780,6 +3788,11 @@ VKAPI_ATTR void VKAPI_CALL vkDebugReportMessageEXT(
 #define VK_NV_GLSL_SHADER_EXTENSION_NAME  "VK_NV_glsl_shader"
 
 
+#define VK_IMG_filter_cubic 1
+#define VK_IMG_FILTER_CUBIC_SPEC_VERSION  1
+#define VK_IMG_FILTER_CUBIC_EXTENSION_NAME "VK_IMG_filter_cubic"
+
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index aa6c38a..501f387 100644 (file)
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -163,7 +163,7 @@ struct layer_data {
 };
 
 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 @@ vkEnumerateInstanceLayerProperties(uint32_t *pCount, VkLayerProperties *pPropert
 
 // 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 (file)
--- a/layers/device_limits.cpp
+++ b/layers/device_limits.cpp
@@ -118,7 +118,7 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceExtensionPropert
 }
 
 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 (file)
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -211,7 +211,7 @@ vkEnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pCount,
 }
 
 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- a/layers/parameter_validation.cpp
+++ b/layers/parameter_validation.cpp
@@ -136,7 +136,7 @@ vkEnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pCount,
 }
 
 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 (file)
--- a/layers/swapchain.cpp
+++ b/layers/swapchain.cpp
@@ -63,7 +63,7 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceExtensionPropert
 }
 
 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 (file)
--- a/layers/threading.cpp
+++ b/layers/threading.cpp
@@ -160,7 +160,7 @@ vkEnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pCount,
 
 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 @@ VK_LAYER_EXPORT VkResult VKAPI_CALL vkEnumerateInstanceLayerProperties(uint32_t
 
 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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"
     }

diff --git a/libs/vkjson/vkjson_info.cc b/libs/vkjson/vkjson_info.cc
index 67b973f..670eabb 100644 (file)
--- a/libs/vkjson/vkjson_info.cc
+++ b/libs/vkjson/vkjson_info.cc
@@ -124,7 +124,7 @@ int main(int argc, char* argv[]) {
                                       1,
                                       "",
                                       0,
-                                      VK_API_VERSION};
+                                      VK_API_VERSION_1_0};
   VkInstanceCreateInfo instance_info = {VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
                                         nullptr,
                                         0,

diff --git a/loader/loader.c b/loader/loader.c
index 104dc9e..426b1a1 100644 (file)
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1819,7 +1819,7 @@ static void loader_add_layer_property_meta(
                     sizeof(props->info.layerName));
             // TODO what about specVersion? for now insert loader's built
             // version
-            props->info.specVersion = VK_API_VERSION;
+            props->info.specVersion = VK_API_VERSION_1_0;
         }
     }
 }

diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index f2abc14..3e25a80 100755 (executable)
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -388,12 +388,12 @@ class Subcommand(object):
         ggep_body.append('    {')
         if self.layer_name in ['unique_objects']:
           ggep_body.append('        "VK_LAYER_GOOGLE_%s",' % layer)
-          ggep_body.append('        VK_API_VERSION, // specVersion')
+          ggep_body.append('        VK_LAYER_API_VERSION, // specVersion')
           ggep_body.append('        1, // implementationVersion')
           ggep_body.append('        "Google Validation Layer"')
         else:
           ggep_body.append('        "VK_LAYER_LUNARG_%s",' % layer)
-          ggep_body.append('        VK_API_VERSION, // specVersion')
+          ggep_body.append('        VK_LAYER_API_VERSION, // specVersion')
           ggep_body.append('        1, // implementationVersion')
           ggep_body.append('        "LunarG Validation Layer"')
         ggep_body.append('    }')
@@ -414,12 +414,12 @@ class Subcommand(object):
         gpdlp_body.append('    {')
         if self.layer_name in ['unique_objects']:
           gpdlp_body.append('        "VK_LAYER_GOOGLE_%s",' % layer)
-          gpdlp_body.append('        VK_API_VERSION, // specVersion')
+          gpdlp_body.append('        VK_LAYER_API_VERSION, // specVersion')
           gpdlp_body.append('        1, // implementationVersion')
           gpdlp_body.append('        "Google Validation Layer"')
         else:
           gpdlp_body.append('        "VK_LAYER_LUNARG_%s",' % layer)
-          gpdlp_body.append('        VK_API_VERSION, // specVersion')
+          gpdlp_body.append('        VK_LAYER_API_VERSION, // specVersion')
           gpdlp_body.append('        1, // implementationVersion')
           gpdlp_body.append('        "LunarG Validation Layer"')
         gpdlp_body.append('    }')