summaryrefslogtreecommitdiffstats
path: root/tools/gfx-unit-test/existing-device-handle-test.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/gfx-unit-test/existing-device-handle-test.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/gfx-unit-test/existing-device-handle-test.cpp')
-rw-r--r--tools/gfx-unit-test/existing-device-handle-test.cpp121
1 files changed, 45 insertions, 76 deletions
diff --git a/tools/gfx-unit-test/existing-device-handle-test.cpp b/tools/gfx-unit-test/existing-device-handle-test.cpp
index 5605bf8a5..9ceacd69e 100644
--- a/tools/gfx-unit-test/existing-device-handle-test.cpp
+++ b/tools/gfx-unit-test/existing-device-handle-test.cpp
@@ -1,21 +1,15 @@
#include "core/slang-basic.h"
#include "gfx-test-util.h"
-#include "gfx-util/shader-cursor.h"
-#include "slang-gfx.h"
+#include "slang-rhi.h"
+#include "slang-rhi/shader-cursor.h"
#include "unit-test/slang-unit-test.h"
-using namespace gfx;
+using namespace rhi;
namespace gfx_test
{
void existingDeviceHandleTestImpl(IDevice* device, UnitTestContext* context)
{
- Slang::ComPtr<ITransientResourceHeap> transientHeap;
- ITransientResourceHeap::Desc transientHeapDesc = {};
- transientHeapDesc.constantBufferSize = 4096;
- GFX_CHECK_CALL_ABORT(
- device->createTransientResourceHeap(transientHeapDesc, transientHeap.writeRef()));
-
ComPtr<IShaderProgram> shaderProgram;
slang::ProgramLayout* slangReflection;
GFX_CHECK_CALL_ABORT(loadComputeProgram(
@@ -25,127 +19,102 @@ void existingDeviceHandleTestImpl(IDevice* device, UnitTestContext* context)
"computeMain",
slangReflection));
- ComputePipelineStateDesc pipelineDesc = {};
+ ComputePipelineDesc pipelineDesc = {};
pipelineDesc.program = shaderProgram.get();
- ComPtr<gfx::IPipelineState> pipelineState;
- GFX_CHECK_CALL_ABORT(
- device->createComputePipelineState(pipelineDesc, pipelineState.writeRef()));
+ ComPtr<IComputePipeline> pipelineState;
+ GFX_CHECK_CALL_ABORT(device->createComputePipeline(pipelineDesc, pipelineState.writeRef()));
const int numberCount = 4;
float initialData[] = {0.0f, 1.0f, 2.0f, 3.0f};
- IBufferResource::Desc bufferDesc = {};
- bufferDesc.sizeInBytes = numberCount * sizeof(float);
- bufferDesc.format = gfx::Format::Unknown;
+ BufferDesc bufferDesc = {};
+ bufferDesc.size = numberCount * sizeof(float);
+ bufferDesc.format = Format::Undefined;
bufferDesc.elementSize = sizeof(float);
- bufferDesc.allowedStates = ResourceStateSet(
- ResourceState::ShaderResource,
- ResourceState::UnorderedAccess,
- ResourceState::CopyDestination,
- ResourceState::CopySource);
+ bufferDesc.usage = BufferUsage::ShaderResource | BufferUsage::UnorderedAccess |
+ BufferUsage::CopyDestination | BufferUsage::CopySource;
bufferDesc.defaultState = ResourceState::UnorderedAccess;
bufferDesc.memoryType = MemoryType::DeviceLocal;
- ComPtr<IBufferResource> numbersBuffer;
+ ComPtr<IBuffer> numbersBuffer;
GFX_CHECK_CALL_ABORT(
- device->createBufferResource(bufferDesc, (void*)initialData, numbersBuffer.writeRef()));
-
- ComPtr<IResourceView> bufferView;
- IResourceView::Desc viewDesc = {};
- viewDesc.type = IResourceView::Type::UnorderedAccess;
- viewDesc.format = Format::Unknown;
- GFX_CHECK_CALL_ABORT(
- device->createBufferView(numbersBuffer, nullptr, viewDesc, bufferView.writeRef()));
+ device->createBuffer(bufferDesc, (void*)initialData, numbersBuffer.writeRef()));
// We have done all the set up work, now it is time to start recording a command buffer for
// GPU execution.
{
- ICommandQueue::Desc queueDesc = {ICommandQueue::QueueType::Graphics};
- auto queue = device->createCommandQueue(queueDesc);
-
- auto commandBuffer = transientHeap->createCommandBuffer();
- auto encoder = commandBuffer->encodeComputeCommands();
-
- auto rootObject = encoder->bindPipeline(pipelineState);
-
- ShaderCursor rootCursor(rootObject);
- // Bind buffer view to the root.
- rootCursor.getPath("buffer").setResource(bufferView);
-
- encoder->dispatchCompute(1, 1, 1);
- encoder->endEncoding();
- commandBuffer->close();
- queue->executeCommandBuffer(commandBuffer);
+ auto queue = device->getQueue(QueueType::Graphics);
+ auto commandEncoder = queue->createCommandEncoder();
+ {
+ auto encoder = commandEncoder->beginComputePass();
+ auto rootObject = encoder->bindPipeline(pipelineState);
+
+ ShaderCursor rootCursor(rootObject);
+ // Bind buffer directly to the root.
+ rootCursor.getPath("buffer").setBinding(Binding(numbersBuffer));
+
+ encoder->dispatchCompute(1, 1, 1);
+ encoder->end();
+ }
+
+ auto commandBuffer = commandEncoder->finish();
+ queue->submit(commandBuffer);
queue->waitOnHost();
}
- compareComputeResult(device, numbersBuffer, Slang::makeArray<float>(1.0f, 2.0f, 3.0f, 4.0f));
+ compareComputeResult(device, numbersBuffer, std::array{1.0f, 2.0f, 3.0f, 4.0f});
}
-void existingDeviceHandleTestAPI(UnitTestContext* context, Slang::RenderApiFlag::Enum api)
+void existingDeviceHandleTestAPI(UnitTestContext* context, DeviceType deviceType)
{
- gfxEnableDebugLayer(context->enableDebugLayers);
- if ((api & context->enabledApis) == 0)
+ if (!deviceTypeInEnabledApis(deviceType, context->enabledApis))
{
- SLANG_IGNORE_TEST;
+ SLANG_IGNORE_TEST
}
Slang::ComPtr<IDevice> device;
- IDevice::Desc deviceDesc = {};
- switch (api)
- {
- case Slang::RenderApiFlag::D3D12:
- deviceDesc.deviceType = gfx::DeviceType::DirectX12;
- break;
- case Slang::RenderApiFlag::Vulkan:
- deviceDesc.deviceType = gfx::DeviceType::Vulkan;
- break;
- case Slang::RenderApiFlag::CUDA:
- deviceDesc.deviceType = gfx::DeviceType::CUDA;
- break;
- default:
- SLANG_IGNORE_TEST;
- }
+ DeviceDesc deviceDesc = {};
+ deviceDesc.deviceType = deviceType;
deviceDesc.slang.slangGlobalSession = context->slangGlobalSession;
const char* searchPaths[] = {"", "../../tools/gfx-unit-test", "tools/gfx-unit-test"};
deviceDesc.slang.searchPathCount = (SlangInt)SLANG_COUNT_OF(searchPaths);
deviceDesc.slang.searchPaths = searchPaths;
- auto createDeviceResult = gfxCreateDevice(&deviceDesc, device.writeRef());
+ auto createDeviceResult = getRHI()->createDevice(deviceDesc, device.writeRef());
if (SLANG_FAILED(createDeviceResult) || !device)
{
SLANG_IGNORE_TEST;
}
- IDevice::InteropHandles handles;
+ DeviceNativeHandles handles;
GFX_CHECK_CALL_ABORT(device->getNativeDeviceHandles(&handles));
Slang::ComPtr<IDevice> testDevice;
- IDevice::Desc testDeviceDesc = deviceDesc;
+ DeviceDesc testDeviceDesc = deviceDesc;
testDeviceDesc.existingDeviceHandles.handles[0] = handles.handles[0];
- if (api == Slang::RenderApiFlag::Vulkan)
+ if (deviceType == DeviceType::Vulkan)
{
testDeviceDesc.existingDeviceHandles.handles[1] = handles.handles[1];
testDeviceDesc.existingDeviceHandles.handles[2] = handles.handles[2];
}
- auto createTestDeviceResult = gfxCreateDevice(&testDeviceDesc, testDevice.writeRef());
- if (SLANG_FAILED(createTestDeviceResult) || !device)
+ auto createTestDeviceResult = getRHI()->createDevice(testDeviceDesc, testDevice.writeRef());
+ if (SLANG_FAILED(createTestDeviceResult) || !testDevice)
{
SLANG_IGNORE_TEST;
}
- existingDeviceHandleTestImpl(device, context);
+ existingDeviceHandleTestImpl(testDevice, context);
}
SLANG_UNIT_TEST(existingDeviceHandleD3D12)
{
- return existingDeviceHandleTestAPI(unitTestContext, Slang::RenderApiFlag::D3D12);
+ return existingDeviceHandleTestAPI(unitTestContext, DeviceType::D3D12);
}
SLANG_UNIT_TEST(existingDeviceHandleVulkan)
{
- return existingDeviceHandleTestAPI(unitTestContext, Slang::RenderApiFlag::Vulkan);
+ return existingDeviceHandleTestAPI(unitTestContext, DeviceType::Vulkan);
}
#if SLANG_WIN64
SLANG_UNIT_TEST(existingDeviceHandleCUDA)
{
- return existingDeviceHandleTestAPI(unitTestContext, Slang::RenderApiFlag::CUDA);
+ return existingDeviceHandleTestAPI(unitTestContext, DeviceType::CUDA);
}
#endif
} // namespace gfx_test