Skip to content

Commit 5f7a9e4

Browse files
committed
pull upstream, resolve conflicts
2 parents 6682612 + a89e18e commit 5f7a9e4

142 files changed

Lines changed: 6436 additions & 4255 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

azure-pipelines.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ stages:
1313
- stage: Build
1414
jobs:
1515
- job: Windows
16-
timeoutInMinutes: 120
16+
timeoutInMinutes: 165
1717

1818
pool:
1919
vmImage: windows-2022
@@ -44,11 +44,11 @@ stages:
4444
displayName: 'DXIL Tests'
4545
- script: |
4646
call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
47-
call utils\hct\hcttest.cmd -$(configuration) exec-warp
48-
displayName: 'DXIL Execution Tests (Nuget WARP)'
47+
call utils\hct\hcttest.cmd -$(configuration) exec
48+
displayName: 'DXIL Execution Tests'
4949
5050
- job: Nix
51-
timeoutInMinutes: 120
51+
timeoutInMinutes: 165
5252

5353
variables:
5454
macOS: macOS-latest

cmake/modules/Nuget.cmake

Lines changed: 0 additions & 233 deletions
This file was deleted.

docs/DXIL.rst

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2340,18 +2340,18 @@ ID Name Description
23402340
223 TextureGatherRaw Gather raw elements from 4 texels with no type conversions (SRV type is constrained)
23412341
224 SampleCmpLevel samples a texture and compares a single component against the specified comparison value
23422342
225 TextureStoreSample stores texel data at specified sample index
2343-
226 Reserved0 Reserved
2344-
227 Reserved1 Reserved
2345-
228 Reserved2 Reserved
2346-
229 Reserved3 Reserved
2347-
230 Reserved4 Reserved
2348-
231 Reserved5 Reserved
2349-
232 Reserved6 Reserved
2350-
233 Reserved7 Reserved
2351-
234 Reserved8 Reserved
2352-
235 Reserved9 Reserved
2353-
236 Reserved10 Reserved
2354-
237 Reserved11 Reserved
2343+
226 Reserved0 reserved
2344+
227 Reserved1 reserved
2345+
228 Reserved2 reserved
2346+
229 Reserved3 reserved
2347+
230 Reserved4 reserved
2348+
231 Reserved5 reserved
2349+
232 Reserved6 reserved
2350+
233 Reserved7 reserved
2351+
234 Reserved8 reserved
2352+
235 Reserved9 reserved
2353+
236 Reserved10 reserved
2354+
237 Reserved11 reserved
23552355
238 AllocateNodeOutputRecords returns a handle for the output records
23562356
239 GetNodeRecordPtr retrieve node input/output record pointer in address space 6
23572357
240 IncrementOutputCount Select the next logical output count for an EmptyNodeOutput for the whole group or per thread.
@@ -2423,6 +2423,9 @@ ID Name Description
24232423
306 MatVecMulAdd multiplies a MxK dimension matrix and a K sized input vector and adds an M-sized bias vector
24242424
307 OuterProductAccumulate Computes the outer product between column vectors and an MxN matrix is accumulated component-wise atomically (with device scope) in memory
24252425
308 VectorAccumulate Accumulates the components of a vector component-wise atomically (with device scope) to the corresponding elements of an array in memory
2426+
309 VectorReduceAnd Bitwise AND reduction of the vector returning a scalar
2427+
310 VectorReduceOr Bitwise OR reduction of the vector returning a scalar
2428+
311 FDot computes the n-dimensional vector dot-product
24262429
=== ===================================================== =======================================================================================================================================================================================================================
24272430

24282431

@@ -3298,6 +3301,7 @@ SM.INVALIDRESOURCEKIND Invalid resources
32983301
SM.INVALIDSAMPLERFEEDBACKTYPE Invalid sampler feedback type.
32993302
SM.INVALIDTEXTUREKINDONUAV TextureCube[Array] resources are not supported with UAVs.
33003303
SM.ISOLINEOUTPUTPRIMITIVEMISMATCH Hull Shader declared with IsoLine Domain must specify output primitive point or line. Triangle_cw or triangle_ccw output are not compatible with the IsoLine Domain.
3304+
SM.ISSPECIALFLOAT 16 bit IsSpecialFloat overloads require Shader Model 6.9 or higher.
33013305
SM.MAXMSSMSIZE Total Thread Group Shared Memory storage is %0, exceeded %1.
33023306
SM.MAXTGSMSIZE Total Thread Group Shared Memory storage is %0, exceeded %1.
33033307
SM.MAXTHEADGROUP Declared Thread Group Count %0 (X*Y*Z) is beyond the valid maximum of %1.

docs/SPIR-V.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2477,6 +2477,8 @@ extended instruction mapping, so they are handled with additional steps:
24772477
- ``isfinite`` : Determines if the specified value is finite. Since ``OpIsFinite``
24782478
requires the ``Kernel`` capability, translation is done using ``OpIsNan`` and
24792479
``OpIsInf``. A given value is finite iff it is not NaN and not infinite.
2480+
- ``isnormal`` : Determines if the specified value is normal (not zero, INF, NAN or subnormal).
2481+
Since ``OpIsNormal`` requires the ``Kernel`` capability, the operation is emulated.
24802482
- ``clip``: Discards the current pixel if the specified value is less than zero.
24812483
Uses conditional control flow as well as SPIR-V ``OpKill``.
24822484
- ``rcp``: Calculates a fast, approximate, per-component reciprocal.

external/SPIRV-Tools

Submodule SPIRV-Tools updated 154 files

0 commit comments

Comments
 (0)