summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/ci.yml6
-rw-r--r--cmake/LLVM.cmake13
-rw-r--r--cmake/SlangTarget.cmake4
-rw-r--r--external/CMakeLists.txt5
m---------external/slang-rhi0
-rw-r--r--tools/CMakeLists.txt5
-rw-r--r--tools/render-test/png-serialize-util.cpp5
-rw-r--r--tools/render-test/png-serialize-util.h3
-rw-r--r--tools/render-test/render-test-main.cpp23
-rw-r--r--tools/slang-test/slang-test-main.cpp17
-rw-r--r--tools/test-server/test-server-main.cpp13
11 files changed, 33 insertions, 61 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4a2a76011..26bffe963 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -278,8 +278,8 @@ jobs:
-expected-failure-list tests/expected-failure.txt \
-skip-reference-image-generation \
-show-adapter-info
- - name: slang-rhi tests
- if: steps.filter.outputs.should-run == 'true' && matrix.platform != 'wasm' && matrix.full-gpu-tests
+ - name: Run slang-rhi tests
+ if: false # steps.filter.outputs.should-run == 'true' && matrix.platform != 'wasm' && matrix.full-gpu-tests
shell: pwsh
run: |
if (!(Test-Path -Path "external/slang-rhi/build")) {
@@ -297,7 +297,7 @@ jobs:
$testDir = $testExe.Directory.FullName
Push-Location $testDir
Write-Host "Running slang-rhi tests..."
- .\slang-rhi-tests.exe
+ .\slang-rhi-tests.exe -check-devices -tce="ray-tracing-*,cmd-query-resolve-host"
Pop-Location
} else {
Write-Error "Could not find slang-rhi-tests.exe"
diff --git a/cmake/LLVM.cmake b/cmake/LLVM.cmake
index a72cae0f5..d707d3605 100644
--- a/cmake/LLVM.cmake
+++ b/cmake/LLVM.cmake
@@ -111,16 +111,10 @@ function(fetch_or_build_slang_llvm)
if(SLANG_ENABLE_PREBUILT_BINARIES)
if(CMAKE_SYSTEM_NAME MATCHES "Windows")
- # DX Agility SDK requires the D3D12*.DLL files to be placed under a sub-directory, "D3D12".
- # https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/#d3d12sdkpath-should-not-be-the-same-directory-as-the-application-exe
file(
GLOB prebuilt_binaries
"${slang_SOURCE_DIR}/external/slang-binaries/bin/windows-x64/*"
)
- file(
- GLOB prebuilt_d3d12_binaries
- "${slang_SOURCE_DIR}/external/slang-binaries/bin/windows-x64/[dD]3[dD]12*"
- )
list(REMOVE_ITEM prebuilt_binaries ${prebuilt_d3d12_binaries})
add_custom_target(
copy-prebuilt-binaries
@@ -131,13 +125,6 @@ function(fetch_or_build_slang_llvm)
COMMAND
${CMAKE_COMMAND} -E copy_if_different ${prebuilt_binaries}
${CMAKE_BINARY_DIR}/$<CONFIG>/${runtime_subdir}
- COMMAND
- ${CMAKE_COMMAND} -E make_directory
- ${CMAKE_BINARY_DIR}/$<CONFIG>/${runtime_subdir}/D3D12
- COMMAND
- ${CMAKE_COMMAND} -E copy_if_different
- ${prebuilt_d3d12_binaries}
- ${CMAKE_BINARY_DIR}/$<CONFIG>/${runtime_subdir}/D3D12
VERBATIM
)
set_target_properties(
diff --git a/cmake/SlangTarget.cmake b/cmake/SlangTarget.cmake
index cadd33ac0..e9fde3ebf 100644
--- a/cmake/SlangTarget.cmake
+++ b/cmake/SlangTarget.cmake
@@ -430,14 +430,14 @@ function(slang_add_target dir type)
target_include_directories(
${target}
PRIVATE
- $<TARGET_PROPERTY:${include_from},INTERFACE_INCLUDE_DIRECTORIES>
+ $<$<BOOL:${include_from}>:$<TARGET_PROPERTY:${include_from},INTERFACE_INCLUDE_DIRECTORIES>>
)
endforeach()
foreach(include_from ${ARG_INCLUDE_FROM_PUBLIC})
target_include_directories(
${target}
PUBLIC
- $<TARGET_PROPERTY:${include_from},INTERFACE_INCLUDE_DIRECTORIES>
+ $<$<BOOL:${include_from}>:$<TARGET_PROPERTY:${include_from},INTERFACE_INCLUDE_DIRECTORIES>>
)
endforeach()
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index e80b9c354..6fcbecefe 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -187,11 +187,6 @@ if(SLANG_ENABLE_SLANG_RHI)
set(SLANG_RHI_FETCH_SLANG OFF)
set(SLANG_RHI_SLANG_INCLUDE_DIR ${slang_SOURCE_DIR}/include)
set(SLANG_RHI_SLANG_BINARY_DIR ${CMAKE_BINARY_DIR})
-
- # Not disabling these break tests (issue #5474)
- set(SLANG_RHI_FETCH_DXC OFF)
- set(SLANG_RHI_ENABLE_AGILITY_SDK OFF)
-
set(SLANG_RHI_ENABLE_NVAPI ${SLANG_ENABLE_NVAPI})
if(SLANG_ENABLE_DX_ON_VK)
diff --git a/external/slang-rhi b/external/slang-rhi
-Subproject c33a2ec9b3257bfa908f6f3d19e38cc067cb251
+Subproject d256b49563e2d428e36902648cf49b253e42f71
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 6ca35b8b0..8b954154b 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -257,7 +257,9 @@ if(SLANG_ENABLE_TESTS)
EXECUTABLE
EXCLUDE_FROM_ALL
LINK_WITH_PRIVATE core compiler-core slang
- INCLUDE_FROM_PRIVATE unit-test
+ INCLUDE_FROM_PRIVATE
+ unit-test
+ $<$<BOOL:${SLANG_ENABLE_SLANG_RHI}>:slang-rhi>
FOLDER test
)
slang_add_target(
@@ -280,6 +282,7 @@ if(SLANG_ENABLE_TESTS)
stb
${CMAKE_DL_LIBS}
Threads::Threads
+ INCLUDE_FROM_PRIVATE $<$<BOOL:${SLANG_ENABLE_SLANG_RHI}>:slang-rhi>
REQUIRES
# Shared libraries dlopened by slang-test
slang-reflection-test
diff --git a/tools/render-test/png-serialize-util.cpp b/tools/render-test/png-serialize-util.cpp
index 15aaba00b..9dca81ea8 100644
--- a/tools/render-test/png-serialize-util.cpp
+++ b/tools/render-test/png-serialize-util.cpp
@@ -17,10 +17,11 @@ using namespace Slang;
const char* filename,
ISlangBlob* pixels,
uint32_t width,
- uint32_t height)
+ uint32_t height,
+ uint32_t rowPitch)
{
int stbResult =
- stbi_write_png(filename, width, height, 4, pixels->getBufferPointer(), width * 4);
+ stbi_write_png(filename, width, height, 4, pixels->getBufferPointer(), rowPitch);
return stbResult ? SLANG_OK : SLANG_FAIL;
}
diff --git a/tools/render-test/png-serialize-util.h b/tools/render-test/png-serialize-util.h
index 4eb119b30..38e796c3c 100644
--- a/tools/render-test/png-serialize-util.h
+++ b/tools/render-test/png-serialize-util.h
@@ -12,7 +12,8 @@ struct PngSerializeUtil
const char* filename,
ISlangBlob* pixels,
uint32_t width,
- uint32_t height);
+ uint32_t height,
+ uint32_t rowPitch);
};
} // namespace renderer_test
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<ISlangBlob> blob;
- SLANG_RETURN_ON_FAIL(
- m_device->readTexture(m_colorBuffer, blob.writeRef(), &rowPitch, &pixelSize));
- auto bufferSize = blob->getBufferSize();
- uint32_t width = static_cast<uint32_t>(rowPitch / pixelSize);
- uint32_t height = static_cast<uint32_t>(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);
}
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index 7e2956c3f..742300d22 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -46,22 +46,13 @@
#include <atomic>
#include <thread>
-using namespace Slang;
-
#if defined(_WIN32)
-// https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/#2.-set-agility-sdk-parameters
-
-extern "C"
-{
- __declspec(dllexport) extern const uint32_t D3D12SDKVersion = 711;
-}
-
-extern "C"
-{
- __declspec(dllexport) extern const char* D3D12SDKPath = ".\\D3D12\\";
-}
+#include <slang-rhi/agility-sdk.h>
+SLANG_RHI_EXPORT_AGILITY_SDK
#endif
+using namespace Slang;
+
// Options for a particular test
struct TestOptions
{
diff --git a/tools/test-server/test-server-main.cpp b/tools/test-server/test-server-main.cpp
index 5161fa03a..a2f7f8153 100644
--- a/tools/test-server/test-server-main.cpp
+++ b/tools/test-server/test-server-main.cpp
@@ -19,17 +19,8 @@
#include <string.h>
#if defined(_WIN32)
-// https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/#2.-set-agility-sdk-parameters
-
-extern "C"
-{
- __declspec(dllexport) extern const uint32_t D3D12SDKVersion = 711;
-}
-
-extern "C"
-{
- __declspec(dllexport) extern const char* D3D12SDKPath = ".\\D3D12\\";
-}
+#include <slang-rhi/agility-sdk.h>
+SLANG_RHI_EXPORT_AGILITY_SDK
#endif
namespace TestServer
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-01 09:32:06 +0000