Skip to content

Commit d91f3e2

Browse files
oddhackoddhack
committed
Remaining files for v1.2.146 update - accidentally left out of previous commit
1 parent cab7ffa commit d91f3e2

29 files changed

+483
-141
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ installRelease text eol=lf
77
makeAllExts text eol=lf
88
makeExt text eol=lf
99
makeKHR text eol=lf
10+
makeSpec text eol=lf
1011
sandboxCopy text eol=lf
1112
config/optimize-pdf text eol=lf
1213
scripts/checkXrefs text eol=lf

‎.gitlab-ci.yml‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,26 @@
77
# All stages use the same Docker image, so there are no prerequisites
88
image: khronosgroup/docker-images:vulkan-docs
99

10+
# Verify repository license compliance
11+
license-check:
12+
stage: build
13+
before_script:
14+
# Nothing, all prerequisites are in the Docker image
15+
script:
16+
- reuse lint
17+
allow_failure: false
18+
19+
# Verify SPEC_VERSION = 1 for extension development branches
20+
# This only runs on merge requests
21+
spec_version_check:
22+
stage: build
23+
before_script:
24+
# Nothing, all prerequisites are in the Docker image
25+
script:
26+
# Only run the test if CI_COMMIT_BRANCH is defined
27+
- test -z "$CI_COMMIT_BRANCH" || scripts/testSpecVersion.py -branch $CI_COMMIT_BRANCH
28+
allow_failure: false
29+
1030
# Build the vulkan specification and generate any associated files (such as vulkan.h)
1131
spec-generate:
1232
stage: build
@@ -90,12 +110,3 @@ hpp-compile:
90110
- g++ -c -std=c++11 -Igen/include -IVulkan-Hpp -Wall -Wextra -Werror tests/hpptest.cpp
91111
- clang++ -c -std=c++11 -Igen/include -IVulkan-Hpp -Wall -Wextra -Werror tests/hpptest.cpp
92112
allow_failure: true
93-
94-
# Verify repository license compliance
95-
license-check:
96-
stage: test
97-
before_script:
98-
# Nothing, all prerequisites are in the Docker image
99-
script:
100-
- reuse lint
101-
allow_failure: false

‎ChangeLog.txt‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,61 @@ public pull requests that have been accepted.
1212

1313
-----------------------------------------------------
1414

15+
Change log for July 3, 2020 Vulkan 1.2.146 spec update:
16+
17+
* Update release number to 146 for this update.
18+
19+
Github Issues:
20+
21+
* Fix valid usage generation script for optional bitmasks in a
22+
non-optional array (public pull request 1228).
23+
* Add lunr to `package.json` and update the locally cached copy (public
24+
pull request 1238).
25+
* Require that newly released extensions have etext:*_SPEC_VERSION `1`
26+
(public issue 1263).
27+
* Add to the NOTE in slink:VkPhysicalDeviceIDProperties, advising
28+
implementations on returning unique pname:deviceUUID values and avoiding
29+
hardwired values, especially 0 (public issue 1273).
30+
* Add noscript fallback for HTML output (public pull request 1289).
31+
* Fix duplicated VUIDs in flink:vkCmdExecuteGeneratedCommandsNV (public
32+
pull request 1304).
33+
* Fix link markup in <<ray-traversal, Ray Traversal>> chapter, nested link
34+
markup, and linear equation markup in
35+
<<textures-unnormalized-to-integer>> (public pull requests 1305, 1306,
36+
1307).
37+
38+
Internal Issues:
39+
40+
* Add comments to extending enums in the generated API interfaces showing
41+
which core version and/or extensions provide the enum, matching recent
42+
changes to show this information for commands and structures (internal
43+
issue 1431).
44+
* Only allow code:Invocation memory scope in the
45+
<<spirvenv-module-validation-standalone, Standalone SPIR-V Validation>>
46+
section when memory semantics is *None* (internal issue 1782).
47+
* Make reflow script handle literal block delimiters and lines containing
48+
only whitespace properly (internal issues 2039, 2042).
49+
* Clarify definition of <<limits-maxFragmentCombinedOutputResources,
50+
pname:maxFragmentCombinedOutputResources>> (internal issue 2236).
51+
* Add missing `errorcodes=` XML attributes for some
52+
`<<VK_EXT_display_control>>` commands.
53+
* Clarify <<features-extentperimagetype, allowed extent values based on
54+
image type>> and the related <<limits-maxImageDimension1D>>,
55+
<<limits-maxImageDimension2D>>, <<limits-maxImageDimension3D>>,
56+
<<limits-maxImageDimensionCube>> limits (internal merge request 3922).
57+
* Remove redundant valid usage statement
58+
VUID-VkFramebufferCreateInfo-flags-03188 (internal merge request 3934).
59+
* Update style guide to recommend new extension spec language be contained
60+
in existing asciidoctor files, unless it's of enough scope to create a
61+
and new chapter (internal merge request 3955).
62+
63+
New Extensions:
64+
65+
* `<<VK_EXT_directfb_surface>>` (public pull requests 1292, 1294).
66+
* `<<VK_EXT_fragment_density_map2>>` (internal merge request 3914).
67+
68+
-----------------------------------------------------
69+
1570
Change log for June 20, 2020 Vulkan 1.2.145 spec update:
1671

1772
* Update release number to 145 for this update.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ VERBOSE =
109109
# ADOCOPTS options for asciidoc->HTML5 output
110110

111111
NOTEOPTS = -a editing-notes -a implementation-guide
112-
PATCHVERSION = 145
112+
PATCHVERSION = 146
113113
ifneq (,$(findstring VK_VERSION_1_2,$(VERSIONS)))
114114
SPECREVISION = 1.2.$(PATCHVERSION)
115115
else

‎appendices/spirvenv.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,7 @@ ifdef::VK_VERSION_1_1[]
591591
** *Subgroup*
592592
endif::VK_VERSION_1_1[]
593593
** *Invocation*
594+
*** Only valid if memory semantics is *None*
594595
ifdef::VK_VERSION_1_1[]
595596
* *Scope* for *Non Uniform Group Operations* must: be limited to:
596597
** *Subgroup*

‎chapters/VK_EXT_debug_utils.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ previously set name is removed.
8787
If pname:objectType is not ename:VK_OBJECT_TYPE_UNKNOWN,
8888
pname:objectHandle must: be dlink:VK_NULL_HANDLE or a valid Vulkan
8989
handle of the type associated with pname:objectType as defined in the
90-
<<debugging-object-types, `VkObjectType` and Vulkan Handle Relationship>>
91-
table
90+
<<debugging-object-types, `VkObjectType` and Vulkan Handle
91+
Relationship>> table
9292
****
9393

9494
include::{generated}/validity/structs/VkDebugUtilsObjectNameInfoEXT.txt[]

‎chapters/VK_EXT_directfb_surface/platformCreateSurface_directfb.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ include::{generated}/api/structs/VkDirectFBSurfaceCreateInfoEXT.txt[]
4242

4343
.Valid Usage
4444
****
45-
* pname:dfb must: point to a valid DirectFB code:IDirectFB
46-
* pname:surface must: point to a valid DirectFB code:IDirectFBSurface
45+
* [[VUID-VkDirectFBSurfaceCreateInfoEXT-dfb-04117]]
46+
pname:dfb must: point to a valid DirectFB code:IDirectFB
47+
* [[VUID-VkDirectFBSurfaceCreateInfoEXT-surface-04118]]
48+
pname:surface must: point to a valid DirectFB code:IDirectFBSurface
4749
****
4850

4951
include::{generated}/validity/structs/VkDirectFBSurfaceCreateInfoEXT.txt[]

‎chapters/VK_EXT_directfb_surface/platformQuerySupport_directfb.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ This platform-specific function can: be called prior to creating a surface.
2222

2323
.Valid Usage
2424
****
25-
* pname:queueFamilyIndex must: be less than
25+
* [[VUID-vkGetPhysicalDeviceDirectFBPresentationSupportEXT-queueFamilyIndex-04119]]
26+
pname:queueFamilyIndex must: be less than
2627
pname:pQueueFamilyPropertyCount returned by
2728
fname:vkGetPhysicalDeviceQueueFamilyProperties for the given
2829
pname:physicalDevice

‎chapters/capabilities.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -972,8 +972,9 @@ ename:VK_SAMPLE_COUNT_1_BIT.
972972
=== Allowed Extent Values Based On Image Type
973973

974974
Implementations may: support extent values larger than the <<limits-minmax,
975-
required minimum/maximum values>> for certain types of images subject to the
976-
constraints below.
975+
required minimum/maximum values>> for certain types of images.
976+
slink:VkImageFormatProperties::pname:maxExtent for each type is subject to
977+
the constraints below.
977978

978979
[NOTE]
979980
.Note

‎chapters/copies.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ source buffer to the specified region of the destination image.
430430

431431
ifdef::VK_VERSION_1_1,VK_KHR_sampler_ycbcr_conversion[]
432432
If the format of pname:dstImage is a
433-
<<formats-requiring-sampler-ycbcr-conversion,multi-planar image format>>),
433+
<<formats-requiring-sampler-ycbcr-conversion,multi-planar image format>>,
434434
regions of each plane to be a target of a copy must: be specified separately
435435
using the pname:pRegions member of the slink:VkBufferImageCopy structure.
436436
In this case, the pname:aspectMask of pname:imageSubresource must: be

0 commit comments

Comments
 (0)