From 8163debe2f11ed6dce8ba78f59c29cffee2a27a9 Mon Sep 17 00:00:00 2001 From: Philip Taylor Date: Sun, 21 Feb 2016 23:03:51 +0000 Subject: [PATCH] Fix incorrect SPIR-V instruction names --- doc/specs/vulkan/chapters/features.txt | 4 ++-- doc/specs/vulkan/chapters/interfaces.txt | 6 +++--- doc/specs/vulkan/chapters/textures.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/specs/vulkan/chapters/features.txt b/doc/specs/vulkan/chapters/features.txt index b1f1ce57..7883fd95 100644 --- a/doc/specs/vulkan/chapters/features.txt +++ b/doc/specs/vulkan/chapters/features.txt @@ -377,14 +377,14 @@ check for the supported properties of individual formats. pname:shaderStorageImageReadWithoutFormat indicates whether storage images require a format qualifier to be specified when reading from storage images. If this feature is not enabled, the code:OpImageRead - instruction mustnot: have an code:OpImageType of code:Unknown. This also + instruction mustnot: have an code:OpTypeImage of code:Unknown. This also indicates whether shader modules can: declare the code:StorageImageReadWithoutFormat capability. * [[features-features-shaderStorageImageWriteWithoutFormat]] pname:shaderStorageImageWriteWithoutFormat indicates whether storage images require a format qualifier to be specified when writing to storage images. If this feature is not enabled, the code:OpImageWrite - instruction mustnot: have an code:OpImageType of code:Unknown. This also + instruction mustnot: have an code:OpTypeImage of code:Unknown. This also indicates whether shader modules can: declare the code:StorageImageWriteWithoutFormat capability. * [[features-features-shaderUniformBufferArrayDynamicIndexing]] diff --git a/doc/specs/vulkan/chapters/interfaces.txt b/doc/specs/vulkan/chapters/interfaces.txt index 83e97a81..10645204 100644 --- a/doc/specs/vulkan/chapters/interfaces.txt +++ b/doc/specs/vulkan/chapters/interfaces.txt @@ -322,7 +322,7 @@ the fragment shader is executed in. The fragment shader input variables listed by code:OpEntryPoint with the code:Input storage class and a decoration of code:InputAttachmentIndex form the _fragment input attachment interface_. These variables must: -be declared with a type of code:OpImageType and a code:Dim operand +be declared with a type of code:OpTypeImage and a code:Dim operand of code:SubpassData. A fragment shader input variable identified with a code:InputAttachmentIndex @@ -613,7 +613,7 @@ depending on the specific resources. [[interfaces-resources-layout-std140]] *Standard Uniform Buffer Layout* -Member variables of an code:OpTypeStructure with storage class of +Member variables of an code:OpTypeStruct with storage class of code:Uniform and a decoration of code:Block (uniform buffers) must: be laid out according to the following rules. @@ -648,7 +648,7 @@ The *std140 layout* in GLSL satisfies these rules. [[interfaces-resources-layout-std430]] *Standard Storage Buffer Layout* -Member variables of an code:OpTypeStructure with a storage class of +Member variables of an code:OpTypeStruct with a storage class of code:PushConstant (push constants), or a storage class of code:Uniform with a decoration of code:BufferBlock (storage buffers) must: be laid out as <>, except diff --git a/doc/specs/vulkan/chapters/textures.txt b/doc/specs/vulkan/chapters/textures.txt index 79525d5c..e889ca40 100644 --- a/doc/specs/vulkan/chapters/textures.txt +++ b/doc/specs/vulkan/chapters/textures.txt @@ -8,7 +8,7 @@ Image Operations are steps performed by SPIR-V image instructions, where those instructions which take an code:OpTypeImage (representing a -sname:VkImageView) or code:OpTypeImageSampler (representing a +sname:VkImageView) or code:OpTypeSampledImage (representing a (sname:VkImageView, sname:VkSampler) pair) and texel coordinates as operands, and return a value based on one or more neighboring texture elements (_texels_) in the image.