2016-07-11 01:13:41 +00:00
|
|
|
#!/usr/bin/python3 -i
|
|
|
|
#
|
Change log for January 23, 2017 Vulkan 1.0.39 spec update:
* Bump API patch number and header version number to 39 for this update.
Github Issues:
* Clarified that only accesses via the specified buffer/image subresource
ranges are included in the access scopes (public issue 306).
* Add missing valid usage statements for flink:vkCreateComputePipelines
and flink:vkCreateGraphicsPipelines (public issue 427).
Internal Issues:
* Add a Note to the <<invariance,Invariance>> appendix about a difference
between OpenGL and Vulkan with regards to how primitives derived from
offsets are handled (internal issue 355).
* Add the +<<VK_KHR_get_physical_device_properties2>>+,
+<<VK_KHR_maintenance1>>+, and +<<VK_KHR_shader_draw_parameters>>+
extensions (internal issue 448).
* Add the +<<VK_EXT_shader_subgroup_vote>>+ and
+<<VK_EXT_shader_subgroup_ballot>>+ extensions (internal issue 449).
* Update the texture level-of-detail equation in the
<<textures-scale-factor,Scale Factor Operation>> section to better
approximate the ellipse major and minor axes (internal issue 547).
* Forbid non-explicitly allowed uses of interface decorations in the
introduction to the <<interfaces,Shader Interfaces>> chapter (internal
issue 607).
* Replace use of MathJax with KaTeX, for improved load-time performance as
well as avoiding the scrolling-and-scrolling behavior due to MathJax
asynchronous rendering when loading at an anchor inside the spec. This
change also requires moving to HTML5 output for the spec instead of
XHTML, and there is a visible difference in that the chapter navigation
index is now in a scrollable sidebar instead of at the top of the
document. We may or may not retain the nav sidebar based on feedback
(internal issue 613).
* Improve consistency of markup and formatting in extension appendices
(internal issue 631).
Other Issues:
* Add explicit valid usage statements to slink:VkImageCopy requiring that
the source and destination layer ranges be contained in their respective
source and destination images.
* Add valid usage language for swapchain of flink:vkAcquireNextImage. If
the swapchain has been replaced, then it should not be passed to
flink:vkAcquireNextImage.
* Add a valid usage statement to flink:vkCreateImageView, that the image
must have been created with an appropriate usage bit set.
* Noted that slink:VkDisplayPresentInfoKHR is a valid extension of
slink:VkPresentInfoKHR in the <<wsi_swapchain,WSI Swapchain>> section.
* Update valid usage for flink:vkCmdSetViewport and flink:vkCmdSetScissor
to account for the multiple viewport feature. If the feature is not
enabled, the parameters for these functions have required values that
are defined in the <<features-features-multiViewport,multiple
viewports>> section of the spec but were not reflected in the valid
usage text for these functions.
* Add the +<<VK_EXT_swapchain_colorspace>>+ extension defining common
color spaces.
2017-01-18 04:11:25 +00:00
|
|
|
# Copyright (c) 2013-2017 The Khronos Group Inc.
|
2016-07-11 01:13:41 +00:00
|
|
|
#
|
|
|
|
# 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 *
|
|
|
|
|
|
|
|
# CGeneratorOptions - subclass of GeneratorOptions.
|
|
|
|
#
|
|
|
|
# Adds options used by COutputGenerator objects during C language header
|
|
|
|
# generation.
|
|
|
|
#
|
|
|
|
# Additional members
|
|
|
|
# prefixText - list of strings to prefix generated header with
|
|
|
|
# (usually a copyright statement + calling convention macros).
|
|
|
|
# protectFile - True if multiple inclusion protection should be
|
|
|
|
# generated (based on the filename) around the entire header.
|
|
|
|
# protectFeature - True if #ifndef..#endif protection should be
|
|
|
|
# generated around a feature interface in the header file.
|
|
|
|
# genFuncPointers - True if function pointer typedefs should be
|
|
|
|
# generated
|
|
|
|
# protectProto - If conditional protection should be generated
|
|
|
|
# around prototype declarations, set to either '#ifdef'
|
|
|
|
# to require opt-in (#ifdef protectProtoStr) or '#ifndef'
|
|
|
|
# to require opt-out (#ifndef protectProtoStr). Otherwise
|
|
|
|
# set to None.
|
|
|
|
# protectProtoStr - #ifdef/#ifndef symbol to use around prototype
|
|
|
|
# declarations, if protectProto is set
|
|
|
|
# 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.
|
|
|
|
# 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
|
|
|
|
class CGeneratorOptions(GeneratorOptions):
|
|
|
|
"""Represents options during C interface generation for headers"""
|
|
|
|
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 = "",
|
|
|
|
genFuncPointers = True,
|
|
|
|
protectFile = True,
|
|
|
|
protectFeature = True,
|
|
|
|
protectProto = None,
|
|
|
|
protectProtoStr = None,
|
|
|
|
apicall = '',
|
|
|
|
apientry = '',
|
|
|
|
apientryp = '',
|
|
|
|
indentFuncProto = True,
|
|
|
|
indentFuncPointer = False,
|
|
|
|
alignFuncParam = 0):
|
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.genFuncPointers = genFuncPointers
|
|
|
|
self.protectFile = protectFile
|
|
|
|
self.protectFeature = protectFeature
|
|
|
|
self.protectProto = protectProto
|
|
|
|
self.protectProtoStr = protectProtoStr
|
|
|
|
self.apicall = apicall
|
|
|
|
self.apientry = apientry
|
|
|
|
self.apientryp = apientryp
|
|
|
|
self.indentFuncProto = indentFuncProto
|
|
|
|
self.indentFuncPointer = indentFuncPointer
|
|
|
|
self.alignFuncParam = alignFuncParam
|
|
|
|
|
|
|
|
# COutputGenerator - subclass of OutputGenerator.
|
|
|
|
# Generates C-language API interfaces.
|
|
|
|
#
|
|
|
|
# ---- methods ----
|
|
|
|
# COutputGenerator(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 COutputGenerator(OutputGenerator):
|
|
|
|
"""Generate specified API interfaces in a specific style, such as a C header"""
|
|
|
|
# This is an ordered list of sections in the header file.
|
|
|
|
TYPE_SECTIONS = ['include', 'define', 'basetype', 'handle', 'enum',
|
|
|
|
'group', 'bitmask', 'funcpointer', 'struct']
|
|
|
|
ALL_SECTIONS = TYPE_SECTIONS + ['commandPointer', 'command']
|
|
|
|
def __init__(self,
|
|
|
|
errFile = sys.stderr,
|
|
|
|
warnFile = sys.stderr,
|
|
|
|
diagFile = sys.stdout):
|
|
|
|
OutputGenerator.__init__(self, errFile, warnFile, diagFile)
|
|
|
|
# Internal state - accumulators for different inner block text
|
|
|
|
self.sections = dict([(section, []) for section in self.ALL_SECTIONS])
|
|
|
|
#
|
|
|
|
def beginFile(self, genOpts):
|
|
|
|
OutputGenerator.beginFile(self, genOpts)
|
|
|
|
# C-specific
|
|
|
|
#
|
|
|
|
# Multiple inclusion protection & C++ wrappers.
|
|
|
|
if (genOpts.protectFile and self.genOpts.filename):
|
|
|
|
headerSym = re.sub('\.h', '_h_',
|
|
|
|
os.path.basename(self.genOpts.filename)).upper()
|
|
|
|
write('#ifndef', headerSym, file=self.outFile)
|
|
|
|
write('#define', headerSym, '1', file=self.outFile)
|
|
|
|
self.newline()
|
|
|
|
write('#ifdef __cplusplus', file=self.outFile)
|
|
|
|
write('extern "C" {', file=self.outFile)
|
|
|
|
write('#endif', file=self.outFile)
|
|
|
|
self.newline()
|
|
|
|
#
|
|
|
|
# User-supplied prefix text, if any (list of strings)
|
|
|
|
if (genOpts.prefixText):
|
|
|
|
for s in genOpts.prefixText:
|
|
|
|
write(s, file=self.outFile)
|
|
|
|
#
|
|
|
|
# Some boilerplate describing what was generated - this
|
|
|
|
# will probably be removed later since the extensions
|
|
|
|
# pattern may be very long.
|
|
|
|
# write('/* Generated C header for:', file=self.outFile)
|
|
|
|
# write(' * API:', genOpts.apiname, file=self.outFile)
|
|
|
|
# if (genOpts.profile):
|
|
|
|
# write(' * Profile:', genOpts.profile, file=self.outFile)
|
|
|
|
# write(' * Versions considered:', genOpts.versions, file=self.outFile)
|
|
|
|
# write(' * Versions emitted:', genOpts.emitversions, file=self.outFile)
|
|
|
|
# write(' * Default extensions included:', genOpts.defaultExtensions, file=self.outFile)
|
|
|
|
# write(' * Additional extensions included:', genOpts.addExtensions, file=self.outFile)
|
|
|
|
# write(' * Extensions removed:', genOpts.removeExtensions, file=self.outFile)
|
|
|
|
# write(' */', file=self.outFile)
|
|
|
|
def endFile(self):
|
|
|
|
# C-specific
|
|
|
|
# Finish C++ wrapper and multiple inclusion protection
|
|
|
|
self.newline()
|
|
|
|
write('#ifdef __cplusplus', file=self.outFile)
|
|
|
|
write('}', file=self.outFile)
|
|
|
|
write('#endif', file=self.outFile)
|
|
|
|
if (self.genOpts.protectFile and self.genOpts.filename):
|
|
|
|
self.newline()
|
|
|
|
write('#endif', file=self.outFile)
|
|
|
|
# Finish processing in superclass
|
|
|
|
OutputGenerator.endFile(self)
|
|
|
|
def beginFeature(self, interface, emit):
|
|
|
|
# Start processing in superclass
|
|
|
|
OutputGenerator.beginFeature(self, interface, emit)
|
|
|
|
# C-specific
|
|
|
|
# Accumulate includes, defines, types, enums, function pointer typedefs,
|
|
|
|
# end function prototypes separately for this feature. They're only
|
|
|
|
# printed in endFeature().
|
|
|
|
self.sections = dict([(section, []) for section in self.ALL_SECTIONS])
|
|
|
|
def endFeature(self):
|
|
|
|
# C-specific
|
|
|
|
# Actually write the interface to the output file.
|
|
|
|
if (self.emit):
|
|
|
|
self.newline()
|
|
|
|
if (self.genOpts.protectFeature):
|
|
|
|
write('#ifndef', self.featureName, file=self.outFile)
|
|
|
|
# If type declarations are needed by other features based on
|
|
|
|
# this one, it may be necessary to suppress the ExtraProtect,
|
|
|
|
# or move it below the 'for section...' loop.
|
|
|
|
if (self.featureExtraProtect != None):
|
|
|
|
write('#ifdef', self.featureExtraProtect, file=self.outFile)
|
|
|
|
write('#define', self.featureName, '1', file=self.outFile)
|
|
|
|
for section in self.TYPE_SECTIONS:
|
|
|
|
contents = self.sections[section]
|
|
|
|
if contents:
|
|
|
|
write('\n'.join(contents), file=self.outFile)
|
|
|
|
self.newline()
|
|
|
|
if (self.genOpts.genFuncPointers and self.sections['commandPointer']):
|
|
|
|
write('\n'.join(self.sections['commandPointer']), file=self.outFile)
|
|
|
|
self.newline()
|
|
|
|
if (self.sections['command']):
|
|
|
|
if (self.genOpts.protectProto):
|
|
|
|
write(self.genOpts.protectProto,
|
|
|
|
self.genOpts.protectProtoStr, file=self.outFile)
|
|
|
|
write('\n'.join(self.sections['command']), end='', file=self.outFile)
|
|
|
|
if (self.genOpts.protectProto):
|
|
|
|
write('#endif', file=self.outFile)
|
|
|
|
else:
|
|
|
|
self.newline()
|
|
|
|
if (self.featureExtraProtect != None):
|
|
|
|
write('#endif /*', self.featureExtraProtect, '*/', file=self.outFile)
|
|
|
|
if (self.genOpts.protectFeature):
|
|
|
|
write('#endif /*', self.featureName, '*/', file=self.outFile)
|
|
|
|
# Finish processing in superclass
|
|
|
|
OutputGenerator.endFeature(self)
|
|
|
|
#
|
|
|
|
# Append a definition to the specified section
|
|
|
|
def appendSection(self, section, text):
|
|
|
|
# self.sections[section].append('SECTION: ' + section + '\n')
|
|
|
|
self.sections[section].append(text)
|
|
|
|
#
|
|
|
|
# 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 s:
|
|
|
|
# Add extra newline after multi-line entries.
|
|
|
|
if '\n' in s:
|
|
|
|
s += '\n'
|
2017-08-01 00:22:11 +00:00
|
|
|
# This is a temporary workaround for internal issue #877,
|
|
|
|
# while we consider other approaches. The problem is that
|
|
|
|
# function pointer types can have dependencies on structures
|
|
|
|
# and vice-versa, so they can't be strictly separated into
|
|
|
|
# sections. The workaround is to define those types in the
|
|
|
|
# same section, in dependency order.
|
|
|
|
if (category == 'funcpointer'):
|
|
|
|
self.appendSection('struct', s)
|
|
|
|
else:
|
|
|
|
self.appendSection(category, s)
|
2016-07-11 01:13:41 +00:00
|
|
|
#
|
|
|
|
# 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)
|
|
|
|
body = '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'):
|
|
|
|
body += self.makeCParamDecl(member, targetLen + 4)
|
|
|
|
body += ';\n'
|
|
|
|
body += '} ' + typeName + ';\n'
|
|
|
|
self.appendSection('struct', body)
|
|
|
|
#
|
|
|
|
# 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
|
|
|
|
|
Change log for February 27, 2017 Vulkan 1.0.42 spec update:
* Bump API patch number and header version number to 42 for this update
(the first anniversary edition).
Github Issues:
* Changed asciidoctor macros so cross-page links in the standalone
reference pages function properly (public issue 462).
Internal Issues:
* Clarified host visibility discussion for slink:VkMemoryType,
flink:vkInvalidateMappedMemoryRanges, elink:VkAccessFlagBits, and the
<<synchronization-framebuffer-regions,Framebuffer Region Dependencies>>
section, removing duplicated information and adding a central definition
in the access types section (internal issue 552).
* Change description of
slink:vkGetPhysicalDeviceSurfacePresentModesKHR::pname:pPresentModes to
return an array of values, not structures (internal issue 699).
New Extensions:
* Add a NOTE to the <<extensions,Layers & Extensions>> chapter describing
the experimental status of `KHX` extensions.
* Add new Khronos, Khronos Experimental, and vendor Vulkan extensions for
release at GDC:
** VK_KHR_descriptor_update_template
** VK_KHR_push_descriptor
** VK_KHX_device_group
** VK_KHX_device_group_creation
** VK_KHX_external_memory
** VK_KHX_external_memory_capabilities
** VK_KHX_external_memory_fd
** VK_KHX_external_memory_win32
** VK_KHX_external_semaphore
** VK_KHX_external_semaphore_capabilities
** VK_KHX_external_semaphore_fd
** VK_KHX_external_semaphore_win32
** VK_KHX_multiview
** VK_KHX_win32_keyed_mutex
** VK_EXT_discard_rectangles
** VK_MVK_ios_surface
** VK_MVK_macos_surface
** VK_NVX_multiview_per_view_attributes
** VK_NV_clip_space_w_scaling
** VK_NV_geometry_shader_passthrough
** VK_NV_sample_mask_override_coverage
** VK_NV_viewport_array2
** VK_NV_viewport_swizzle
* Add new GLSL vendor extensions to support new builtin variables:
** GL_EXT_device_group
** GL_EXT_multiview
2017-02-27 06:54:26 +00:00
|
|
|
expandName = re.sub(r'([0-9a-z_])([A-Z0-9])',r'\1_\2',groupName).upper()
|
2016-07-11 01:13:41 +00:00
|
|
|
|
|
|
|
expandPrefix = expandName
|
|
|
|
expandSuffix = ''
|
|
|
|
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
|
|
|
|
body = "\ntypedef enum " + groupName + " {\n"
|
|
|
|
|
2016-08-28 10:47:19 +00:00
|
|
|
# @@ Should use the type="bitmask" attribute instead
|
2016-07-11 01:13:41 +00:00
|
|
|
isEnum = ('FLAG_BITS' not in expandPrefix)
|
|
|
|
|
|
|
|
# Loop over the nested 'enum' tags. Keep track of the minimum and
|
|
|
|
# maximum numeric values, if they can be determined; but only for
|
|
|
|
# core API enumerants, not extension enumerants. This is inferred
|
|
|
|
# by looking for 'extends' attributes.
|
|
|
|
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')
|
|
|
|
|
Change log for August 14, 2017 Vulkan 1.0.58 spec update:
* Bump API patch number and header version number to 58 for this update.
Github Issues:
* Update the <<interfaces-resources-descset,Descriptor Set Interface>>
section to allow multiple variables with the same descriptor set/binding
decorations, and require that all variables that are statically used
must be consistent with the pipeline layout. Allow
ename:VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER to be used with texture
and sampler variables (public issues 522, 524).
Internal Issues:
* Replace networkx package used for extension dependency generation with a
homegrown network dependency traverser (internal issue 713).
* Specify in the <<interfaces-fragmentoutput, Fragment Output Interface>>
section that if a fragment shader writes integers that cannot be
represented in the format of the colour attachment, then the result is
undefined (internal issue 893).
* Separate malformed valid usage statement for
slink:VkPipelineRasterizationStateCreateInfo into two (internal issue
918).
* Fix cases where the term 'pNext chain' is incorrectly used in reference
to functions, rather than their parameters. Replace 'pNext list' with
'pNext chain'. Fixed typo in the example code of
+VK_KHR_dedicated_allocation+ (internal issue 944).
* Fix typo in elink:VkExternalSemaphoreHandleTypeFlagBitsKHR enum
descriptions, replacing
etext:VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FENCE_FD_BIT_KHR with
ename:VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR, and make the
description more consistent with
VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR (internal issue 950).
Other Issues:
* Clarify how pipeline stage masks affect
<<synchronization-pipeline-stages-masks, access and synchronization
scopes>>.
* Clarify that dedicated allocations do not allow aliasing in the
flink:vkBindBufferMemory and flink:vkBindImageMemory valid usage
statements.
* Correct specification of pname:dynamicCount for push_constant token in
slink:VkIndirectCommandsLayoutNVX.
New Extensions:
* `VK_EXT_shader_viewport_index_layer`
2017-08-14 08:58:07 +00:00
|
|
|
# Check for duplicate enum values and raise an error if found.
|
|
|
|
for elem2 in groupElem.findall('enum'):
|
|
|
|
if (elem != elem2):
|
|
|
|
(numVal2,strVal2) = self.enumToValue(elem2, True)
|
|
|
|
if (numVal2 == numVal):
|
|
|
|
raise UserWarning('Duplicate enum ' + name + ' = ' + elem2.get('name') + ' = ' + strVal)
|
|
|
|
|
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
|
|
|
body += " " + name + " = " + strVal + ",\n"
|
|
|
|
|
2016-08-28 10:47:19 +00:00
|
|
|
if (isEnum and elem.get('extends') is None):
|
2016-07-11 01:13:41 +00:00
|
|
|
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 isEnum:
|
|
|
|
body += " " + expandPrefix + "_BEGIN_RANGE" + expandSuffix + " = " + minName + ",\n"
|
|
|
|
body += " " + expandPrefix + "_END_RANGE" + expandSuffix + " = " + maxName + ",\n"
|
|
|
|
body += " " + expandPrefix + "_RANGE_SIZE" + expandSuffix + " = (" + maxName + " - " + minName + " + 1),\n"
|
|
|
|
|
|
|
|
body += " " + expandPrefix + "_MAX_ENUM" + expandSuffix + " = 0x7FFFFFFF\n"
|
|
|
|
|
|
|
|
# Postfix
|
|
|
|
body += "} " + groupName + ";"
|
|
|
|
if groupElem.get('type') == 'bitmask':
|
|
|
|
section = 'bitmask'
|
|
|
|
else:
|
|
|
|
section = 'group'
|
|
|
|
self.appendSection(section, body)
|
|
|
|
# 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)
|
|
|
|
body = '#define ' + name.ljust(33) + ' ' + strVal
|
|
|
|
self.appendSection('enum', body)
|
|
|
|
#
|
|
|
|
# Command generation
|
|
|
|
def genCmd(self, cmdinfo, name):
|
|
|
|
OutputGenerator.genCmd(self, cmdinfo, name)
|
|
|
|
#
|
|
|
|
decls = self.makeCDecls(cmdinfo.elem)
|
|
|
|
self.appendSection('command', decls[0] + '\n')
|
|
|
|
if (self.genOpts.genFuncPointers):
|
|
|
|
self.appendSection('commandPointer', decls[1])
|