2016-07-11 01:13:41 +00:00
|
|
|
#!/usr/bin/python3 -i
|
|
|
|
#
|
|
|
|
# Copyright (c) 2013-2016 The Khronos Group Inc.
|
|
|
|
#
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
# 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.
|
|
|
|
|
|
|
|
import os,re,sys
|
|
|
|
from generator import *
|
|
|
|
|
|
|
|
# DocGeneratorOptions - subclass of GeneratorOptions.
|
|
|
|
#
|
|
|
|
# Shares many members with CGeneratorOptions, since
|
|
|
|
# both are writing C-style declarations:
|
|
|
|
#
|
|
|
|
# prefixText - list of strings to prefix generated header with
|
|
|
|
# (usually a copyright statement + calling convention macros).
|
|
|
|
# apicall - string to use for the function declaration prefix,
|
|
|
|
# such as APICALL on Windows.
|
|
|
|
# apientry - string to use for the calling convention macro,
|
|
|
|
# in typedefs, such as APIENTRY.
|
|
|
|
# apientryp - string to use for the calling convention macro
|
|
|
|
# in function pointer typedefs, such as APIENTRYP.
|
Change log for July 22, 2016 Vulkan 1.0.22 spec update:
* Bump API patch number and header version number to 22 for this update.
Github Issues:
* Translate the subpass self-dependency language into concrete
validity statements, and added a validity statement about the
restrictions on layout parameters (public issue 267).
* Add validity requirement that
slink:VkAttachmentDescription::pname:finalLayout and
slink:VkAttachmentReference::pname:layout must not be
ename:VK_IMAGE_LAYOUT_UNDEFINED or
ename:VK_IMAGE_LAYOUT_PREINITIALIZED (public issue 268).
* Clarify that slink:VkSubpassDescription::pname:pResolveAttachments
layouts are used. Make language consistent with other attachment
arrays (public issue 270).
* Changed 64-bit definition for
dname:VK_DEFINE_NON_DISPATCHABLE_HANDLE to work for x32 platform in
+vk.xml+ and the resulting +vulkan.h+ (public issue 282).
* Add missing error return code for
flink:vkEnumerateInstanceExtensionProperties and
flink:vkEnumerateDeviceExtensionProperties (public issue 285)
* Fix several cases of stext::VkStructName.memberName markup to
stext::VkStructName::pname:memberName, to match other usage in the
spec, and describe this markup in the style guide (public issue
286).
* Modified validity language generation script to avoid redundant
common ancestor language if covered by generic parent language, and
used `Both' instead of `Each' when appropriate (public issue 288).
Internal Issues:
* Add language about behavior of flink:vkAllocateDescriptorSets when
allocation fails due to fragmentation, a new error
ename:VK_ERROR_FRAGMENTED_POOL, and a Note explaining the situation
(internal issue 309).
* For the features of code:PointSize, code:ClipDistance, and
code:CullDistance, the SPIR-V capability is required to be declared
on use (read or write) rather than on decoration (internal issue
359).
* Have desktop versions of GLSL respect precision qualification
(code:mediump and code:lowp) when compiling for Vulkan. These will
get translated to SPIR-V's code:RelaxedPrecision decoration as they
do with OpenGL ES versions of GLSL (ESSL). The default precision of
all types is code:highp when using a desktop version (internal issue
360).
* Add validity statement for slink:VkImageCreateInfo specifying that
multisampled images must be two-dimensional, optimally tiled, and
with a single mipmap level (internal issue 369).
* Add validity statements to slink:VkImageViewCreateInfo disallowing
creation of images or image views with no supported features. Made
some slink:VkImageViewCreateInfo validity statements more precise
and consistent. Added a Note to the <<features,features>> chapter
about formats with no features (internal issue 371).
* Remove +manpages+ from default build targets. Nroff outputs
containing imbedded latexmath will not render properly. Fixing this
is a lot of work for limited use cases (internal issue 401).
Other Commits:
* Fix flink:vkRenderPassBeginInfo::pname:clearValueCount validity
statement to be based on attachment indices rather than the number
of cleared attachments
(Vulkan-LoaderAndValidationLayers/issues/601).
* Convert registry documentation from LaTeX to asciidoc source and
rename from +src/spec/readme.tex+ to +src/spec/registry.txt+.
* Fix lack of Oxford commas in validity language.
* Lots of cleanup of generator scripts and Makefiles to move extension
list for generator into the script arguments instead of the body of
genvk.py, and express better dependencies between XML, scripts, and
generated files.
2016-07-23 10:15:48 +00:00
|
|
|
# directory - directory into which to generate include files
|
2016-07-11 01:13:41 +00:00
|
|
|
# indentFuncProto - True if prototype declarations should put each
|
|
|
|
# parameter on a separate line
|
|
|
|
# indentFuncPointer - True if typedefed function pointers should put each
|
|
|
|
# parameter on a separate line
|
|
|
|
# alignFuncParam - if nonzero and parameters are being put on a
|
|
|
|
# separate line, align parameter names at the specified column
|
|
|
|
#
|
|
|
|
# Additional members:
|
|
|
|
#
|
|
|
|
class DocGeneratorOptions(GeneratorOptions):
|
|
|
|
"""Represents options during C interface generation for Asciidoc"""
|
|
|
|
def __init__(self,
|
|
|
|
filename = None,
|
Change log for July 22, 2016 Vulkan 1.0.22 spec update:
* Bump API patch number and header version number to 22 for this update.
Github Issues:
* Translate the subpass self-dependency language into concrete
validity statements, and added a validity statement about the
restrictions on layout parameters (public issue 267).
* Add validity requirement that
slink:VkAttachmentDescription::pname:finalLayout and
slink:VkAttachmentReference::pname:layout must not be
ename:VK_IMAGE_LAYOUT_UNDEFINED or
ename:VK_IMAGE_LAYOUT_PREINITIALIZED (public issue 268).
* Clarify that slink:VkSubpassDescription::pname:pResolveAttachments
layouts are used. Make language consistent with other attachment
arrays (public issue 270).
* Changed 64-bit definition for
dname:VK_DEFINE_NON_DISPATCHABLE_HANDLE to work for x32 platform in
+vk.xml+ and the resulting +vulkan.h+ (public issue 282).
* Add missing error return code for
flink:vkEnumerateInstanceExtensionProperties and
flink:vkEnumerateDeviceExtensionProperties (public issue 285)
* Fix several cases of stext::VkStructName.memberName markup to
stext::VkStructName::pname:memberName, to match other usage in the
spec, and describe this markup in the style guide (public issue
286).
* Modified validity language generation script to avoid redundant
common ancestor language if covered by generic parent language, and
used `Both' instead of `Each' when appropriate (public issue 288).
Internal Issues:
* Add language about behavior of flink:vkAllocateDescriptorSets when
allocation fails due to fragmentation, a new error
ename:VK_ERROR_FRAGMENTED_POOL, and a Note explaining the situation
(internal issue 309).
* For the features of code:PointSize, code:ClipDistance, and
code:CullDistance, the SPIR-V capability is required to be declared
on use (read or write) rather than on decoration (internal issue
359).
* Have desktop versions of GLSL respect precision qualification
(code:mediump and code:lowp) when compiling for Vulkan. These will
get translated to SPIR-V's code:RelaxedPrecision decoration as they
do with OpenGL ES versions of GLSL (ESSL). The default precision of
all types is code:highp when using a desktop version (internal issue
360).
* Add validity statement for slink:VkImageCreateInfo specifying that
multisampled images must be two-dimensional, optimally tiled, and
with a single mipmap level (internal issue 369).
* Add validity statements to slink:VkImageViewCreateInfo disallowing
creation of images or image views with no supported features. Made
some slink:VkImageViewCreateInfo validity statements more precise
and consistent. Added a Note to the <<features,features>> chapter
about formats with no features (internal issue 371).
* Remove +manpages+ from default build targets. Nroff outputs
containing imbedded latexmath will not render properly. Fixing this
is a lot of work for limited use cases (internal issue 401).
Other Commits:
* Fix flink:vkRenderPassBeginInfo::pname:clearValueCount validity
statement to be based on attachment indices rather than the number
of cleared attachments
(Vulkan-LoaderAndValidationLayers/issues/601).
* Convert registry documentation from LaTeX to asciidoc source and
rename from +src/spec/readme.tex+ to +src/spec/registry.txt+.
* Fix lack of Oxford commas in validity language.
* Lots of cleanup of generator scripts and Makefiles to move extension
list for generator into the script arguments instead of the body of
genvk.py, and express better dependencies between XML, scripts, and
generated files.
2016-07-23 10:15:48 +00:00
|
|
|
directory = '.',
|
2016-07-11 01:13:41 +00:00
|
|
|
apiname = None,
|
|
|
|
profile = None,
|
|
|
|
versions = '.*',
|
|
|
|
emitversions = '.*',
|
|
|
|
defaultExtensions = None,
|
|
|
|
addExtensions = None,
|
|
|
|
removeExtensions = None,
|
|
|
|
sortProcedure = regSortFeatures,
|
|
|
|
prefixText = "",
|
|
|
|
apicall = '',
|
|
|
|
apientry = '',
|
|
|
|
apientryp = '',
|
|
|
|
indentFuncProto = True,
|
|
|
|
indentFuncPointer = False,
|
|
|
|
alignFuncParam = 0,
|
|
|
|
expandEnumerants = True):
|
Change log for July 22, 2016 Vulkan 1.0.22 spec update:
* Bump API patch number and header version number to 22 for this update.
Github Issues:
* Translate the subpass self-dependency language into concrete
validity statements, and added a validity statement about the
restrictions on layout parameters (public issue 267).
* Add validity requirement that
slink:VkAttachmentDescription::pname:finalLayout and
slink:VkAttachmentReference::pname:layout must not be
ename:VK_IMAGE_LAYOUT_UNDEFINED or
ename:VK_IMAGE_LAYOUT_PREINITIALIZED (public issue 268).
* Clarify that slink:VkSubpassDescription::pname:pResolveAttachments
layouts are used. Make language consistent with other attachment
arrays (public issue 270).
* Changed 64-bit definition for
dname:VK_DEFINE_NON_DISPATCHABLE_HANDLE to work for x32 platform in
+vk.xml+ and the resulting +vulkan.h+ (public issue 282).
* Add missing error return code for
flink:vkEnumerateInstanceExtensionProperties and
flink:vkEnumerateDeviceExtensionProperties (public issue 285)
* Fix several cases of stext::VkStructName.memberName markup to
stext::VkStructName::pname:memberName, to match other usage in the
spec, and describe this markup in the style guide (public issue
286).
* Modified validity language generation script to avoid redundant
common ancestor language if covered by generic parent language, and
used `Both' instead of `Each' when appropriate (public issue 288).
Internal Issues:
* Add language about behavior of flink:vkAllocateDescriptorSets when
allocation fails due to fragmentation, a new error
ename:VK_ERROR_FRAGMENTED_POOL, and a Note explaining the situation
(internal issue 309).
* For the features of code:PointSize, code:ClipDistance, and
code:CullDistance, the SPIR-V capability is required to be declared
on use (read or write) rather than on decoration (internal issue
359).
* Have desktop versions of GLSL respect precision qualification
(code:mediump and code:lowp) when compiling for Vulkan. These will
get translated to SPIR-V's code:RelaxedPrecision decoration as they
do with OpenGL ES versions of GLSL (ESSL). The default precision of
all types is code:highp when using a desktop version (internal issue
360).
* Add validity statement for slink:VkImageCreateInfo specifying that
multisampled images must be two-dimensional, optimally tiled, and
with a single mipmap level (internal issue 369).
* Add validity statements to slink:VkImageViewCreateInfo disallowing
creation of images or image views with no supported features. Made
some slink:VkImageViewCreateInfo validity statements more precise
and consistent. Added a Note to the <<features,features>> chapter
about formats with no features (internal issue 371).
* Remove +manpages+ from default build targets. Nroff outputs
containing imbedded latexmath will not render properly. Fixing this
is a lot of work for limited use cases (internal issue 401).
Other Commits:
* Fix flink:vkRenderPassBeginInfo::pname:clearValueCount validity
statement to be based on attachment indices rather than the number
of cleared attachments
(Vulkan-LoaderAndValidationLayers/issues/601).
* Convert registry documentation from LaTeX to asciidoc source and
rename from +src/spec/readme.tex+ to +src/spec/registry.txt+.
* Fix lack of Oxford commas in validity language.
* Lots of cleanup of generator scripts and Makefiles to move extension
list for generator into the script arguments instead of the body of
genvk.py, and express better dependencies between XML, scripts, and
generated files.
2016-07-23 10:15:48 +00:00
|
|
|
GeneratorOptions.__init__(self, filename, directory, apiname, profile,
|
2016-07-11 01:13:41 +00:00
|
|
|
versions, emitversions, defaultExtensions,
|
|
|
|
addExtensions, removeExtensions, sortProcedure)
|
|
|
|
self.prefixText = prefixText
|
|
|
|
self.apicall = apicall
|
|
|
|
self.apientry = apientry
|
|
|
|
self.apientryp = apientryp
|
|
|
|
self.indentFuncProto = indentFuncProto
|
|
|
|
self.indentFuncPointer = indentFuncPointer
|
|
|
|
self.alignFuncParam = alignFuncParam
|
|
|
|
self.expandEnumerants = expandEnumerants
|
|
|
|
|
|
|
|
# DocOutputGenerator - subclass of OutputGenerator.
|
|
|
|
# Generates AsciiDoc includes with C-language API interfaces, for reference
|
|
|
|
# pages and the Vulkan specification. Similar to COutputGenerator, but
|
|
|
|
# each interface is written into a different file as determined by the
|
|
|
|
# options, only actual C types are emitted, and none of the boilerplate
|
|
|
|
# preprocessor code is emitted.
|
|
|
|
#
|
|
|
|
# ---- methods ----
|
|
|
|
# DocOutputGenerator(errFile, warnFile, diagFile) - args as for
|
|
|
|
# OutputGenerator. Defines additional internal state.
|
|
|
|
# ---- methods overriding base class ----
|
|
|
|
# beginFile(genOpts)
|
|
|
|
# endFile()
|
|
|
|
# beginFeature(interface, emit)
|
|
|
|
# endFeature()
|
|
|
|
# genType(typeinfo,name)
|
|
|
|
# genStruct(typeinfo,name)
|
|
|
|
# genGroup(groupinfo,name)
|
|
|
|
# genEnum(enuminfo, name)
|
|
|
|
# genCmd(cmdinfo)
|
|
|
|
class DocOutputGenerator(OutputGenerator):
|
|
|
|
"""Generate specified API interfaces in a specific style, such as a C header"""
|
|
|
|
def __init__(self,
|
|
|
|
errFile = sys.stderr,
|
|
|
|
warnFile = sys.stderr,
|
|
|
|
diagFile = sys.stdout):
|
|
|
|
OutputGenerator.__init__(self, errFile, warnFile, diagFile)
|
|
|
|
#
|
|
|
|
def beginFile(self, genOpts):
|
|
|
|
OutputGenerator.beginFile(self, genOpts)
|
|
|
|
def endFile(self):
|
|
|
|
OutputGenerator.endFile(self)
|
|
|
|
def beginFeature(self, interface, emit):
|
|
|
|
# Start processing in superclass
|
|
|
|
OutputGenerator.beginFeature(self, interface, emit)
|
|
|
|
def endFeature(self):
|
|
|
|
# Finish processing in superclass
|
|
|
|
OutputGenerator.endFeature(self)
|
|
|
|
#
|
|
|
|
# Generate an include file
|
|
|
|
#
|
|
|
|
# directory - subdirectory to put file in
|
|
|
|
# basename - base name of the file
|
|
|
|
# contents - contents of the file (Asciidoc boilerplate aside)
|
|
|
|
def writeInclude(self, directory, basename, contents):
|
Change log for July 22, 2016 Vulkan 1.0.22 spec update:
* Bump API patch number and header version number to 22 for this update.
Github Issues:
* Translate the subpass self-dependency language into concrete
validity statements, and added a validity statement about the
restrictions on layout parameters (public issue 267).
* Add validity requirement that
slink:VkAttachmentDescription::pname:finalLayout and
slink:VkAttachmentReference::pname:layout must not be
ename:VK_IMAGE_LAYOUT_UNDEFINED or
ename:VK_IMAGE_LAYOUT_PREINITIALIZED (public issue 268).
* Clarify that slink:VkSubpassDescription::pname:pResolveAttachments
layouts are used. Make language consistent with other attachment
arrays (public issue 270).
* Changed 64-bit definition for
dname:VK_DEFINE_NON_DISPATCHABLE_HANDLE to work for x32 platform in
+vk.xml+ and the resulting +vulkan.h+ (public issue 282).
* Add missing error return code for
flink:vkEnumerateInstanceExtensionProperties and
flink:vkEnumerateDeviceExtensionProperties (public issue 285)
* Fix several cases of stext::VkStructName.memberName markup to
stext::VkStructName::pname:memberName, to match other usage in the
spec, and describe this markup in the style guide (public issue
286).
* Modified validity language generation script to avoid redundant
common ancestor language if covered by generic parent language, and
used `Both' instead of `Each' when appropriate (public issue 288).
Internal Issues:
* Add language about behavior of flink:vkAllocateDescriptorSets when
allocation fails due to fragmentation, a new error
ename:VK_ERROR_FRAGMENTED_POOL, and a Note explaining the situation
(internal issue 309).
* For the features of code:PointSize, code:ClipDistance, and
code:CullDistance, the SPIR-V capability is required to be declared
on use (read or write) rather than on decoration (internal issue
359).
* Have desktop versions of GLSL respect precision qualification
(code:mediump and code:lowp) when compiling for Vulkan. These will
get translated to SPIR-V's code:RelaxedPrecision decoration as they
do with OpenGL ES versions of GLSL (ESSL). The default precision of
all types is code:highp when using a desktop version (internal issue
360).
* Add validity statement for slink:VkImageCreateInfo specifying that
multisampled images must be two-dimensional, optimally tiled, and
with a single mipmap level (internal issue 369).
* Add validity statements to slink:VkImageViewCreateInfo disallowing
creation of images or image views with no supported features. Made
some slink:VkImageViewCreateInfo validity statements more precise
and consistent. Added a Note to the <<features,features>> chapter
about formats with no features (internal issue 371).
* Remove +manpages+ from default build targets. Nroff outputs
containing imbedded latexmath will not render properly. Fixing this
is a lot of work for limited use cases (internal issue 401).
Other Commits:
* Fix flink:vkRenderPassBeginInfo::pname:clearValueCount validity
statement to be based on attachment indices rather than the number
of cleared attachments
(Vulkan-LoaderAndValidationLayers/issues/601).
* Convert registry documentation from LaTeX to asciidoc source and
rename from +src/spec/readme.tex+ to +src/spec/registry.txt+.
* Fix lack of Oxford commas in validity language.
* Lots of cleanup of generator scripts and Makefiles to move extension
list for generator into the script arguments instead of the body of
genvk.py, and express better dependencies between XML, scripts, and
generated files.
2016-07-23 10:15:48 +00:00
|
|
|
# Create subdirectory, if needed
|
|
|
|
directory = self.genOpts.directory + '/' + directory
|
|
|
|
self.makeDir(directory)
|
|
|
|
|
2016-07-11 01:13:41 +00:00
|
|
|
# Create file
|
Change log for July 22, 2016 Vulkan 1.0.22 spec update:
* Bump API patch number and header version number to 22 for this update.
Github Issues:
* Translate the subpass self-dependency language into concrete
validity statements, and added a validity statement about the
restrictions on layout parameters (public issue 267).
* Add validity requirement that
slink:VkAttachmentDescription::pname:finalLayout and
slink:VkAttachmentReference::pname:layout must not be
ename:VK_IMAGE_LAYOUT_UNDEFINED or
ename:VK_IMAGE_LAYOUT_PREINITIALIZED (public issue 268).
* Clarify that slink:VkSubpassDescription::pname:pResolveAttachments
layouts are used. Make language consistent with other attachment
arrays (public issue 270).
* Changed 64-bit definition for
dname:VK_DEFINE_NON_DISPATCHABLE_HANDLE to work for x32 platform in
+vk.xml+ and the resulting +vulkan.h+ (public issue 282).
* Add missing error return code for
flink:vkEnumerateInstanceExtensionProperties and
flink:vkEnumerateDeviceExtensionProperties (public issue 285)
* Fix several cases of stext::VkStructName.memberName markup to
stext::VkStructName::pname:memberName, to match other usage in the
spec, and describe this markup in the style guide (public issue
286).
* Modified validity language generation script to avoid redundant
common ancestor language if covered by generic parent language, and
used `Both' instead of `Each' when appropriate (public issue 288).
Internal Issues:
* Add language about behavior of flink:vkAllocateDescriptorSets when
allocation fails due to fragmentation, a new error
ename:VK_ERROR_FRAGMENTED_POOL, and a Note explaining the situation
(internal issue 309).
* For the features of code:PointSize, code:ClipDistance, and
code:CullDistance, the SPIR-V capability is required to be declared
on use (read or write) rather than on decoration (internal issue
359).
* Have desktop versions of GLSL respect precision qualification
(code:mediump and code:lowp) when compiling for Vulkan. These will
get translated to SPIR-V's code:RelaxedPrecision decoration as they
do with OpenGL ES versions of GLSL (ESSL). The default precision of
all types is code:highp when using a desktop version (internal issue
360).
* Add validity statement for slink:VkImageCreateInfo specifying that
multisampled images must be two-dimensional, optimally tiled, and
with a single mipmap level (internal issue 369).
* Add validity statements to slink:VkImageViewCreateInfo disallowing
creation of images or image views with no supported features. Made
some slink:VkImageViewCreateInfo validity statements more precise
and consistent. Added a Note to the <<features,features>> chapter
about formats with no features (internal issue 371).
* Remove +manpages+ from default build targets. Nroff outputs
containing imbedded latexmath will not render properly. Fixing this
is a lot of work for limited use cases (internal issue 401).
Other Commits:
* Fix flink:vkRenderPassBeginInfo::pname:clearValueCount validity
statement to be based on attachment indices rather than the number
of cleared attachments
(Vulkan-LoaderAndValidationLayers/issues/601).
* Convert registry documentation from LaTeX to asciidoc source and
rename from +src/spec/readme.tex+ to +src/spec/registry.txt+.
* Fix lack of Oxford commas in validity language.
* Lots of cleanup of generator scripts and Makefiles to move extension
list for generator into the script arguments instead of the body of
genvk.py, and express better dependencies between XML, scripts, and
generated files.
2016-07-23 10:15:48 +00:00
|
|
|
filename = directory + '/' + basename + '.txt'
|
2016-07-11 01:13:41 +00:00
|
|
|
self.logMsg('diag', '# Generating include file:', filename)
|
|
|
|
fp = open(filename, 'w')
|
Change log for July 22, 2016 Vulkan 1.0.22 spec update:
* Bump API patch number and header version number to 22 for this update.
Github Issues:
* Translate the subpass self-dependency language into concrete
validity statements, and added a validity statement about the
restrictions on layout parameters (public issue 267).
* Add validity requirement that
slink:VkAttachmentDescription::pname:finalLayout and
slink:VkAttachmentReference::pname:layout must not be
ename:VK_IMAGE_LAYOUT_UNDEFINED or
ename:VK_IMAGE_LAYOUT_PREINITIALIZED (public issue 268).
* Clarify that slink:VkSubpassDescription::pname:pResolveAttachments
layouts are used. Make language consistent with other attachment
arrays (public issue 270).
* Changed 64-bit definition for
dname:VK_DEFINE_NON_DISPATCHABLE_HANDLE to work for x32 platform in
+vk.xml+ and the resulting +vulkan.h+ (public issue 282).
* Add missing error return code for
flink:vkEnumerateInstanceExtensionProperties and
flink:vkEnumerateDeviceExtensionProperties (public issue 285)
* Fix several cases of stext::VkStructName.memberName markup to
stext::VkStructName::pname:memberName, to match other usage in the
spec, and describe this markup in the style guide (public issue
286).
* Modified validity language generation script to avoid redundant
common ancestor language if covered by generic parent language, and
used `Both' instead of `Each' when appropriate (public issue 288).
Internal Issues:
* Add language about behavior of flink:vkAllocateDescriptorSets when
allocation fails due to fragmentation, a new error
ename:VK_ERROR_FRAGMENTED_POOL, and a Note explaining the situation
(internal issue 309).
* For the features of code:PointSize, code:ClipDistance, and
code:CullDistance, the SPIR-V capability is required to be declared
on use (read or write) rather than on decoration (internal issue
359).
* Have desktop versions of GLSL respect precision qualification
(code:mediump and code:lowp) when compiling for Vulkan. These will
get translated to SPIR-V's code:RelaxedPrecision decoration as they
do with OpenGL ES versions of GLSL (ESSL). The default precision of
all types is code:highp when using a desktop version (internal issue
360).
* Add validity statement for slink:VkImageCreateInfo specifying that
multisampled images must be two-dimensional, optimally tiled, and
with a single mipmap level (internal issue 369).
* Add validity statements to slink:VkImageViewCreateInfo disallowing
creation of images or image views with no supported features. Made
some slink:VkImageViewCreateInfo validity statements more precise
and consistent. Added a Note to the <<features,features>> chapter
about formats with no features (internal issue 371).
* Remove +manpages+ from default build targets. Nroff outputs
containing imbedded latexmath will not render properly. Fixing this
is a lot of work for limited use cases (internal issue 401).
Other Commits:
* Fix flink:vkRenderPassBeginInfo::pname:clearValueCount validity
statement to be based on attachment indices rather than the number
of cleared attachments
(Vulkan-LoaderAndValidationLayers/issues/601).
* Convert registry documentation from LaTeX to asciidoc source and
rename from +src/spec/readme.tex+ to +src/spec/registry.txt+.
* Fix lack of Oxford commas in validity language.
* Lots of cleanup of generator scripts and Makefiles to move extension
list for generator into the script arguments instead of the body of
genvk.py, and express better dependencies between XML, scripts, and
generated files.
2016-07-23 10:15:48 +00:00
|
|
|
|
2016-07-11 01:13:41 +00:00
|
|
|
# Asciidoc anchor
|
|
|
|
write('// WARNING: DO NOT MODIFY! This file is automatically generated from the vk.xml registry', file=fp)
|
|
|
|
write('ifndef::doctype-manpage[]', file=fp)
|
|
|
|
write('[[{0},{0}]]'.format(basename), file=fp)
|
|
|
|
write('["source","{basebackend@docbook:c++:cpp}",title=""]', file=fp)
|
|
|
|
write('endif::doctype-manpage[]', file=fp)
|
|
|
|
write('ifdef::doctype-manpage[]', file=fp)
|
|
|
|
write('["source","{basebackend@docbook:c++:cpp}"]', file=fp)
|
|
|
|
write('endif::doctype-manpage[]', file=fp)
|
|
|
|
write('------------------------------------------------------------------------------', file=fp)
|
|
|
|
write(contents, file=fp)
|
|
|
|
write('------------------------------------------------------------------------------', file=fp)
|
|
|
|
fp.close()
|
|
|
|
#
|
|
|
|
# Type generation
|
|
|
|
def genType(self, typeinfo, name):
|
|
|
|
OutputGenerator.genType(self, typeinfo, name)
|
|
|
|
typeElem = typeinfo.elem
|
|
|
|
# If the type is a struct type, traverse the imbedded <member> tags
|
|
|
|
# generating a structure. Otherwise, emit the tag text.
|
|
|
|
category = typeElem.get('category')
|
|
|
|
if (category == 'struct' or category == 'union'):
|
|
|
|
self.genStruct(typeinfo, name)
|
|
|
|
else:
|
|
|
|
# Replace <apientry /> tags with an APIENTRY-style string
|
|
|
|
# (from self.genOpts). Copy other text through unchanged.
|
|
|
|
# If the resulting text is an empty string, don't emit it.
|
|
|
|
s = noneStr(typeElem.text)
|
|
|
|
for elem in typeElem:
|
|
|
|
if (elem.tag == 'apientry'):
|
|
|
|
s += self.genOpts.apientry + noneStr(elem.tail)
|
|
|
|
else:
|
|
|
|
s += noneStr(elem.text) + noneStr(elem.tail)
|
|
|
|
if (len(s) > 0):
|
|
|
|
if (category in OutputGenerator.categoryToPath.keys()):
|
|
|
|
self.writeInclude(OutputGenerator.categoryToPath[category],
|
|
|
|
name, s + '\n')
|
|
|
|
else:
|
|
|
|
self.logMsg('diag', '# NOT writing include file for type:',
|
|
|
|
name, 'category: ', category)
|
|
|
|
else:
|
|
|
|
self.logMsg('diag', '# NOT writing empty include file for type', name)
|
|
|
|
#
|
|
|
|
# Struct (e.g. C "struct" type) generation.
|
|
|
|
# This is a special case of the <type> tag where the contents are
|
|
|
|
# interpreted as a set of <member> tags instead of freeform C
|
|
|
|
# C type declarations. The <member> tags are just like <param>
|
|
|
|
# tags - they are a declaration of a struct or union member.
|
|
|
|
# Only simple member declarations are supported (no nested
|
|
|
|
# structs etc.)
|
|
|
|
def genStruct(self, typeinfo, typeName):
|
|
|
|
OutputGenerator.genStruct(self, typeinfo, typeName)
|
|
|
|
s = 'typedef ' + typeinfo.elem.get('category') + ' ' + typeName + ' {\n'
|
|
|
|
# paramdecl = self.makeCParamDecl(typeinfo.elem, self.genOpts.alignFuncParam)
|
|
|
|
targetLen = 0;
|
|
|
|
for member in typeinfo.elem.findall('.//member'):
|
|
|
|
targetLen = max(targetLen, self.getCParamTypeLength(member))
|
|
|
|
for member in typeinfo.elem.findall('.//member'):
|
|
|
|
s += self.makeCParamDecl(member, targetLen + 4)
|
|
|
|
s += ';\n'
|
|
|
|
s += '} ' + typeName + ';'
|
|
|
|
self.writeInclude('structs', typeName, s)
|
|
|
|
#
|
|
|
|
# Group (e.g. C "enum" type) generation.
|
|
|
|
# These are concatenated together with other types.
|
|
|
|
def genGroup(self, groupinfo, groupName):
|
|
|
|
OutputGenerator.genGroup(self, groupinfo, groupName)
|
|
|
|
groupElem = groupinfo.elem
|
|
|
|
|
|
|
|
# See if we need min/max/num/padding at end
|
|
|
|
expand = self.genOpts.expandEnumerants
|
|
|
|
|
|
|
|
if expand:
|
|
|
|
expandName = re.sub(r'([0-9a-z_])([A-Z0-9][^A-Z0-9]?)',r'\1_\2',groupName).upper()
|
|
|
|
isEnum = ('FLAG_BITS' not in expandName)
|
|
|
|
|
|
|
|
expandPrefix = expandName
|
|
|
|
expandSuffix = ''
|
|
|
|
|
|
|
|
# Look for a suffix
|
|
|
|
expandSuffixMatch = re.search(r'[A-Z][A-Z]+$',groupName)
|
|
|
|
if expandSuffixMatch:
|
|
|
|
expandSuffix = '_' + expandSuffixMatch.group()
|
|
|
|
# Strip off the suffix from the prefix
|
|
|
|
expandPrefix = expandName.rsplit(expandSuffix, 1)[0]
|
|
|
|
|
|
|
|
# Prefix
|
|
|
|
s = "typedef enum " + groupName + " {\n"
|
|
|
|
|
|
|
|
# Loop over the nested 'enum' tags. Keep track of the minimum and
|
|
|
|
# maximum numeric values, if they can be determined.
|
|
|
|
minName = None
|
|
|
|
for elem in groupElem.findall('enum'):
|
|
|
|
# Convert the value to an integer and use that to track min/max.
|
|
|
|
# Values of form -(number) are accepted but nothing more complex.
|
|
|
|
# Should catch exceptions here for more complex constructs. Not yet.
|
|
|
|
(numVal,strVal) = self.enumToValue(elem, True)
|
|
|
|
name = elem.get('name')
|
|
|
|
|
2016-08-28 10:47:19 +00:00
|
|
|
# Extension enumerants are only included if they are required
|
|
|
|
if (self.isEnumRequired(elem)):
|
2016-07-11 01:13:41 +00:00
|
|
|
s += " " + name + " = " + strVal + ",\n"
|
|
|
|
|
|
|
|
if (expand and isEnum and elem.get('extends') is None):
|
|
|
|
if (minName == None):
|
|
|
|
minName = maxName = name
|
|
|
|
minValue = maxValue = numVal
|
|
|
|
elif (numVal < minValue):
|
|
|
|
minName = name
|
|
|
|
minValue = numVal
|
|
|
|
elif (numVal > maxValue):
|
|
|
|
maxName = name
|
|
|
|
maxValue = numVal
|
|
|
|
# Generate min/max value tokens and a range-padding enum. Need some
|
|
|
|
# additional padding to generate correct names...
|
|
|
|
if (expand):
|
|
|
|
s += "\n"
|
|
|
|
if isEnum:
|
|
|
|
s += " " + expandPrefix + "_BEGIN_RANGE" + expandSuffix + " = " + minName + ",\n"
|
|
|
|
s += " " + expandPrefix + "_END_RANGE" + expandSuffix + " = " + maxName + ",\n"
|
|
|
|
s += " " + expandPrefix + "_RANGE_SIZE" + expandSuffix + " = (" + maxName + " - " + minName + " + 1),\n"
|
|
|
|
|
|
|
|
s += " " + expandPrefix + "_MAX_ENUM" + expandSuffix + " = 0x7FFFFFFF\n"
|
|
|
|
# Postfix
|
|
|
|
s += "} " + groupName + ";"
|
|
|
|
self.writeInclude('enums', groupName, s)
|
|
|
|
# Enumerant generation
|
|
|
|
# <enum> tags may specify their values in several ways, but are usually
|
|
|
|
# just integers.
|
|
|
|
def genEnum(self, enuminfo, name):
|
|
|
|
OutputGenerator.genEnum(self, enuminfo, name)
|
|
|
|
(numVal,strVal) = self.enumToValue(enuminfo.elem, False)
|
|
|
|
s = '#define ' + name.ljust(33) + ' ' + strVal
|
|
|
|
self.logMsg('diag', '# NOT writing compile-time constant', name)
|
|
|
|
# self.writeInclude('consts', name, s)
|
|
|
|
#
|
|
|
|
# Command generation
|
|
|
|
def genCmd(self, cmdinfo, name):
|
|
|
|
OutputGenerator.genCmd(self, cmdinfo, name)
|
|
|
|
#
|
|
|
|
decls = self.makeCDecls(cmdinfo.elem)
|
|
|
|
self.writeInclude('protos', name, decls[0])
|