diff options
Diffstat (limited to 'llvm/docs')
| -rw-r--r-- | llvm/docs/DirectX/DXContainer.rst | 24 | ||||
| -rw-r--r-- | llvm/docs/TableGen/ProgRef.rst | 22 |
2 files changed, 25 insertions, 21 deletions
diff --git a/llvm/docs/DirectX/DXContainer.rst b/llvm/docs/DirectX/DXContainer.rst index 17452d9..4473f4e 100644 --- a/llvm/docs/DirectX/DXContainer.rst +++ b/llvm/docs/DirectX/DXContainer.rst @@ -530,7 +530,7 @@ but adds a 32-bit access flag. .. code-block:: c struct DescriptorRange_V1_0 { - uint32_t RangeType; + dxil::ResourceClass RangeType; uint32_t NumDescriptors; uint32_t BaseShaderRegister; uint32_t RegisterSpace; @@ -538,12 +538,12 @@ but adds a 32-bit access flag. }; struct DescriptorRange_V1_1 { - dxbc::DescriptorRangeType RangeType; + dxil::ResourceClass RangeType; uint32_t NumDescriptors; uint32_t BaseShaderRegister; uint32_t RegisterSpace; - uint32_t OffsetInDescriptorsFromTableStart; uint32_t Flags; + uint32_t OffsetInDescriptorsFromTableStart; }; Static Samplers @@ -556,22 +556,26 @@ This section also has a variable size, since it can contain multiple static samplers definitions. However, the definition is a fixed sized struct, containing 13 32-byte fields of various enum, float, and integer values. +In version 1.2, the static sampler is 17 bytes. It matches the 1.0 static sampler +but adds a 32-bit access flag. In Version 1.1, it matches static sampler +version 1.0. + .. code-block:: c struct StaticSamplerDesc { - FilterMode Filter; - TextureAddressMode AddressU; - TextureAddressMode AddressV; - TextureAddressMode AddressW; + dxbc::FilterMode Filter; + dxbc::TextureAddressMode AddressU; + dxbc::TextureAddressMode AddressV; + dxbc::TextureAddressMode AddressW; float MipLODBias; uint32_t MaxAnisotropy; - ComparisonFunc ComparisonFunc; - StaticBorderColor BorderColor; + dxbc::ComparisonFunc ComparisonFunc; + dxbc::StaticBorderColor BorderColor; float MinLOD; float MaxLOD; uint32_t ShaderRegister; uint32_t RegisterSpace; - ShaderVisibility ShaderVisibility; + dxbc::ShaderVisibility ShaderVisibility; }; SFI0 Part diff --git a/llvm/docs/TableGen/ProgRef.rst b/llvm/docs/TableGen/ProgRef.rst index 2b1af05..0ff4cc7 100644 --- a/llvm/docs/TableGen/ProgRef.rst +++ b/llvm/docs/TableGen/ProgRef.rst @@ -64,7 +64,7 @@ Classes and concrete records have a unique *name*, either chosen by the programmer or generated by TableGen. Associated with that name is a list of *fields* with values and an optional list of *parent classes* (sometimes called base or super classes). The fields are the primary data that -backends will process. Note that TableGen assigns no meanings to fields; the +backends will process. Note that TableGen assigns no meaning to fields; the meanings are entirely up to the backends and the programs that incorporate the output of those backends. @@ -243,7 +243,7 @@ Include files ------------- TableGen has an include mechanism. The content of the included file -lexically replaces the ``include`` directive and is then parsed as if it was +lexically replaces the ``include`` directive and is then parsed as if it were originally in the main file. .. productionlist:: @@ -670,17 +670,17 @@ name of a multiclass. The argument values can be specified in two forms: * Positional argument (``value``). The value is assigned to the argument in the - corresponding position. For ``Foo<a0, a1>``, ``a0`` will be assigned to first - argument and ``a1`` will be assigned to second argument. + corresponding position. For ``Foo<a0, a1>``, ``a0`` will be assigned to the first + argument and ``a1`` will be assigned to the second argument. * Named argument (``name=value``). The value is assigned to the argument with the specified name. For ``Foo<a=a0, b=a1>``, ``a0`` will be assigned to the argument with name ``a`` and ``a1`` will be assigned to the argument with name ``b``. -Required arguments can also be specified as named argument. +Required arguments can also be specified as a named argument. Note that the argument can only be specified once regardless of the way (named -or positional) to specify and positional arguments should be put before named +or positional) to specify and positional arguments should precede named arguments. .. productionlist:: @@ -817,7 +817,7 @@ type. It provides a single field, ``Value``, which holds a 3-bit number. Its template argument, ``val``, is used to set the ``Value`` field. Each of the eight records is defined with ``FPFormat`` as its parent class. The enumeration value is passed in angle brackets as the template argument. Each -record will inherent the ``Value`` field with the appropriate enumeration +record will inherit the ``Value`` field with the appropriate enumeration value. Here is a more complex example of classes with template arguments. First, we @@ -1308,7 +1308,7 @@ with ``F0``, ``F1``, ``F2``, and ``F3``. ------------------------------------- A ``dump`` statement prints the input string to standard error -output. It is intended for debugging purpose. +output. It is intended for debugging purposes. * At top level, the message is printed immediately. @@ -1727,7 +1727,7 @@ and non-0 as true. ``!div(``\ *a*\ ``,`` *b*\ ``)`` This operator performs signed division of *a* by *b*, and produces the quotient. - Division by 0 produces an error. Division of INT64_MIN by -1 produces an error. + Division by 0 produces an error. Division of ``INT64_MIN`` by -1 produces an error. ``!empty(``\ *a*\ ``)`` This operator produces 1 if the string, list, or DAG *a* is empty; 0 otherwise. @@ -1914,7 +1914,7 @@ and non-0 as true. ``!or(``\ *a*\ ``,`` *b*\ ``, ...)`` This operator does a bitwise OR on *a*, *b*, etc., and produces the result. A logical OR can be performed if all the arguments are either - 0 or 1. This operator is short-circuit to -1 (all ones) the left-most + 0 or 1. This operator is short-circuit to -1 (all ones) when the left-most operand is -1. ``!range([``\ *start*\ ``,]`` *end*\ ``[,``\ *step*\ ``])`` @@ -1937,7 +1937,7 @@ and non-0 as true. Equivalent to ``!range(0, !size(list))``. ``!repr(``\ *value*\ ``)`` - Represents *value* as a string. String format for the value is not + Represents *value* as a string. The string format for the value is not guaranteed to be stable. Intended for debugging purposes only. ``!setdagarg(``\ *dag*\ ``,``\ *key*\ ``,``\ *arg*\ ``)`` |