Skip to content

Commit

Permalink
update the dependency packages
Browse files Browse the repository at this point in the history
Change the package from vulkansdk to vulkan headers since
to build the app we only need vulkan headers. Vulkan loader is
loaded at runtime.

Change SLANG_UUID_IPipelineCreationAPIDispatcher to
SLANG_UUID_IVulkanPipelineCreationAPIDispatcher since slang v2024.0.4.
  • Loading branch information
kaizhangNV committed Feb 9, 2024
1 parent 392e7bf commit 049f53a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
10 changes: 5 additions & 5 deletions dependencies.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<remote name="github-slang-windows" type="https" packageLocation="github.com/shader-slang/slang/releases/download/v${version}/slang-${version}-win64.zip"/>
<remote name="github-slang-linux" type="https" packageLocation="github.com/shader-slang/slang/releases/download/v${version}/slang-${version}-linux-x86_64.zip"/>
<dependency name="slang" linkPath="external/packman/slang">
<package name="slang" version="2024.0.0" remotes="github-slang-windows" platforms="windows-x86_64"/>
<package name="slang" version="2024.0.0" remotes="github-slang-linux" platforms="linux-x86_64" />
<package name="slang" version="2024.0.4" remotes="github-slang-windows" platforms="windows-x86_64"/>
<package name="slang" version="2024.0.4" remotes="github-slang-linux" platforms="linux-x86_64" />
</dependency>
<dependency name="slang" linkPath="external/packman/vulkansdk">
<package name="vulkansdk" version="1.1.73.0-win" platforms="windows-x86_64" />
<package name="vulkansdk" version="1.1.73.0-linux-x86_64" platforms="linux-x86_64" />
<remote name="vulkan-headers" type="https" packageLocation="github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/v${version}.zip"/>
<dependency name="vulkan-headers" linkPath="external/packman/vulkan">
<package name="vulkan-headers" version="1.3.275" remotes="vulkan-headers"/>
</dependency>
</project>
5 changes: 4 additions & 1 deletion source/DeviceWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class PipelineCreationAPIDispatcher : public gfx::IPipelineCreationAPIDispatcher

virtual SLANG_NO_THROW SlangResult SLANG_MCALL queryInterface(SlangUUID const& uuid, void** outObject) override
{
if (uuid == SlangUUID SLANG_UUID_IPipelineCreationAPIDispatcher)
if (uuid == SlangUUID SLANG_UUID_IVulkanPipelineCreationAPIDispatcher)
{
*outObject = static_cast<gfx::IPipelineCreationAPIDispatcher*>(this);
return SLANG_OK;
Expand Down Expand Up @@ -122,6 +122,7 @@ class PipelineCreationAPIDispatcher : public gfx::IPipelineCreationAPIDispatcher
void** outPipelineState
)
{
assert(!"Not implemented!");
return SLANG_OK;
}

Expand All @@ -139,12 +140,14 @@ class PipelineCreationAPIDispatcher : public gfx::IPipelineCreationAPIDispatcher
// This method will be called by the gfx layer right before creating a ray tracing state object.
virtual gfx::Result beforeCreateRayTracingState(gfx::IDevice* device, slang::IComponentType* program)
{
assert(!"Not implemented!");
return SLANG_OK;
}

// This method will be called by the gfx layer right after creating a ray tracing state object.
virtual gfx::Result afterCreateRayTracingState(gfx::IDevice* device, slang::IComponentType* program)
{
assert(!"Not implemented!");
return SLANG_OK;
}
private:
Expand Down

0 comments on commit 049f53a

Please sign in to comment.