Updated headers to SDK 1.0.11.1

external/vulkan/icd-spv.h

@@ -2,24 +2,17 @@
  * Copyright (c) 2015-2016 Valve Corporation
  * Copyright (c) 2015-2016 LunarG, Inc.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * of this software and/or associated documentation files (the "Materials"), to
+ * you may not use this file except in compliance with the License.
- * deal in the Materials without restriction, including without limitation the
+ * You may obtain a copy of the License at
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Materials, and to permit persons to whom the Materials are
- * furnished to do so, subject to the following conditions:
  *
- * The above copyright notice(s) and this permission notice shall be included in
+ *     http://www.apache.org/licenses/LICENSE-2.0
- * all copies or substantial portions of the Materials.
  *
- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * Unless required by applicable law or agreed to in writing, software
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
+ * See the License for the specific language governing permissions and
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * limitations under the License.
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE
- * USE OR OTHER DEALINGS IN THE MATERIALS.
  *
  * Author: Cody Northrop <cody@lunarg.com>
  */

external/vulkan/spirv.hpp

@@ -61,6 +61,7 @@ enum SourceLanguage {
     SourceLanguageGLSL = 2,
     SourceLanguageOpenCL_C = 3,
     SourceLanguageOpenCL_CPP = 4,
+    SourceLanguageHLSL = 5,
 };
 
 enum ExecutionModel {

external/vulkan/vk_icd.h

@@ -6,24 +6,17 @@
  * Copyright (c) 2015-2016 Valve Corporation
  * Copyright (c) 2015-2016 LunarG, Inc.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * of this software and/or associated documentation files (the "Materials"), to
+ * you may not use this file except in compliance with the License.
- * deal in the Materials without restriction, including without limitation the
+ * You may obtain a copy of the License at
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Materials, and to permit persons to whom the Materials are
- * furnished to do so, subject to the following conditions:
  *
- * The above copyright notice(s) and this permission notice shall be included in
+ *     http://www.apache.org/licenses/LICENSE-2.0
- * all copies or substantial portions of the Materials.
  *
- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * Unless required by applicable law or agreed to in writing, software
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
+ * See the License for the specific language governing permissions and
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * limitations under the License.
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE
- * USE OR OTHER DEALINGS IN THE MATERIALS.
  *
  */
 
@@ -32,6 +25,12 @@
 
 #include "vulkan.h"
 
+/*
+ * Loader-ICD version negotiation API
+ */
+#define CURRENT_LOADER_ICD_INTERFACE_VERSION 2
+#define MIN_SUPPORTED_LOADER_ICD_INTERFACE_VERSION 0
+typedef VkResult (VKAPI_PTR *PFN_vkNegotiateLoaderICDInterfaceVersion)(uint32_t *pVersion);
 /*
  * The ICD must reserve space for a pointer for the loader's dispatch
  * table, at the start of <each object>.

external/vulkan/vk_layer.h

@@ -6,24 +6,17 @@
  * Copyright (c) 2015-2016 Valve Corporation
  * Copyright (c) 2015-2016 LunarG, Inc.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * of this software and/or associated documentation files (the "Materials"), to
+ * you may not use this file except in compliance with the License.
- * deal in the Materials without restriction, including without limitation the
+ * You may obtain a copy of the License at
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Materials, and to permit persons to whom the Materials are
- * furnished to do so, subject to the following conditions:
  *
- * The above copyright notice(s) and this permission notice shall be included in
+ *     http://www.apache.org/licenses/LICENSE-2.0
- * all copies or substantial portions of the Materials.
  *
- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * Unless required by applicable law or agreed to in writing, software
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
+ * See the License for the specific language governing permissions and
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * limitations under the License.
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE
- * USE OR OTHER DEALINGS IN THE MATERIALS.
  *
  */
 
@@ -262,8 +255,8 @@ typedef enum VkLayerDbgAction_ {
 // CreateInstance and CreateDevice support structures
 
 /* Sub type of structure for instance and device loader ext of CreateInfo.
- * When sType == VK_STRUCTURE_TYPE_LAYER_INSTANCE_CREATE_INFO
+ * When sType == VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO
- * or sType == VK_STRUCTURE_TYPE_LAYER_DEVICE_CREATE_INFO
+ * or sType == VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO
  * then VkLayerFunction indicates struct type pointed to by pNext
  */
 typedef enum VkLayerFunction_ {
@@ -294,7 +287,7 @@ typedef VkResult (VKAPI_PTR *PFN_vkSetDeviceLoaderData)(VkDevice device,
         void *object);
 
 typedef struct {
-    VkStructureType sType; // VK_STRUCTURE_TYPE_LAYER_INSTANCE_CREATE_INFO
+    VkStructureType sType; // VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO
     const void *pNext;
     VkLayerFunction function;
     union {
@@ -310,7 +303,7 @@ typedef struct VkLayerDeviceLink_ {
 } VkLayerDeviceLink;
 
 typedef struct {
-    VkStructureType sType; // VK_STRUCTURE_TYPE_LAYER_DEVICE_CREATE_INFO
+    VkStructureType sType; // VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO
     const void *pNext;
     VkLayerFunction function;
     union {

external/vulkan/vk_platform.h

@@ -4,24 +4,17 @@
 /*
 ** Copyright (c) 2014-2015 The Khronos Group Inc.
 **
-** Permission is hereby granted, free of charge, to any person obtaining a
+** Licensed under the Apache License, Version 2.0 (the "License");
-** copy of this software and/or associated documentation files (the
+** you may not use this file except in compliance with the License.
-** "Materials"), to deal in the Materials without restriction, including
+** You may obtain a copy of the License at
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
 **
-** The above copyright notice and this permission notice shall be included
+**     http://www.apache.org/licenses/LICENSE-2.0
-** in all copies or substantial portions of the Materials.
 **
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** Unless required by applicable law or agreed to in writing, software
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** distributed under the License is distributed on an "AS IS" BASIS,
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** See the License for the specific language governing permissions and
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** limitations under the License.
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 */
 
 

external/vulkan/vk_sdk_platform.h

@@ -6,24 +6,17 @@
  * Copyright (c) 2015-2016 Valve Corporation
  * Copyright (c) 2015-2016 LunarG, Inc.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * of this software and/or associated documentation files (the "Materials"), to
+ * you may not use this file except in compliance with the License.
- * deal in the Materials without restriction, including without limitation the
+ * You may obtain a copy of the License at
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Materials, and to permit persons to whom the Materials are
- * furnished to do so, subject to the following conditions:
  *
- * The above copyright notice(s) and this permission notice shall be included in
+ *     http://www.apache.org/licenses/LICENSE-2.0
- * all copies or substantial portions of the Materials.
  *
- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * Unless required by applicable law or agreed to in writing, software
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
+ * See the License for the specific language governing permissions and
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * limitations under the License.
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE
- * USE OR OTHER DEALINGS IN THE MATERIALS.
  */
 
 #ifndef VK_SDK_PLATFORM_H

external/vulkan/vulkan.h

@@ -8,24 +8,17 @@ extern "C" {
 /*
 ** Copyright (c) 2015-2016 The Khronos Group Inc.
 **
-** Permission is hereby granted, free of charge, to any person obtaining a
+** Licensed under the Apache License, Version 2.0 (the "License");
-** copy of this software and/or associated documentation files (the
+** you may not use this file except in compliance with the License.
-** "Materials"), to deal in the Materials without restriction, including
+** You may obtain a copy of the License at
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
 **
-** The above copyright notice and this permission notice shall be included
+**     http://www.apache.org/licenses/LICENSE-2.0
-** in all copies or substantial portions of the Materials.
 **
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** Unless required by applicable law or agreed to in writing, software
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** distributed under the License is distributed on an "AS IS" BASIS,
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** See the License for the specific language governing permissions and
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** limitations under the License.
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 */
 
 /*
@@ -50,7 +43,7 @@ extern "C" {
 #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 8
+#define VK_HEADER_VERSION 11
 
 
 #define VK_NULL_HANDLE 0
@@ -3278,7 +3271,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfacePresentModesKHR(
 #define VK_KHR_swapchain 1
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSwapchainKHR)
 
-#define VK_KHR_SWAPCHAIN_SPEC_VERSION     67
+#define VK_KHR_SWAPCHAIN_SPEC_VERSION     68
 #define VK_KHR_SWAPCHAIN_EXTENSION_NAME   "VK_KHR_swapchain"
 
 typedef VkFlags VkSwapchainCreateFlagsKHR;