Use SLANG_ASSERT

shader-slang · Feb 3, 2025 · a55f68a · a55f68a
1 parent e82142b
commit a55f68a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/tools/gfx/d3d12/d3d12-shader-program.cpp b/tools/gfx/d3d12/d3d12-shader-program.cpp
@@ -15,7 +15,7 @@ Result ShaderProgramImpl::createShaderModule(
     ShaderBinary shaderBin;
     shaderBin.stage = entryPointInfo->getStage();
     shaderBin.entryPointInfo = entryPointInfo;
-    assert(kernelCodes.getCount() == 1); // Only one kernel code is supported for now
+    SLANG_ASSERT(kernelCodes.getCount() == 1);
     shaderBin.code.addRange(
         reinterpret_cast<const uint8_t*>(kernelCodes[0]->getBufferPointer()),
         (Index)kernelCodes[0]->getBufferSize());

diff --git a/tools/gfx/metal/metal-shader-program.cpp b/tools/gfx/metal/metal-shader-program.cpp
@@ -26,7 +26,7 @@ Result ShaderProgramImpl::createShaderModule(
     Module module;
     module.stage = entryPointInfo->getStage();
     module.entryPointName = entryPointInfo->getNameOverride();
-    assert(kernelCodes.getCount() == 1);
+    SLANG_ASSERT(kernelCodes.getCount() == 1);
     module.code = kernelCodes[0];
 
 

diff --git a/tools/gfx/renderer-shared.cpp b/tools/gfx/renderer-shared.cpp
@@ -1110,15 +1110,15 @@ Result ShaderProgramBase::compileShaders(RendererBase* device)
     {
         auto stage = entryPointInfo->getStage();
 
-        List<ComPtr<ISlangBlob> > kernelCodes;
-        ComPtr<ISlangBlob> kernelCode;
+        List<ComPtr<ISlangBlob>> kernelCodes;
         {
+            ComPtr<ISlangBlob> spirv;
             ComPtr<ISlangBlob> diagnostics;
             auto compileResult = device->getEntryPointCodeFromShaderCache(
                 entryPointComponent,
                 entryPointIndex,
                 0,
-                kernelCode.writeRef(),
+                spirv.writeRef(),
                 diagnostics.writeRef());
             if (diagnostics)
             {
@@ -1131,7 +1131,7 @@ Result ShaderProgramBase::compileShaders(RendererBase* device)
                     (char*)diagnostics->getBufferPointer());
             }
             SLANG_RETURN_ON_FAIL(compileResult);
-            kernelCodes.add(kernelCode);
+            kernelCodes.add(spirv);
         }
 
         // If target precompilation was used, kernelCode may only represent the

diff --git a/tools/gfx/vulkan/vk-pipeline-state.cpp b/tools/gfx/vulkan/vk-pipeline-state.cpp
@@ -311,7 +311,7 @@ Result PipelineStateImpl::createVKComputePipelineState()
 
     VkComputePipelineCreateInfo computePipelineInfo = {
         VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO};
-    assert(programImpl->m_stageCreateInfos.getCount() == 1);
+    SLANG_ASSERT(programImpl->m_stageCreateInfos.getCount() == 1);
     computePipelineInfo.stage = programImpl->m_stageCreateInfos[0];
     computePipelineInfo.layout = programImpl->m_rootObjectLayout->m_pipelineLayout;
 

diff --git a/tools/gfx/vulkan/vk-shader-program.cpp b/tools/gfx/vulkan/vk-shader-program.cpp
@@ -116,9 +116,6 @@ Result ShaderProgramImpl::createShaderModule(
     slang::EntryPointReflection* entryPointInfo,
     List<ComPtr<ISlangBlob>> kernelCodes)
 {
-    //for (auto kernelCode : kernelCodes)
-    //    m_codeBlobs.add(kernelCode);
-
     ComPtr<ISlangBlob> linkedKernel = LinkWithSPIRVTools(kernelCodes);
     m_codeBlobs.add(linkedKernel);
 
@@ -130,7 +127,6 @@ Result ShaderProgramImpl::createShaderModule(
         linkedKernel,
         (VkShaderStageFlagBits)VulkanUtil::getShaderStage(entryPointInfo->getStage()),
         shaderModule));
-
     m_entryPointNames.add(realEntryPointName);
     m_modules.add(shaderModule);
     return SLANG_OK;