Skip to content

Commit

Permalink
[SPIR-V 1.5] Move the version to supported
Browse files Browse the repository at this point in the history
Original commit: a104311
  • Loading branch information
vmaksimo authored and MrSidims committed May 26, 2024
1 parent b509ef2 commit 62f5b09
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ the version of the SPIR-V file which is being generated/consumed.
the input file and emit an error if the SPIR-V version in it is higher than
one specified via this option.

Allowed values are `1.0`, `1.1`, `1.2`, `1.3`, and `1.4`.
Allowed values are `1.0`, `1.1`, `1.2`, `1.3`, `1.4`, and `1.5`.

More information can be found in
[SPIR-V versions and extensions handling](docs/SPIRVVersionsAndExtensionsHandling.rst)
Expand Down
2 changes: 1 addition & 1 deletion docs/SPIRVVersionsAndExtensionsHandling.rst
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ the version of the SPIR-V file which is being generated/consumed.
one exception: resulting SPIR-V version cannot be raised higher than
specified by this option.

Allowed values are ``1.0``, ``1.1``, ``1.2``, ``1.3``, and ``1.4``.
Allowed values are ``1.0``, ``1.1``, ``1.2``, ``1.3``, ``1.4``, and ``1.5``.

.. warning::
These two options are mutually exclusive and cannot be specified at the
Expand Down
3 changes: 1 addition & 2 deletions tools/llvm-spirv/llvm-spirv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ static cl::opt<VersionNumber> MaxSPIRVVersion(
clEnumValN(VersionNumber::SPIRV_1_2, "1.2", "SPIR-V 1.2"),
clEnumValN(VersionNumber::SPIRV_1_3, "1.3", "SPIR-V 1.3"),
clEnumValN(VersionNumber::SPIRV_1_4, "1.4", "SPIR-V 1.4"),
clEnumValN(VersionNumber::SPIRV_1_5, "1.5",
"SPIR-V 1.5 (experimental)")),
clEnumValN(VersionNumber::SPIRV_1_5, "1.5", "SPIR-V 1.5")),
cl::init(VersionNumber::MaximumVersion));

static cl::list<std::string>
Expand Down

0 comments on commit 62f5b09

Please sign in to comment.