diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2020-04-21 14:09:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 11:09:36 -0700 |
| commit | 77d59713ac665785b7ebee4ad2b5dcbb73cf5af5 (patch) | |
| tree | 65efc2b0fe49888c5965798447820452bd4b67ba /tools/render-test/cuda/cuda-compute-util.cpp | |
| parent | 7de5f63225cde20401da7c1c69b00d0b7dc8d89f (diff) | |
Small Improvements around Wave Intrinsics (#1328)
* Fix issues in wave-mask/wave.slang tests.
WaveGetActiveMask -> WaveGetConvergedMask.
Update target-compatibility.md
* First pass at wave-intrinsics.md documentation.
Write up around WaveMaskSharedSync.
* Added more of the Wave intrinsics as WaveMask intrinsics.
Improvements to documentation around wave-intrinsics.
* Add the Wave intrinsics for SM6.5 for WaveMask
Expand WaveMask intrinsics
Improve WaveMask documentation
* Added WaveMaskIsFirstLane.
* Added WaveGetConvergedMask for glsl and hlsl.
Added wave-get-converged-mask.slang test.
* WaveGetActiveMask/Multi and WageGetConvergedMask/Multi
* Improve Wave intrinsics docs.
Adde WaveGetActveMulti WaveGetConvergedMulti, WaveGetActiveMask (for vk/hlsl).
* Enable GLSL WaveMultiPrefixBitAnd.
* Re-add definitions of f16tof32 and f32to16 from #1326
* Remove multiple definition of f32tof16
Disable optix call to Ray trace test, if OPTIX not available.
* Improve wave intrinsics documetnation - remove the __generic as part of definitions, small improvements.
* Change comment to try and trigger build.
Diffstat (limited to 'tools/render-test/cuda/cuda-compute-util.cpp')
| -rw-r--r-- | tools/render-test/cuda/cuda-compute-util.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/render-test/cuda/cuda-compute-util.cpp b/tools/render-test/cuda/cuda-compute-util.cpp index 5d6f82499..e90b4c541 100644 --- a/tools/render-test/cuda/cuda-compute-util.cpp +++ b/tools/render-test/cuda/cuda-compute-util.cpp @@ -1550,15 +1550,19 @@ SlangResult _loadAndInvokeKernel( { switch( outputAndLayout.output.desc.pipelineType ) { - default: - return SLANG_FAIL; - case PipelineType::Compute: return _loadAndInvokeComputeProgram(cudaContext, cudaStream, outputAndLayout, dispatchSize, outContext); case PipelineType::RayTracing: +#ifdef RENDER_TEST_OPTIX return _loadAndInvokeRayTracingProgram(cudaContext, cudaStream, outputAndLayout, dispatchSize, outContext); +#endif + break; + + default: break; } + + return SLANG_FAIL; } /// Execute a CUDA program (either compute or ray-tracing) |