Skip to content

Conversation

damyanp
Copy link
Member

@damyanp damyanp commented May 3, 2025

Previously using WARP from nuget was something that had to be opted in to. This change makes it the default behvior.

This allows some simplifications. The nuget package is installed at configure time. If the user wants to override the nuget installation behavior then they can pass in extra parameters, rather than having an alternative mechanism for describing which package to use.

The actual DLL to load is specified through a TAEF parameter and specifies the full path to the DLL.

damyanp added 4 commits May 2, 2025 21:14
- remove special cases for warp
- move the generic sounding "nuget.cmake" closer to where it is used, and rename to DownloadWarp.cmake
- rearrange clang/test/CMakeLists.txt to make logic clearer about what is / isn't executed when using a multi-config generator
Copy link
Contributor

github-actions bot commented May 3, 2025

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:
git-clang-format --diff 396ff2854634e400c0918ed7d0621926c0392ca1 6370241f1cdd032092722055ca9f3b67b065278c -- tools/clang/unittests/HLSLExec/ExecutionTest.cpp tools/clang/unittests/HLSLExec/HlslExecTestUtils.h
View the diff from clang-format here.
diff --git a/tools/clang/unittests/HLSLExec/ExecutionTest.cpp b/tools/clang/unittests/HLSLExec/ExecutionTest.cpp
index a4949294..68e94794 100644
--- a/tools/clang/unittests/HLSLExec/ExecutionTest.cpp
+++ b/tools/clang/unittests/HLSLExec/ExecutionTest.cpp
@@ -12705,7 +12705,7 @@ static void WriteReadBackDump(st::ShaderOp *pShaderOp, st::ShaderOpTest *pTest,
 // It's exclusive with the use of the DLL as a TAEF target.
 extern "C" {
 __declspec(dllexport) HRESULT WINAPI
-InitializeOpTests(void *pStrCtx, st::OutputStringFn pOutputStrFn) {
+    InitializeOpTests(void *pStrCtx, st::OutputStringFn pOutputStrFn) {
   HRESULT hr = ExecutionTest::EnableExperimentalShaderModels();
   if (FAILED(hr)) {
     pOutputStrFn(pStrCtx, L"Unable to enable experimental shader models.\r\n.");
@@ -12714,9 +12714,9 @@ InitializeOpTests(void *pStrCtx, st::OutputStringFn pOutputStrFn) {
 }
 
 __declspec(dllexport) HRESULT WINAPI
-RunOpTest(void *pStrCtx, st::OutputStringFn pOutputStrFn, LPCSTR pText,
-          ID3D12Device *pDevice, ID3D12CommandQueue *pCommandQueue,
-          ID3D12Resource *pRenderTarget, char **pReadBackDump) {
+    RunOpTest(void *pStrCtx, st::OutputStringFn pOutputStrFn, LPCSTR pText,
+              ID3D12Device *pDevice, ID3D12CommandQueue *pCommandQueue,
+              ID3D12Resource *pRenderTarget, char **pReadBackDump) {
 
   HRESULT hr;
   if (pReadBackDump)
  • Check this box to apply formatting changes to this branch.

@damyanp damyanp marked this pull request as ready for review May 3, 2025 19:00
@damyanp damyanp requested a review from alsepkow May 3, 2025 19:00
@damyanp damyanp requested a review from alsepkow May 9, 2025 21:56
Copy link
Contributor

@alsepkow alsepkow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, including the minor cast suggestion. Can re-approve if you change it.

Copy link
Collaborator

@V-FEXrt V-FEXrt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not super familiar with the build system yet so an approval from someone who is, would be good

@damyanp
Copy link
Member Author

damyanp commented Sep 15, 2025

Two approvals and a review ... merging now and I'll keep a close eye on everything!

@damyanp damyanp merged commit 33dd542 into microsoft:main Sep 15, 2025
10 checks passed
@github-project-automation github-project-automation bot moved this from New to Done in HLSL Roadmap Sep 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants