|
24 | 24 |
|
25 | 25 | #include "HlslExecTestUtils.h" |
26 | 26 |
|
| 27 | +#include <climits> |
27 | 28 | #include <optional> |
28 | 29 | #include <sstream> |
29 | 30 | #include <string> |
@@ -154,14 +155,20 @@ static void compileShader(dxc::SpecificDllLoader &DxcSupport, |
154 | 155 | WArgStorage.push_back(std::wstring(Tok.begin(), Tok.end())); |
155 | 156 |
|
156 | 157 | std::vector<LPCWSTR> WArgPtrs; |
157 | | - for (const auto &A : WArgStorage) |
| 158 | + std::wstringstream LogFlags; |
| 159 | + LogFlags << L"Compiling with flags:"; |
| 160 | + for (const auto &A : WArgStorage) { |
158 | 161 | WArgPtrs.push_back(A.c_str()); |
| 162 | + LogFlags << L" " << A; |
| 163 | + } |
159 | 164 |
|
160 | 165 | DxcBuffer Buf = {}; |
161 | 166 | Buf.Ptr = SourceBlob->GetBufferPointer(); |
162 | 167 | Buf.Size = SourceBlob->GetBufferSize(); |
163 | 168 | Buf.Encoding = DXC_CP_UTF8; |
164 | 169 |
|
| 170 | + hlsl_test::LogCommentFmt(LogFlags.str().c_str()); |
| 171 | + |
165 | 172 | CComPtr<IDxcResult> Result; |
166 | 173 | VERIFY_SUCCEEDED(Compiler->Compile(&Buf, WArgPtrs.data(), |
167 | 174 | static_cast<UINT32>(WArgPtrs.size()), |
@@ -292,6 +299,9 @@ class DxilConf_SM610_LinAlg { |
292 | 299 | bool VerboseLogging = false; |
293 | 300 | bool Initialized = false; |
294 | 301 | std::optional<D3D12SDKSelector> D3D12SDK; |
| 302 | + |
| 303 | + WEX::TestExecution::SetVerifyOutput VerifyOutput{ |
| 304 | + WEX::TestExecution::VerifyOutputSettings::LogOnlyFailures}; |
295 | 305 | }; |
296 | 306 |
|
297 | 307 | /// Creates the device and setups the test scenario with the following variants |
@@ -523,6 +533,7 @@ static void runSplatStore(ID3D12Device *Device, |
523 | 533 | ExpectedFloats.assign(NumElements, FillValue); |
524 | 534 | break; |
525 | 535 | case ComponentType::I32: |
| 536 | + VERIFY_IS_TRUE(FillValue < static_cast<float>(INT_MAX), "FillValue too large to cast to int32_t"); |
526 | 537 | ExpectedInts.assign(NumElements, static_cast<int32_t>(FillValue)); |
527 | 538 | break; |
528 | 539 | default: |
|
0 commit comments