Jon Leech 476e3f422d Change log for March 18, 2019 Vulkan 1.1.104 spec update:
* Update release number to 104.

Public Issues:

  * Remove the incorrect line from "`Initial`" to "`Invalid`" state in the
    <<commandbuffer-lifecycle-diagram, Lifecycle of a command buffer>>
    diagram (public issue 881).
  * Add Fuchsia platform to <<boilerplate-wsi-header-table, Window System
    Extensions and Headers>> table (public pull request 933).
  * Change the type of
    slink:VkBufferDeviceAddressCreateInfoEXT::pname:deviceAddress from
    basetype:VkDeviceSize to basetype:VkDeviceAddress. These are both
    typedefs of code:uint64_t, so it is an ABI-compatible change (public
    issue 934).

Internal Issues:

  * Remove generated header files and update the CI tests to build a copy of
    the headers for use by the hpp-generate / hpp-compile CI stages. Targets
    to generate the headers will not be removed, but keeping these generated
    files in the repository increased the frequency of conflicts between
    branches when merging to master (internal issue 745).
  * Reword "`undefined: behavior if *action*" to "`must: not do *action*`"
    in the places the old terminology was used, and add a new
    <<writing-undefined, Describing Undefined Behavior>> section of the
    style guide to explain how to write such language in the future
    (internal issue 1579).
  * Move almost all Python scripts into the toplevel `scripts/` directory.
    Apply extensive internal edits to clean up and simplify the scripts, and
    try to follow PEP8 guidelines. Generalize the scripts with the use of a
    Conventions object controlling many aspects of output generation, to
    enable their use in other Khronos projects with similar requirements.
    Autogenerate extension interface refpages (these are experimental and
    may be retired going forward).

New Extensions:

  * `VK_AMD_display_native_hdr`
  * `VK_EXT_full_screen_exclusive` (internal issue 1439)
  * `VK_EXT_host_query_reset`
  * `VK_EXT_pipeline_creation_feedback` (internal issue 1560)
  * `VK_KHR_surface_protected_capabilities` (internal issue 1520)
2019-03-17 06:05:46 -07:00

213 lines
7.2 KiB
Python
Executable File

#!/usr/bin/python3
#
# Copyright (c) 2016-2019 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.
# fixupRef.py - replace old // refBegin .. // refEnd syntax with new
# open block syntax
#
# Usage: fixupRef.py [-outdir path] [-overwrite] files
from reflib import *
from vkapi import *
import argparse, copy, io, os, pdb, re, string, sys
# Return 'None' for None, the string otherwise
def noneStr(str):
if str == None:
return '(None)'
else:
return str
# Escape single quotes in a string for asciidoc
def escapeQuote(str):
return str.replace("'", "\'")
# Start a refpage open block
def openBlock(pi, fp):
if pi.refs != '':
print("[open,refpage='" + pi.name +
"',desc='" + pi.desc +
"',type='" + pi.type +
"',xrefs='" + pi.refs + "']",
file=fp)
else:
print("[open,refpage='" + pi.name +
"',desc='" + pi.desc +
"',type='" + pi.type + "']",
file=fp)
print('--', file=fp)
# End a refpage open block
def closeBlock(pi, fp):
print('--', file=fp)
# Just for finding block ends while debugging
# print("// end [open,refpage='" + pi.name + "']", file=fp)
# Replace old // refBegin .. // refEnd references in an asciidoc
# file with open blocks, per # ??? .
# specFile - filename to extract from
# outDir - output directory to write updated file to, if not overwritten
# overwrite - True if the file should be overwritten in place
# skipped - set of filenames containing commands which weren't
# rewritten with open blocks (e.g. enums). Updated in place.
def replaceRef(specFile, outDir, overwrite = False, skipped = set()):
file = loadFile(specFile)
if file == None:
return
# Save the path to this file for later use in rewriting relative includes
specDir = os.path.dirname(os.path.abspath(specFile))
pageMap = findRefs(file)
logDiag(specFile + ': found', len(pageMap.keys()), 'potential pages')
sys.stderr.flush()
# Fix up references in pageMap
fixupRefs(pageMap, specFile, file)
# Map the page info dictionary into a dictionary of actions
# keyed by line number they're performed on/after:
# 'action' : 'begin' or 'end'. What to do on a refBegin or refEnd line
# 'replace': True if this line needs to be replaced
# 'name' : Name of the ref page being defined
# 'desc' : One-line description of the ref page being defined
# 'type' : Type of the ref page being defined, 'structs', 'protos', etc.
# 'refs' : Space-separated string of crossreferenced pages
actions = { }
for name in pageMap.keys():
pi = pageMap[name]
# Cleanup parameters for output
pi.name = noneStr(pi.name)
pi.desc = escapeQuote(noneStr(pi.desc))
if pi.extractPage:
if (file[pi.begin][0:11] == '// refBegin'):
# Replace line
actions[pi.begin] = {
'action' : 'begin',
'replace' : True,
'pageinfo' : pi
}
else:
# Insert line
actions[pi.begin] = {
'action' : 'begin',
'replace' : False,
'pageinfo' : pi
}
if (file[pi.end][0:9] == '// refEnd'):
# Replace line
actions[pi.end] = {
'action' : 'end',
'replace' : True,
'pageinfo' : pi
}
else:
# Insert line
actions[pi.end] = {
'action' : 'end',
'replace' : False,
'pageinfo' : pi
}
else:
logWarn('Skipping replacement for', pi.name, 'at', specFile,
'line', pi.begin)
print('Skipping replacement for', pi.name, 'at', specFile,
'line', pi.begin)
printPageInfo(pi, file)
skipped.add(specFile)
if overwrite:
pageName = specFile
else:
pageName = outDir + '/' + os.path.basename(specFile)
fp = open(pageName, 'w', encoding='utf-8')
line = 0
for text in file:
if line in actions.keys():
action = actions[line]['action']
replace = actions[line]['replace']
pi = actions[line]['pageinfo']
logDiag('ACTION:', action, 'REPLACE:', replace, 'at line', line)
logDiag('PageInfo of action:')
printPageInfo(pi, file)
if action == 'begin':
openBlock(pi, fp)
if not replace:
print(text, file=fp, end='')
elif action == 'end':
if not replace:
print(text, file=fp, end='')
closeBlock(pi, fp)
else:
print('ERROR: unrecognized action:', action, 'in',
specFile, 'at line', line)
print(text, file=fp, end='')
else:
print(text, file=fp, end='')
line = line + 1
fp.close()
#for line in sorted(actions.keys()):
# action = actions[line]
# print('action at line', line, '\t',
# action[0], action[1], action[2])
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('-outdir', action='store', dest='outDir',
default='out',
help='Set the base directory in which pages are generated')
parser.add_argument('-overwrite', action='store_true',
help='Overwrite input filenames instead of writing different output filenames')
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:
replaceRef(file, results.outDir, results.overwrite, skipped)
if len(skipped) > 0:
print('Files containing skipped feature blocks:')
for file in sorted(skipped):
print('\t' + file)