diff options
Diffstat (limited to 'docs/language-reference')
| -rw-r--r-- | docs/language-reference/04-types.md | 6 | ||||
| -rw-r--r-- | docs/language-reference/05-expressions.md | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/language-reference/04-types.md b/docs/language-reference/04-types.md index 6485bcf42..e7344793c 100644 --- a/docs/language-reference/04-types.md +++ b/docs/language-reference/04-types.md @@ -45,7 +45,7 @@ All arithmetic operations on integers (both signed and unsigned) wrap on overflo All target platforms must support the `int` and `uint` types. Specific target platforms may not support the other integer types. -All integer types are stored in memory with their natural size and alignment on all targes that support them. +All integer types are stored in memory with their natural size and alignment on all targets that support them. ### Floating-Point Types @@ -210,7 +210,7 @@ D3D constant buffer layout is similar to standard layout with two differences: * The initial alignment is 16 instead of one -* If a field would have _improper straddle_, where the interval `(fieldOffset, fieldOffset+fieldSize)` (eclusive on both sides) contains any multiple of 16, *and* the field offset is not already a multiple of 16, then the offset of the field is adjusted to the next multiple of 16 +* If a field would have _improper straddle_, where the interval `(fieldOffset, fieldOffset+fieldSize)` (exclusive on both sides) contains any multiple of 16, *and* the field offset is not already a multiple of 16, then the offset of the field is adjusted to the next multiple of 16 Array Types ----------- @@ -261,7 +261,7 @@ var a : int[10]; When a variable is declared with an unknown-size array type, and also includes an initial-value expression: ```hlsl -int a[] = { 0xA, 0XB, 0xC, 0xD }; +int a[] = { 0xA, 0xB, 0xC, 0xD }; ``` The compiler will attempt to infer an element count based on the type and/or structure of the initial-value expression. diff --git a/docs/language-reference/05-expressions.md b/docs/language-reference/05-expressions.md index 4879d5a5f..ea5c37ee0 100644 --- a/docs/language-reference/05-expressions.md +++ b/docs/language-reference/05-expressions.md @@ -345,7 +345,7 @@ useNegative ? -1.0f : 1.0f The condition may be either a single value of type `bool`, or a vector of `bool`. When a vector of `bool` is used, the two values being selected between must be vectors, and selection is performed component-wise. -> Note: Unlike C, C++, GLSL, and most other C-family languages, Slang currently follows the precedent of HLSL where `?:` does not short-cirucuit. +> Note: Unlike C, C++, GLSL, and most other C-family languages, Slang currently follows the precedent of HLSL where `?:` does not short-circuit. > > This decision may change (for the scalar case) in a future version of the language. > Programmer are encouraged to write code that does not depend on whether or not `?:` short-circuits. |