summaryrefslogtreecommitdiffstats
path: root/tools/vk-pipeline-create/main.cpp
diff options
context:
space:
mode:
authorGangzheng Tong <tonggangzheng@gmail.com>2025-07-08 23:44:56 -0700
committerGitHub <noreply@github.com>2025-07-09 06:44:56 +0000
commit43d0c2100ef1a5df4b54525e50eb29fe7c39ec16 (patch)
tree25ec4fb9c726115f90bdaa9878f2f4ca372ad0a6 /tools/vk-pipeline-create/main.cpp
parent00746bf09047cdf01c19dac513a532bcf3ed3ea3 (diff)
Convert gfx unit tests and examples to use slang-rhi (#7577)
* Port first gfx unit test to slang-rhi * port triangle example to use slang-rhi * port platform-test to slang-rhi * Update platform-test to throttle mouse move events * port gpu-printing example to use slang-rhi * port model-viewer example to use slang-rhi * port ray-tracing example to use slang-rhi * port ray-tracing pipeline example to use slang-rhi * port reflection parameter blocks example to use slang-rhi * port shader-object example to use slang-rhi * port shader-toy example to use slang-rhi * Port most of tests to slang-rhi * port link-time-constant-array-size to use slang-rhi * Fix tests and find matching tests in slang-rhi * port autodiff-texture * remove gfx target; port nv-aftermath-example * update include path for shader-cursor.h * Disabled 2 more ported tests * fix build error * remove gfx test * put slang-rhi (static-lib) before slang (shared) * format code (#7621) Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> * add debug callback * format code (#7649) Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> * Address review comments; revert back to use SLANG_CHECK_MSG --------- Co-authored-by: slangbot <ellieh+slangbot@nvidia.com> Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
Diffstat (limited to 'tools/vk-pipeline-create/main.cpp')
-rw-r--r--tools/vk-pipeline-create/main.cpp21
1 files changed, 11 insertions, 10 deletions
diff --git a/tools/vk-pipeline-create/main.cpp b/tools/vk-pipeline-create/main.cpp
index 67301a2a0..91abb90bc 100644
--- a/tools/vk-pipeline-create/main.cpp
+++ b/tools/vk-pipeline-create/main.cpp
@@ -7,10 +7,10 @@
#include "../../source/core/slang-string-util.h"
#include "examples/hello-world/vulkan-api.h"
#include "slang-com-ptr.h"
-#include "slang-gfx.h"
#include "slang.h"
#include <chrono>
+#include <slang-rhi.h>
#if SLANG_WINDOWS_FAMILY
#include <windows.h>
@@ -19,6 +19,7 @@
#endif
using namespace Slang;
+using namespace rhi;
struct PipelineCreationReplay
{
@@ -233,7 +234,7 @@ struct PipelineCreationReplay
int run(int argc, const char** argv);
- void initVulkanAPI(gfx::IDevice* device);
+ void initVulkanAPI(IDevice* device);
};
int main(int argc, const char** argv)
@@ -244,10 +245,10 @@ int main(int argc, const char** argv)
int PipelineCreationReplay::run(int argc, const char** argv)
{
- gfx::IDevice::Desc deviceDesc = {};
- deviceDesc.deviceType = gfx::DeviceType::Vulkan;
- ComPtr<gfx::IDevice> device;
- gfx::gfxCreateDevice(&deviceDesc, device.writeRef());
+ DeviceDesc deviceDesc = {};
+ deviceDesc.deviceType = DeviceType::Vulkan;
+ ComPtr<IDevice> device;
+ SLANG_RETURN_ON_FAIL(createDevice(&deviceDesc, device.writeRef()));
initVulkanAPI(device);
if (argc < 2)
@@ -270,12 +271,12 @@ int PipelineCreationReplay::run(int argc, const char** argv)
return 0;
}
-void PipelineCreationReplay::initVulkanAPI(gfx::IDevice* device)
+void PipelineCreationReplay::initVulkanAPI(IDevice* device)
{
- gfx::IDevice::InteropHandles handle;
+ DeviceNativeHandles handle;
device->getNativeDeviceHandles(&handle);
- vkAPI.device = (VkDevice)(handle.handles[2].handleValue);
- vkAPI.instance = (VkInstance)(handle.handles[0].handleValue);
+ vkAPI.device = (VkDevice)(handle.handles[2].value);
+ vkAPI.instance = (VkInstance)(handle.handles[0].value);
#if SLANG_WINDOWS_FAMILY
auto dynamicLibraryName = "vulkan-1.dll";
HMODULE module = ::LoadLibraryA(dynamicLibraryName);