diff options
| author | Yong He <yonghe@outlook.com> | 2020-12-03 08:23:05 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 08:23:05 -0800 |
| commit | 44c0a56974b664e50b2cb8cb6f10740b19c4e02f (patch) | |
| tree | d6141003be376bdb2c0037178b649b6b2aae673e /tools/render-test/cuda | |
| parent | ad5dda9261bae63e32bcb914b109fcb5c92faf25 (diff) | |
Add shader object parameter binding to renderer_test. (#1622)
* Add shader object parameter binding to renderer_test.
* remove multiple-definitions.hlsl
* Fix cuda implementation.
Co-authored-by: Tim Foley <tfoleyNV@users.noreply.github.com>
Diffstat (limited to 'tools/render-test/cuda')
| -rw-r--r-- | tools/render-test/cuda/cuda-compute-util.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/render-test/cuda/cuda-compute-util.cpp b/tools/render-test/cuda/cuda-compute-util.cpp index cc84d4a00..ea7dab163 100644 --- a/tools/render-test/cuda/cuda-compute-util.cpp +++ b/tools/render-test/cuda/cuda-compute-util.cpp @@ -1000,7 +1000,7 @@ static SlangResult _invokeComputeProgram( const uint32_t dispatchSize[3], CUDAComputeUtil::Context& outContext) { - auto reflection = slang::ProgramLayout::get(outputAndLayout.output.request); + auto reflection = slang::ProgramLayout::get(outputAndLayout.output.getRequestForReflection()); auto& bindSet = outContext.m_bindSet; auto& bindRoot = outContext.m_bindRoot; @@ -1403,7 +1403,7 @@ static SlangResult _fillRuntimeHandlesInBuffers( ScopeCUDAModule& cudaModule) { Slang::ComPtr<slang::ISession> linkage; - spCompileRequest_getSession(compilationAndLayout.output.request, linkage.writeRef()); + spCompileRequest_getSession(compilationAndLayout.output.getRequestForReflection(), linkage.writeRef()); auto& inputLayout = compilationAndLayout.layout; for (auto& entry : inputLayout.entries) { @@ -1415,7 +1415,7 @@ static SlangResult _fillRuntimeHandlesInBuffers( case RTTIDataEntryType::RTTIObject: { auto reflection = - slang::ShaderReflection::get(compilationAndLayout.output.request); + slang::ShaderReflection::get(compilationAndLayout.output.getRequestForReflection()); auto concreteType = reflection->findTypeByName(rtti.typeName.getBuffer()); ComPtr<ISlangBlob> outName; linkage->getTypeRTTIMangledName(concreteType, outName.writeRef()); @@ -1431,7 +1431,7 @@ static SlangResult _fillRuntimeHandlesInBuffers( case RTTIDataEntryType::WitnessTable: { auto reflection = - slang::ShaderReflection::get(compilationAndLayout.output.request); + slang::ShaderReflection::get(compilationAndLayout.output.getRequestForReflection()); auto concreteType = reflection->findTypeByName(rtti.typeName.getBuffer()); if (!concreteType) return SLANG_FAIL; @@ -1527,7 +1527,7 @@ static SlangResult _setUpArguments( const uint32_t dispatchSize[3], CUDAComputeUtil::Context& outContext) { - auto reflection = slang::ProgramLayout::get(outputAndLayout.output.request); + auto reflection = slang::ProgramLayout::get(outputAndLayout.output.getRequestForReflection()); auto& bindSet = outContext.m_bindSet; auto& bindRoot = outContext.m_bindRoot; @@ -1835,7 +1835,7 @@ SlangResult _loadAndInvokeKernel( auto& bindSet = outContext.m_bindSet; auto& bindRoot = outContext.m_bindRoot; - auto request = outputAndLayout.output.request; + auto request = outputAndLayout.output.getRequestForReflection(); auto reflection = (slang::ShaderReflection*) spGetReflection(request); // Load cuda module first so its symbols may be queried and filled into argument buffers. |