diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2020-06-18 13:40:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-18 13:40:08 -0700 |
| commit | 82ba914db9c3823ad7a0834d46b7fccedfe0acee (patch) | |
| tree | a2361c042e6a03ff957bd4a921f73efbb89dc1b7 /source/slang/slang-emit-cuda.cpp | |
| parent | 8c6e02bd094bbc0c9afb141265be9675f99ddb61 (diff) | |
| parent | 5952e3b3d7f505a7e6d71ecd0793911224f5bac3 (diff) | |
Merge branch 'master' into dyndispatch
Diffstat (limited to 'source/slang/slang-emit-cuda.cpp')
| -rw-r--r-- | source/slang/slang-emit-cuda.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/slang/slang-emit-cuda.cpp b/source/slang/slang-emit-cuda.cpp index 25b06027d..6272ea02e 100644 --- a/source/slang/slang-emit-cuda.cpp +++ b/source/slang/slang-emit-cuda.cpp @@ -799,7 +799,7 @@ void CUDASourceEmitter::emitModuleImpl(IRModule* module) // must be prefixed to indicate to the OptiX runtime what // stage it is to be compiled for. // - auto stage = entryPointDecor->getProfile().GetStage(); + auto stage = entryPointDecor->getProfile().getStage(); switch( stage ) { default: @@ -866,10 +866,10 @@ void CUDASourceEmitter::emitModuleImpl(IRModule* module) // // At the binary level, our generated CUDA compute kernels will take // two pointer parameters: the first points to the per-entry-point - // `uniform` parameter data, and the second poinst to the global-scope + // `uniform` parameter data, and the second points to the global-scope // parameter data (if any). // - m_writer->emit("(UniformEntryPointParams* entryPointShaderParameters, UniformState* uniformState)"); + m_writer->emit("(void* entryPointShaderParameters, void* uniformState)"); } else { |
