Skip to content

Commit 9b03d9a

Browse files
Misc content fixes
1 parent 149e569 commit 9b03d9a

8 files changed

Lines changed: 16 additions & 11 deletions

‎chapters/access_chains.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ layout(set = 0, binding = 1) buffer OutputBuffer {
260260
} out_v;
261261
262262
void main() {
263-
in_v.output_values = out_v.input_values;
263+
out_v.output_values = in_v.input_values;
264264
}
265265
```
266266

‎chapters/entry_execution.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The `OpExecutionMode` and `OpExecutionModeId` instructions reference an `Entry P
4545

4646
> A notable update in the SPIR-V 1.2 spec is that `OpExecutionModeId` was added.
4747
48-
> Also worth noting that as of now, there are no possible uses of `OpExecutionModeId` for Shader capability-based client APIs such as Vulkan.
48+
> Also worth noting that in Vulkan, `OpExecutionModeId` (e.g. `LocalSizeId`) can only be used with Vulkan 1.3 or `VK_KHR_maintenance4` (and the `maintenance4` feature enabled).
4949
5050
The only difference between the two instructions is how it handles possible `Extra Operands`.
5151

‎chapters/extended_instruction_sets.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Breaking this down:
5151

5252
- Need to import the name of the extended instruction set being added with `OpExtInstImport`
5353
- Use `OpExtInst`
54-
- Set the `Set` field to the imported non-semantic extension
55-
- Set the `Instruction` to the non-semantic extension specific instruction being added
54+
- Set the `Set` field to the imported extended instruction set
55+
- Set the `Instruction` to the extended instruction set specific instruction being added
5656
- For `GLSL.std.450` it is listed as being instruction `13` in the [extended instruction set spec](https://registry.khronos.org/SPIR-V/specs/unified1/GLSL.std.450.html)
5757
- ![extended_instruction_sets_sin.png](../images/extended_instruction_sets_sin.png)

‎chapters/extension_by_version.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,8 @@ With some minor versions of SPIR-V some extensions are added into the [unified s
2121
- [SPV_EXT_physical_storage_buffer](https://github.com/KhronosGroup/SPIRV-Registry/blob/main/extensions/EXT/SPV_EXT_physical_storage_buffer.asciidoc)
2222
- [SPV_KHR_physical_storage_buffer](https://github.com/KhronosGroup/SPIRV-Registry/blob/main/extensions/KHR/SPV_KHR_physical_storage_buffer.asciidoc)
2323
- [SPV_KHR_vulkan_memory_model](https://github.com/KhronosGroup/SPIRV-Registry/blob/main/extensions/KHR/SPV_KHR_vulkan_memory_model.asciidoc)
24+
- SPIR-V 1.6
25+
- [SPV_KHR_non_semantic_info](https://github.com/KhronosGroup/SPIRV-Registry/blob/main/extensions/KHR/SPV_KHR_non_semantic_info.asciidoc)
26+
- [SPV_KHR_integer_dot_product](https://github.com/KhronosGroup/SPIRV-Registry/blob/main/extensions/KHR/SPV_KHR_integer_dot_product.asciidoc)
27+
- [SPV_KHR_terminate_invocation](https://github.com/KhronosGroup/SPIRV-Registry/blob/main/extensions/KHR/SPV_KHR_terminate_invocation.asciidoc)
28+
- [SPV_EXT_demote_to_helper_invocation](https://github.com/KhronosGroup/SPIRV-Registry/blob/main/extensions/EXT/SPV_EXT_demote_to_helper_invocation.asciidoc)

‎chapters/image_accesses.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ When using a sampler, you must have an `OpTypeSampledImage` object, this will be
5555
5656
## Combined Image Samplers
5757
58-
The `Input` `OpVariable` can sometimes contain both the Sampler and Image (Vulkan calls these `VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER`).
58+
The `UniformConstant` `OpVariable` can sometimes contain both the Sampler and Image (Vulkan calls these `VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER`).
5959
6060
When these variables are loaded, they will be of type `OpTypeSampledImage`.
6161

‎chapters/nonsemantic.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ the output SPIR-V disassembly roughly looks like
3232
%10 = OpString "Here are two float values %f, %f"
3333
OpSourceExtension "GL_EXT_debug_printf"
3434

35-
%14 = %2 OpExtInst %13 %1 %10 %11 %12
35+
%14 = OpExtInst %2 %13 1 %10 %11 %12
3636
```
3737

3838
Breaking this down:
3939

40-
- First need to make sure the `SPV_KHR_non_semantic_info` is enabled
40+
- First need to make sure the `SPV_KHR_non_semantic_info` is enabled (not needed starting with SPIR-V 1.6, where it was incorporated into core)
4141
- Need to import the name of the non-semantic extension being added with `OpExtInstImport`
4242
- Use `OpExtInst`
4343
- Set the `Set` field to the imported non-semantic extension

‎chapters/parsing_instructions.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Taking a look at a few lines of disassembled SPIR-V
5555
```swift
5656
%2 = OpTypeVoid
5757
%3 = OpTypeFunction %2
58-
%6 = TypeInt 32 0
58+
%6 = OpTypeInt 32 0
5959
```
6060

6161
The assembled binary representation is as follows

‎chapters/untyped_pointers.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ This idea can also be found in the LLVM community, which has moved to `Opaque Po
1010

1111
This extension adds various `Untyped` instructions, such as:
1212

13-
- Op**Untyped**VariableKHR`
14-
- Op**Untyped**AccessChainKHR`
15-
- OpType**Untyped**PointerKHR`
13+
- Op**Untyped**VariableKHR
14+
- Op**Untyped**AccessChainKHR
15+
- OpType**Untyped**PointerKHR
1616

1717
> `OpTypeUntypedPointerKHR` may seem strange, but it follows the `OpType*` convention and is just unfortunate the "type" and "untyped" are both in the name
1818

0 commit comments

Comments
 (0)