summaryrefslogtreecommitdiff
path: root/docs/user-guide/02-conventional-features.md
diff options
context:
space:
mode:
authorbprb <58124331+bprb@users.noreply.github.com>2024-04-13 21:51:20 -0700
committerGitHub <noreply@github.com>2024-04-13 21:51:20 -0700
commit54745ac9aff75c579f886980dd3397c79d0f3e00 (patch)
treedd9e6d33eb8d57d8336761f54be7fa7ad3b3d910 /docs/user-guide/02-conventional-features.md
parent31c704f2ba5588e0612158ea016552debf09ee98 (diff)
Documentation: fix typos and grammar (#3945)
Diffstat (limited to 'docs/user-guide/02-conventional-features.md')
-rw-r--r--docs/user-guide/02-conventional-features.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/user-guide/02-conventional-features.md b/docs/user-guide/02-conventional-features.md
index ace4ef6a8..933b19357 100644
--- a/docs/user-guide/02-conventional-features.md
+++ b/docs/user-guide/02-conventional-features.md
@@ -198,7 +198,7 @@ enum Channel : uint16_t
}
```
-By default, the underlying type of an enumeration type is `int`. Enumeration types are implicitly convertible to its underlying type. All enumeration types conform to the builtin `ILogical` interface, which provides operator overloads for bit operations. The following code is allowed:
+By default, the underlying type of an enumeration type is `int`. Enumeration types are implicitly convertible to their underlying type. All enumeration types conform to the builtin `ILogical` interface, which provides operator overloads for bit operations. The following code is allowed:
```csharp
void test()
@@ -329,7 +329,7 @@ Slang supports the following expression forms with nearly identical syntax to HL
> #### Note ####
> Like HLSL but unlike most other C-family languages, the `&&` and `||` operators do *not* currently perform "short-circuiting".
> they evaluate all of their operands unconditionally.
-> However, the `?:` operator do perform short-circuiting if the condition is a scalar. Use of `?:` where the condition is a vector is deprecated in Slang. The vector version of `?:` operator does *not* perform short-circuiting, and the user is advised to call `select` instead.
+> However, the `?:` operator does perform short-circuiting if the condition is a scalar. Use of `?:` where the condition is a vector is deprecated in Slang. The vector version of `?:` operator does *not* perform short-circuiting, and the user is advised to call `select` instead.
> The default behavior of these operators is likely to change in a future Slang release.
Additional expression forms specific to shading languages follow.
@@ -575,7 +575,7 @@ A single parameter may use both the D3D-style and Vulkan-style markup, but in ea
> #### Note ####
> Explicit binding markup is tedious to write and error-prone to maintain.
> It is almost never required in Slang codebases.
-> The Slang compiler can automatically synthesize bindings in a completely deterministic fashion and in most cases the bindings it generates are the as what a programmer would have written manually.
+> The Slang compiler can automatically synthesize bindings in a completely deterministic fashion and in most cases the bindings it generates are what a programmer would have written manually.
Shader Entry Points
-------------------
@@ -641,7 +641,7 @@ Some system-defined binding semantics may only be available on specific targets
> #### Note ####
> Instead of using ordinary function parameters with system-defined binding semantics, GLSL uses special system-defined global variables with the `gl_` name prefix.
-> Some recent HLSL features has introduced special globally-defined functions that behave similarly to these `gl_` globals.
+> Some recent HLSL features have introduced special globally-defined functions that behave similarly to these `gl_` globals.
#### User-Defined Binding Semantics