Update for Vulkan-Docs 1.2.144

This commit is contained in:
Jon Leech 2020-06-15 02:00:56 -07:00 committed by Jon Leech
parent 9d2dfca53b
commit f315245756
8 changed files with 955 additions and 899 deletions

View File

@ -4,17 +4,7 @@
/* /*
** Copyright (c) 2014-2020 The Khronos Group Inc. ** Copyright (c) 2014-2020 The Khronos Group Inc.
** **
** Licensed under the Apache License, Version 2.0 (the "License"); ** SPDX-License-Identifier: Apache-2.0
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/ */

View File

@ -4,17 +4,7 @@
/* /*
** Copyright (c) 2015-2020 The Khronos Group Inc. ** Copyright (c) 2015-2020 The Khronos Group Inc.
** **
** Licensed under the Apache License, Version 2.0 (the "License"); ** SPDX-License-Identifier: Apache-2.0
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/ */
#include "vk_platform.h" #include "vk_platform.h"

View File

@ -53,7 +53,7 @@
#endif #endif
static_assert( VK_HEADER_VERSION == 143 , "Wrong VK_HEADER_VERSION!" ); static_assert( VK_HEADER_VERSION == 144 , "Wrong VK_HEADER_VERSION!" );
// 32-bit vulkan is not typesafe for handles, so don't allow copy constructors on this platform by default. // 32-bit vulkan is not typesafe for handles, so don't allow copy constructors on this platform by default.
// To enable this feature on 32-bit platforms please define VULKAN_HPP_TYPESAFE_CONVERSION // To enable this feature on 32-bit platforms please define VULKAN_HPP_TYPESAFE_CONVERSION

View File

@ -43,7 +43,7 @@ extern "C" {
#define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0)// Patch version should always be set to 0 #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0)// Patch version should always be set to 0
// Version of this file // Version of this file
#define VK_HEADER_VERSION 143 #define VK_HEADER_VERSION 144
// Complete version of this file // Complete version of this file
#define VK_HEADER_VERSION_COMPLETE VK_MAKE_VERSION(1, 2, VK_HEADER_VERSION) #define VK_HEADER_VERSION_COMPLETE VK_MAKE_VERSION(1, 2, VK_HEADER_VERSION)

View File

@ -662,7 +662,8 @@ class OutputGenerator:
directory = Path(self.genOpts.directory) directory = Path(self.genOpts.directory)
if not Path.exists(directory): if not Path.exists(directory):
os.makedirs(directory) os.makedirs(directory)
shutil.move(self.outFile.name, self.genOpts.directory + '/' + self.genOpts.filename) shutil.copy(self.outFile.name, self.genOpts.directory + '/' + self.genOpts.filename)
os.remove(self.outFile.name)
self.genOpts = None self.genOpts = None
def beginFeature(self, interface, emit): def beginFeature(self, interface, emit):

View File

@ -96,11 +96,12 @@ def makeGenOpts(args):
featuresPat = makeREstring(features, allFeatures) featuresPat = makeREstring(features, allFeatures)
# Copyright text prefixing all headers (list of strings). # Copyright text prefixing all headers (list of strings).
# The SPDX formatting below works around constraints of the 'reuse' tool
prefixStrings = [ prefixStrings = [
'/*', '/*',
'** Copyright (c) 2015-2020 The Khronos Group Inc.', '** Copyright (c) 2015-2020 The Khronos Group Inc.',
'**', '**',
'** SPDX-License-Identifier: Apache-2.0', '** SPDX' + '-License-Identifier: Apache-2.0',
'*/', '*/',
'' ''
] ]

File diff suppressed because it is too large Load Diff

View File

@ -131,7 +131,7 @@ server.
<type category="define">// Vulkan 1.2 version number <type category="define">// Vulkan 1.2 version number
#define <name>VK_API_VERSION_1_2</name> <type>VK_MAKE_VERSION</type>(1, 2, 0)// Patch version should always be set to 0</type> #define <name>VK_API_VERSION_1_2</name> <type>VK_MAKE_VERSION</type>(1, 2, 0)// Patch version should always be set to 0</type>
<type category="define">// Version of this file <type category="define">// Version of this file
#define <name>VK_HEADER_VERSION</name> 143</type> #define <name>VK_HEADER_VERSION</name> 144</type>
<type category="define" requires="VK_HEADER_VERSION">// Complete version of this file <type category="define" requires="VK_HEADER_VERSION">// Complete version of this file
#define <name>VK_HEADER_VERSION_COMPLETE</name> <type>VK_MAKE_VERSION</type>(1, 2, VK_HEADER_VERSION)</type> #define <name>VK_HEADER_VERSION_COMPLETE</name> <type>VK_MAKE_VERSION</type>(1, 2, VK_HEADER_VERSION)</type>