From 43d0c2100ef1a5df4b54525e50eb29fe7c39ec16 Mon Sep 17 00:00:00 2001 From: Gangzheng Tong Date: Tue, 8 Jul 2025 23:44:56 -0700 Subject: 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 Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> --- .../get-texture-resource-handle-test.cpp | 47 +++++++++++----------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'tools/gfx-unit-test/get-texture-resource-handle-test.cpp') diff --git a/tools/gfx-unit-test/get-texture-resource-handle-test.cpp b/tools/gfx-unit-test/get-texture-resource-handle-test.cpp index 1900b482e..8fd971065 100644 --- a/tools/gfx-unit-test/get-texture-resource-handle-test.cpp +++ b/tools/gfx-unit-test/get-texture-resource-handle-test.cpp @@ -1,44 +1,44 @@ #include "core/slang-basic.h" #include "gfx-test-util.h" -#include "gfx-util/shader-cursor.h" -#include "slang-gfx.h" +#include "slang-rhi/shader-cursor.h" #include "unit-test/slang-unit-test.h" +#include + #if SLANG_WINDOWS_FAMILY #include #endif -using namespace gfx; +using namespace rhi; namespace gfx_test { void getTextureResourceHandleTestImpl(IDevice* device, UnitTestContext* context) { - ITextureResource::Desc desc = {}; - desc.type = IResource::Type::Texture2D; - desc.numMipLevels = 1; + TextureDesc desc = {}; + desc.type = TextureType::Texture2D; + desc.mipCount = 1; desc.size.width = 1; desc.size.height = 1; desc.size.depth = 1; desc.defaultState = ResourceState::UnorderedAccess; - desc.format = Format::R16G16B16A16_FLOAT; + desc.format = Format::RGBA16Float; + desc.usage = TextureUsage::UnorderedAccess; - Slang::ComPtr buffer; - buffer = device->createTextureResource(desc); + Slang::ComPtr texture; + GFX_CHECK_CALL_ABORT(device->createTexture(desc, nullptr, texture.writeRef())); - InteropHandle handle; - GFX_CHECK_CALL_ABORT(buffer->getNativeResourceHandle(&handle)); - if (device->getDeviceInfo().deviceType == gfx::DeviceType::Vulkan) + NativeHandle handle; + GFX_CHECK_CALL_ABORT(texture->getNativeHandle(&handle)); + if (device->getInfo().deviceType == rhi::DeviceType::Vulkan) { - SLANG_CHECK(handle.handleValue != 0); - SLANG_CHECK(handle.api == InteropHandleAPI::Vulkan); + SLANG_CHECK(handle.value != 0); } #if SLANG_WINDOWS_FAMILY else { - SLANG_CHECK(handle.api == InteropHandleAPI::D3D12); - auto d3d12Handle = (ID3D12Resource*)handle.handleValue; + auto d3d12Handle = (ID3D12Resource*)handle.value; Slang::ComPtr testHandle1; GFX_CHECK_CALL_ABORT(d3d12Handle->QueryInterface(testHandle1.writeRef())); Slang::ComPtr testHandle2; @@ -50,23 +50,24 @@ void getTextureResourceHandleTestImpl(IDevice* device, UnitTestContext* context) void getTextureResourceHandleTestAPI(UnitTestContext* context, Slang::RenderApiFlag::Enum api) { - gfxEnableDebugLayer(context->enableDebugLayers); + if (context->enableDebugLayers) + getRHI()->enableDebugLayers(); if ((api & context->enabledApis) == 0) { SLANG_IGNORE_TEST; } Slang::ComPtr device; - IDevice::Desc deviceDesc = {}; + DeviceDesc deviceDesc = {}; switch (api) { case Slang::RenderApiFlag::D3D11: - deviceDesc.deviceType = gfx::DeviceType::DirectX11; + deviceDesc.deviceType = rhi::DeviceType::D3D11; break; case Slang::RenderApiFlag::D3D12: - deviceDesc.deviceType = gfx::DeviceType::DirectX12; + deviceDesc.deviceType = rhi::DeviceType::D3D12; break; case Slang::RenderApiFlag::Vulkan: - deviceDesc.deviceType = gfx::DeviceType::Vulkan; + deviceDesc.deviceType = rhi::DeviceType::Vulkan; break; default: SLANG_IGNORE_TEST; @@ -75,14 +76,14 @@ void getTextureResourceHandleTestAPI(UnitTestContext* context, Slang::RenderApiF 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)) { SLANG_IGNORE_TEST; } // Ignore this test on swiftshader. Swiftshader seems to have a bug that causes the test // to crash. - if (Slang::String(device->getDeviceInfo().adapterName).toLower().contains("swiftshader")) + if (Slang::String(device->getInfo().adapterName).toLower().contains("swiftshader")) { SLANG_IGNORE_TEST; } -- cgit v1.2.3