misc: Update to header version 1.0.4

Change-Id: I61657dc28c7850075b787413955a6c880447a03d

17 files changed, 30 insertions, 24 deletions

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index cd6a71ac..e195151a 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -1,5 +1,5 @@
-#ifndef __vulkan_h_
-#define __vulkan_h_ 1
+#ifndef VULKAN_H_
+#define VULKAN_H_ 1
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,7 +41,7 @@ extern "C" {
     (((major) << 22) | ((minor) << 12) | (patch))
 
 // Vulkan API version supported by this file
-#define VK_API_VERSION VK_MAKE_VERSION(1, 0, 3)
+#define VK_API_VERSION VK_MAKE_VERSION(1, 0, 4)
 
 #define VK_VERSION_MAJOR(version) ((uint32_t)(version) >> 22)
 #define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff)
@@ -209,7 +209,7 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR = 1000007000,
     VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR = 1000008000,
     VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR = 1000009000,
-    VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT = 1000011000,
+    VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT = 1000011000,
     VK_STRUCTURE_TYPE_BEGIN_RANGE = VK_STRUCTURE_TYPE_APPLICATION_INFO,
     VK_STRUCTURE_TYPE_END_RANGE = VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO,
     VK_STRUCTURE_TYPE_RANGE_SIZE = (VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO - VK_STRUCTURE_TYPE_APPLICATION_INFO + 1),
@@ -701,8 +701,8 @@ typedef enum VkSamplerAddressMode {
     VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER = 3,
     VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE = 4,
     VK_SAMPLER_ADDRESS_MODE_BEGIN_RANGE = VK_SAMPLER_ADDRESS_MODE_REPEAT,
-    VK_SAMPLER_ADDRESS_MODE_END_RANGE = VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE,
-    VK_SAMPLER_ADDRESS_MODE_RANGE_SIZE = (VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE - VK_SAMPLER_ADDRESS_MODE_REPEAT + 1),
+    VK_SAMPLER_ADDRESS_MODE_END_RANGE = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER,
+    VK_SAMPLER_ADDRESS_MODE_RANGE_SIZE = (VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER - VK_SAMPLER_ADDRESS_MODE_REPEAT + 1),
     VK_SAMPLER_ADDRESS_MODE_MAX_ENUM = 0x7FFFFFFF
 } VkSamplerAddressMode;
 
@@ -3326,8 +3326,8 @@ typedef enum VkDisplayPlaneAlphaFlagBitsKHR {
     VK_DISPLAY_PLANE_ALPHA_PER_PIXEL_BIT_KHR = 0x00000004,
     VK_DISPLAY_PLANE_ALPHA_PER_PIXEL_PREMULTIPLIED_BIT_KHR = 0x00000008,
 } VkDisplayPlaneAlphaFlagBitsKHR;
-typedef VkFlags VkDisplayModeCreateFlagsKHR;
 typedef VkFlags VkDisplayPlaneAlphaFlagsKHR;
+typedef VkFlags VkDisplayModeCreateFlagsKHR;
 typedef VkFlags VkDisplaySurfaceCreateFlagsKHR;
 
 typedef struct VkDisplayPropertiesKHR {
@@ -3667,11 +3667,17 @@ VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceWin32PresentationSupportKHR(
 #endif
 #endif /* VK_USE_PLATFORM_WIN32_KHR */
 
+#define VK_KHR_sampler_mirror_clamp_to_edge 1
+#define VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_SPEC_VERSION 1
+#define VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME "VK_KHR_sampler_mirror_clamp_to_edge"
+
+
 #define VK_EXT_debug_report 1
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackEXT)
 
-#define VK_EXT_DEBUG_REPORT_SPEC_VERSION  1
+#define VK_EXT_DEBUG_REPORT_SPEC_VERSION  2
 #define VK_EXT_DEBUG_REPORT_EXTENSION_NAME "VK_EXT_debug_report"
+#define VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT
 
 
 typedef enum VkDebugReportObjectTypeEXT {
diff --git a/layers/linux/VkLayer_device_limits.json b/layers/linux/VkLayer_device_limits.json
index cc58efcf..bd698d5c 100644
--- a/layers/linux/VkLayer_device_limits.json
+++ b/layers/linux/VkLayer_device_limits.json
@@ -10,7 +10,7 @@
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
-                 "spec_version": "1"
+                 "spec_version": "2"
              }
          ]
     }
diff --git a/layers/linux/VkLayer_draw_state.json b/layers/linux/VkLayer_draw_state.json
index 32baf31d..2acf36ce 100644
--- a/layers/linux/VkLayer_draw_state.json
+++ b/layers/linux/VkLayer_draw_state.json
@@ -10,7 +10,7 @@
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
-                 "spec_version": "1"
+                 "spec_version": "2"
              }
          ]
     }
diff --git a/layers/linux/VkLayer_image.json b/layers/linux/VkLayer_image.json
index 19796fdd..21c4900d 100644
--- a/layers/linux/VkLayer_image.json
+++ b/layers/linux/VkLayer_image.json
@@ -10,7 +10,7 @@
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
-                 "spec_version": "1"
+                 "spec_version": "2"
              }
          ]
     }
diff --git a/layers/linux/VkLayer_mem_tracker.json b/layers/linux/VkLayer_mem_tracker.json
index a4abe044..fae6aa91 100644
--- a/layers/linux/VkLayer_mem_tracker.json
+++ b/layers/linux/VkLayer_mem_tracker.json
@@ -10,7 +10,7 @@
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
-                 "spec_version": "1"
+                 "spec_version": "2"
              }
          ]
     }
diff --git a/layers/linux/VkLayer_object_tracker.json b/layers/linux/VkLayer_object_tracker.json
index 606f861d..99530290 100644
--- a/layers/linux/VkLayer_object_tracker.json
+++ b/layers/linux/VkLayer_object_tracker.json
@@ -10,7 +10,7 @@
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
-                 "spec_version": "1"
+                 "spec_version": "2"
              }
          ]
     }
diff --git a/layers/linux/VkLayer_param_checker.json b/layers/linux/VkLayer_param_checker.json
index f568139c..5bec79c0 100644
--- a/layers/linux/VkLayer_param_checker.json
+++ b/layers/linux/VkLayer_param_checker.json
@@ -10,7 +10,7 @@
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
-                 "spec_version": "1"
+                 "spec_version": "2"
              }
          ]
     }
diff --git a/layers/linux/VkLayer_swapchain.json b/layers/linux/VkLayer_swapchain.json
index 71e1b44b..821548c6 100644
--- a/layers/linux/VkLayer_swapchain.json
+++ b/layers/linux/VkLayer_swapchain.json
@@ -10,7 +10,7 @@
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
-                 "spec_version": "1"
+                 "spec_version": "2"
              }
          ]
     }
diff --git a/layers/linux/VkLayer_threading.json b/layers/linux/VkLayer_threading.json
index 1558e5f7..7940fd79 100644
--- a/layers/linux/VkLayer_threading.json
+++ b/layers/linux/VkLayer_threading.json
@@ -10,7 +10,7 @@
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
-                 "spec_version": "1"
+                 "spec_version": "2"
              }
          ]
     }
diff --git a/layers/windows/VkLayer_device_limits.json b/layers/windows/VkLayer_device_limits.json
index 2f12df88..887916f1 100644
--- a/layers/windows/VkLayer_device_limits.json
+++ b/layers/windows/VkLayer_device_limits.json
@@ -10,7 +10,7 @@
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
-                 "spec_version": "1"
+                 "spec_version": "2"
              }
          ]
     }
diff --git a/layers/windows/VkLayer_draw_state.json b/layers/windows/VkLayer_draw_state.json
index 99fc5d65..05489cf6 100644
--- a/layers/windows/VkLayer_draw_state.json
+++ b/layers/windows/VkLayer_draw_state.json
@@ -10,7 +10,7 @@
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
-                 "spec_version": "1"
+                 "spec_version": "2"
              }
          ]
     }
diff --git a/layers/windows/VkLayer_image.json b/layers/windows/VkLayer_image.json
index 94db9a86..f440454d 100644
--- a/layers/windows/VkLayer_image.json
+++ b/layers/windows/VkLayer_image.json
@@ -10,7 +10,7 @@
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
-                 "spec_version": "1"
+                 "spec_version": "2"
              }
          ]
     }
diff --git a/layers/windows/VkLayer_mem_tracker.json b/layers/windows/VkLayer_mem_tracker.json
index 34e7a9ad..c159f77c 100644
--- a/layers/windows/VkLayer_mem_tracker.json
+++ b/layers/windows/VkLayer_mem_tracker.json
@@ -10,7 +10,7 @@
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
-                 "spec_version": "1"
+                 "spec_version": "2"
              }
          ]
     }
diff --git a/layers/windows/VkLayer_object_tracker.json b/layers/windows/VkLayer_object_tracker.json
index 98d977d3..f3ff33cf 100644
--- a/layers/windows/VkLayer_object_tracker.json
+++ b/layers/windows/VkLayer_object_tracker.json
@@ -10,7 +10,7 @@
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
-                 "spec_version": "1"
+                 "spec_version": "2"
              }
          ]
     }
diff --git a/layers/windows/VkLayer_param_checker.json b/layers/windows/VkLayer_param_checker.json
index 049319f8..81b1b032 100644
--- a/layers/windows/VkLayer_param_checker.json
+++ b/layers/windows/VkLayer_param_checker.json
@@ -10,7 +10,7 @@
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
-                 "spec_version": "1"
+                 "spec_version": "2"
              }
          ]
     }
diff --git a/layers/windows/VkLayer_swapchain.json b/layers/windows/VkLayer_swapchain.json
index 557c3b6d..38de5f11 100644
--- a/layers/windows/VkLayer_swapchain.json
+++ b/layers/windows/VkLayer_swapchain.json
@@ -10,7 +10,7 @@
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
-                 "spec_version": "1"
+                 "spec_version": "2"
              }
          ]
     }
diff --git a/layers/windows/VkLayer_threading.json b/layers/windows/VkLayer_threading.json
index 24fb65e9..7e3a4bc7 100644
--- a/layers/windows/VkLayer_threading.json
+++ b/layers/windows/VkLayer_threading.json
@@ -10,7 +10,7 @@
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
-                 "spec_version": "1"
+                 "spec_version": "2"
              }
          ]
     }