2017-06-28 18:30:20 +00:00
|
|
|
#!/usr/bin/python3
|
|
|
|
#
|
Change log for January 5, 2018 Vulkan 1.0.67 spec update:
* Bump API patch number and header version number to 67 for this update.
* Update copyright dates to 2018
Github Issues:
* Fix texture lookup functions in `GL_KHR_vulkan_glsl` specification
(public pull request 363).
* Clarify the state waited semaphores are left in when a call to
flink:vkQueuePresentKHR fails (public issue 572).
* Cleanup descriptions of slink:VkObjectTablePushConstantEntryNVX and
slink:VkObjectTableDescriptorSetEntryNVX (public issue 583)
* Remove redundant flink:vkCmdSetDiscardRectangleEXT valid usage
statements (public pull 586).
* Make dynamic state array length valid usage statements implicit for
flink:vkCmdSetViewportWScalingNV, flink:vkCmdSetDiscardRectangleEXT, and
flink:vkCmdSetViewport (public pull 589).
* Clarify meaning of window extent (0,0) in slink:VkSwapchainKHR for the
Windows and X11 platforms, in their respective extensions (public issue
590).
* Allow flink:vkGetPastPresentationTimingGOOGLE to return
ename:VK_INCOMPLETE (public issue 604).
* Add synchronization valid usage statements to flink:vkAcquireNextImage
(public pull 611).
* Fix some broken external links and internal xrefs (public pull 613).
* Clean up slink:VkViewport valid usage statements in the presence or
absence of relevant extensions (public pull 623).
* Remove
ename:VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL_KHR
token from VK_KHR_maintenance2 from the non-extension VU path for
slink:VkGraphicsPipelineCreateInfo (public issue 628).
* Miscellaneous minor markup fixes - extension name strings (public pull
631), Notes (pull 633), queue names emitted by generator scripts (pull
634), block formatting in slink:VkDescriptorUpdateTemplateEntryKHR (pull
635), ename:VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG (pull
641), quotes and apostrophes (pull 643),
* Miscellaneous minor grammar fixes (public pull 644).
* Fix markup macros so usage like ptext:*Src* works (public pull 647).
Internal Issues:
* Clarify in the `VK_KHR_surface` and `VK_KHR_swapchain` extensions that
parameter combinations which aren't supported for normal images are also
unsupported for presentable images, even if the parameter values are
individually supported as reported by the surface capability queries
(internal issue 1029).
* Fixed XML typo in the valid value field of the pname:sType member of
slink:VkPhysicalDeviceExternalMemoryHostPropertiesEXT (internal issue
1100).
Other Issues:
* Add memory semantics validity rules to the <<spirvenv-module-validation,
Validation Rules within a Module>> section of the SPIR-V environment
appendix, and specify that sequentiality consistency is not supported.
This forbids certain cases like "`Load+Release`" that we don't expect to
ever be meaningful.
* Document mapping of OpenGL Shading Language barriers to SPIR-V scope and
semantics in the `GL_KHR_vulkan_glsl` specification.
New Extensions:
* `VK_EXT_conservative_rasterization`
2018-01-06 01:39:15 +00:00
|
|
|
# Copyright (c) 2016-2018 The Khronos Group Inc.
|
2017-06-28 18:30:20 +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.
|
|
|
|
|
|
|
|
# fixupRef.py - replace old // refBegin .. // refEnd syntax with new
|
|
|
|
# open block syntax
|
|
|
|
#
|
|
|
|
# Usage: fixupRef.py [-outdir path] [-overwrite] files
|
|
|
|
|
|
|
|
from reflib import *
|
|
|
|
import argparse, copy, io, os, pdb, re, string, sys
|
|
|
|
|
|
|
|
def prefix(depth):
|
|
|
|
return ' ' * depth
|
|
|
|
|
|
|
|
openPat = re.compile('^\[open,(?P<attribs>refpage=.*)\]')
|
|
|
|
ifdefPat = re.compile('^if(n|)def::(?P<condition>.*)\[(?P<text>.*)\]')
|
|
|
|
endifPat = re.compile('^endif::(?P<condition>.*)\[\]')
|
|
|
|
|
|
|
|
# Look for imbalanced block delimiters and conditionals
|
|
|
|
# specFile - filename to examine
|
|
|
|
def findBalance(specFile):
|
|
|
|
file = loadFile(specFile)
|
|
|
|
if file == None:
|
|
|
|
return
|
|
|
|
|
|
|
|
# blocks[] is a stack of nesting constructs, each of which is
|
|
|
|
# [ '--', line, None ] for a -- delimiter on line
|
|
|
|
# [ 'ifdef', line, condition] for an ifdef or ifndef on line
|
|
|
|
blocks = []
|
|
|
|
|
|
|
|
line = 1
|
|
|
|
|
|
|
|
for str in file:
|
|
|
|
blockDepth = len(blocks)
|
|
|
|
if blockDepth > 0:
|
|
|
|
thisBlock = blocks[blockDepth-1]
|
|
|
|
blockType = thisBlock[0]
|
|
|
|
blockLine = thisBlock[1]
|
|
|
|
blockCondition = thisBlock[2]
|
|
|
|
else:
|
|
|
|
thisBlock = None
|
|
|
|
blockType = None
|
|
|
|
blockLine = None
|
|
|
|
blockCondition = None
|
|
|
|
|
|
|
|
if str.rstrip() == '--':
|
|
|
|
if (blockDepth > 0 and blockType == '--'):
|
|
|
|
print(prefix(blockDepth - 1) +
|
|
|
|
'Closing -- block opened @', blockLine,
|
|
|
|
'-> new block depth =', blockDepth - 1)
|
|
|
|
blocks.pop()
|
|
|
|
else:
|
|
|
|
print(prefix(blockDepth) +
|
|
|
|
'Opening -- block @', line,
|
|
|
|
'-> new block depth:', blockDepth + 1)
|
|
|
|
blocks.append([ '--', line, None ])
|
|
|
|
line = line + 1
|
|
|
|
continue
|
|
|
|
|
|
|
|
matches = beginPat.search(str)
|
|
|
|
if matches != None:
|
|
|
|
# print('Matched [open pattern @', line, ':', str.rstrip())
|
|
|
|
line = line + 1
|
|
|
|
continue
|
|
|
|
|
|
|
|
matches = ifdefPat.search(str)
|
|
|
|
if matches != None:
|
|
|
|
condition = matches.group('condition')
|
|
|
|
text = matches.group('text')
|
|
|
|
|
|
|
|
if text != '':
|
|
|
|
print('Matched self-closing if(n)def pattern @', line,
|
|
|
|
'condition:', condition, 'text:', text)
|
|
|
|
else:
|
|
|
|
print(prefix(blockDepth) +
|
|
|
|
'Opening if(n)def block @', line,
|
|
|
|
'-> new block depth =', blockDepth + 1,
|
|
|
|
'condition:', condition)
|
|
|
|
blocks.append([ 'ifdef', line, condition ])
|
|
|
|
|
|
|
|
line = line + 1
|
|
|
|
continue
|
|
|
|
|
|
|
|
matches = endifPat.search(str)
|
|
|
|
if matches != None:
|
|
|
|
condition = matches.group('condition')
|
|
|
|
|
|
|
|
if (blockDepth > 0):
|
|
|
|
if blockType == 'ifdef':
|
|
|
|
# Try closing an ifdef/ifndef block
|
|
|
|
if blockCondition != condition:
|
|
|
|
print('** WARNING:', specFile,
|
|
|
|
'endif @', blockLine,
|
|
|
|
'block depth:', blockDepth,
|
|
|
|
'condition', condition,
|
|
|
|
'does not match ifdef/ifndef @',
|
|
|
|
blockLine, 'condition', blockCondition)
|
|
|
|
|
|
|
|
print(prefix(blockDepth - 1) +
|
|
|
|
'Closing endif block @', line,
|
|
|
|
'-> new block depth =', blockDepth - 1)
|
|
|
|
blocks.pop()
|
|
|
|
elif blockType == '--':
|
|
|
|
# An overlap!
|
|
|
|
print('** ERROR:', specFile, 'endif @', line,
|
|
|
|
'block depth:', blockDepth,
|
|
|
|
'overlaps -- block start @', blockLine)
|
|
|
|
else:
|
|
|
|
# Should never get here
|
|
|
|
print('** ERROR:', specFile,
|
|
|
|
'block depth:', blockDepth,
|
|
|
|
'unknown open block type:', blockType)
|
|
|
|
else:
|
|
|
|
# Unlikely error condition from bad markup
|
|
|
|
print('** ERROR:', specFile,
|
|
|
|
'block depth:', blockDepth,
|
|
|
|
'endif @', line, 'with no matching open block')
|
|
|
|
|
|
|
|
line = line + 1
|
|
|
|
continue
|
|
|
|
|
|
|
|
line = line + 1
|
|
|
|
|
|
|
|
blockDepth = len(blocks)
|
|
|
|
if blockDepth > 0:
|
|
|
|
print('** ERROR:', specFile, 'still in open block at EOF:',
|
|
|
|
'block depth =', blockDepth,
|
|
|
|
'block type:', blocks[blockDepth-1][0])
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
|
global genDict
|
|
|
|
genDict = {}
|
|
|
|
|
|
|
|
parser = argparse.ArgumentParser()
|
|
|
|
|
|
|
|
parser.add_argument('-diag', action='store', dest='diagFile',
|
|
|
|
help='Set the diagnostic file')
|
|
|
|
parser.add_argument('-warn', action='store', dest='warnFile',
|
|
|
|
help='Set the warning file')
|
|
|
|
parser.add_argument('-log', action='store', dest='logFile',
|
|
|
|
help='Set the log file for both diagnostics and warnings')
|
|
|
|
parser.add_argument('files', metavar='filename', nargs='*',
|
|
|
|
help='a filename to extract ref pages from')
|
|
|
|
parser.add_argument('--version', action='version', version='%(prog)s 1.0')
|
|
|
|
|
|
|
|
results = parser.parse_args()
|
|
|
|
|
|
|
|
setLogFile(True, True, results.logFile)
|
|
|
|
setLogFile(True, False, results.diagFile)
|
|
|
|
setLogFile(False, True, results.warnFile)
|
|
|
|
|
|
|
|
skipped = set()
|
|
|
|
for file in results.files:
|
|
|
|
findBalance(file)
|
|
|
|
|
|
|
|
if len(skipped) > 0:
|
|
|
|
print('Files containing skipped feature blocks:')
|
|
|
|
for file in sorted(skipped):
|
|
|
|
print('\t' + file)
|