From 8abaec701f0637f082e081caa0dd4fa049a00430 Mon Sep 17 00:00:00 2001 From: Simon Kallweit <64953474+skallweitNV@users.noreply.github.com> Date: Fri, 6 Jun 2025 16:39:14 +0200 Subject: Update slang-rhi (#7303) * update slang-rhi * adapt to new slang-rhi API * enable slang-rhi agility sdk * fix handling empty list * disable failing slang-rhi tests * format code * fix slang-rhi-tests ci step * skip running slang-rhi-tests --------- Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> --- tools/render-test/render-test-main.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'tools/render-test/render-test-main.cpp') diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp index 48ebbd332..71347e4f9 100644 --- a/tools/render-test/render-test-main.cpp +++ b/tools/render-test/render-test-main.cpp @@ -911,11 +911,13 @@ void RenderTestApp::_initializeAccelerationStructure() void RenderTestApp::setProjectionMatrix(IShaderObject* rootObject) { - auto info = m_device->getDeviceInfo(); + float kIdentity[16] = + {1.f, 0.f, 0.f, 0.f, 0.f, 1.f, 0.f, 0.f, 0.f, 0.f, 1.f, 0.f, 0.f, 0.f, 0.f, 1.f}; + auto info = m_device->getInfo(); ShaderCursor(rootObject) .getField("Uniforms") .getDereferenced() - .setData(info.identityProjectionMatrix, sizeof(float) * 16); + .setData(kIdentity, sizeof(kIdentity)); } void RenderTestApp::finalize() @@ -972,14 +974,15 @@ Result RenderTestApp::writeBindingOutput(const String& fileName) Result RenderTestApp::writeScreen(const String& filename) { - size_t rowPitch, pixelSize; + rhi::SubresourceLayout layout; ComPtr blob; - SLANG_RETURN_ON_FAIL( - m_device->readTexture(m_colorBuffer, blob.writeRef(), &rowPitch, &pixelSize)); - auto bufferSize = blob->getBufferSize(); - uint32_t width = static_cast(rowPitch / pixelSize); - uint32_t height = static_cast(bufferSize / rowPitch); - return PngSerializeUtil::write(filename.getBuffer(), blob, width, height); + SLANG_RETURN_ON_FAIL(m_device->readTexture(m_colorBuffer, 0, 0, blob.writeRef(), &layout)); + return PngSerializeUtil::write( + filename.getBuffer(), + blob, + layout.size.width, + layout.size.height, + layout.rowPitch); } Result RenderTestApp::update() @@ -1488,7 +1491,7 @@ static SlangResult _innerMain( // Print adapter info after device creation but before any other operations if (options.showAdapterInfo) { - auto info = device->getDeviceInfo(); + auto info = device->getInfo(); auto out = stdWriters->getOut(); out.print("Using graphics adapter: %s\n", info.adapterName); } -- cgit v1.2.3