From 0f0daac513807d40aa88ba30fe497ddb56ecb573 Mon Sep 17 00:00:00 2001 From: Joshua Batista Date: Mon, 27 Oct 2025 11:51:44 -0700 Subject: [PATCH 1/3] address Tex --- lib/DxcSupport/dxcapi.extval.cpp | 2 +- tools/clang/unittests/HLSL/ValidationTest.cpp | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/DxcSupport/dxcapi.extval.cpp b/lib/DxcSupport/dxcapi.extval.cpp index 8dd07101e5..66b94a2a20 100644 --- a/lib/DxcSupport/dxcapi.extval.cpp +++ b/lib/DxcSupport/dxcapi.extval.cpp @@ -319,7 +319,7 @@ class ExternalValidationCompiler : public IDxcCompiler2, public IDxcCompiler3 { template CComPtr cast() const { CComPtr Result; if (Compiler) - Compiler->QueryInterface(__uuidof(T), reinterpret_cast(&Result)); + Compiler.QueryInterface(&Result); assert(Result); return Result; } diff --git a/tools/clang/unittests/HLSL/ValidationTest.cpp b/tools/clang/unittests/HLSL/ValidationTest.cpp index 6632f32ccb..bd2c03fc12 100644 --- a/tools/clang/unittests/HLSL/ValidationTest.cpp +++ b/tools/clang/unittests/HLSL/ValidationTest.cpp @@ -4274,8 +4274,8 @@ TEST_F(ValidationTest, UnitTestExtValidationSupport) { VERIFY_ARE_EQUAL_STR(BogusPath.c_str(), "bogus"); VERIFY_IS_TRUE(ExtSupportBogus.dxilDllFailedToLoad()); - // 3. Test with a valid path to this file in the environment variable - std::filesystem::path p = std::filesystem::absolute(__FILE__); + // 3. Test with a valid path to a file in the environment variable + std::filesystem::path p = hlsl_test::GetPathToHlslDataFile(L"lit.local.cfg"); SetEnvVarW(L"DXC_DXIL_DLL_PATH", p.wstring()); if (!ExtSupportValidNonDLLPath.IsEnabled()) { @@ -4287,7 +4287,11 @@ TEST_F(ValidationTest, UnitTestExtValidationSupport) { // validate that ExtSupportValidNonDLLPath was able to capture the environment // variable's value, and that loading the valid non-dll path was unsuccessful std::string ValidNonDLLPath = ExtSupportValidNonDLLPath.getDxilDllPath(); - VERIFY_ARE_EQUAL_STR(ValidNonDLLPath.c_str(), __FILE__); + std::string FilePath; + Unicode::WideToUTF8String( + hlsl_test::GetPathToHlslDataFile(L"lit.local.cfg").c_str(), + &FilePath); + VERIFY_ARE_EQUAL_STR(ValidNonDLLPath.c_str(), FilePath.c_str()); VERIFY_IS_TRUE(ExtSupportValidNonDLLPath.dxilDllFailedToLoad()); // 4. Test production of class IDs CLSID_DxcCompiler, CLSID_DxcLinker, From 5e6224007890a4ebded07f30375caf4970837cbd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 27 Oct 2025 18:55:40 +0000 Subject: [PATCH 2/3] chore: autopublish 2025-10-27T18:55:40Z --- tools/clang/unittests/HLSL/ValidationTest.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/clang/unittests/HLSL/ValidationTest.cpp b/tools/clang/unittests/HLSL/ValidationTest.cpp index bd2c03fc12..5c4f013835 100644 --- a/tools/clang/unittests/HLSL/ValidationTest.cpp +++ b/tools/clang/unittests/HLSL/ValidationTest.cpp @@ -4289,8 +4289,7 @@ TEST_F(ValidationTest, UnitTestExtValidationSupport) { std::string ValidNonDLLPath = ExtSupportValidNonDLLPath.getDxilDllPath(); std::string FilePath; Unicode::WideToUTF8String( - hlsl_test::GetPathToHlslDataFile(L"lit.local.cfg").c_str(), - &FilePath); + hlsl_test::GetPathToHlslDataFile(L"lit.local.cfg").c_str(), &FilePath); VERIFY_ARE_EQUAL_STR(ValidNonDLLPath.c_str(), FilePath.c_str()); VERIFY_IS_TRUE(ExtSupportValidNonDLLPath.dxilDllFailedToLoad()); From 00cc6561818c63d68ab98a90d95a27fadce0cdc7 Mon Sep 17 00:00:00 2001 From: Joshua Batista Date: Mon, 27 Oct 2025 13:39:24 -0700 Subject: [PATCH 3/3] add requires line to missing 6.9 test --- .../test/CodeGenDXIL/hlsl/intrinsics/asuint-constant-eval.hlsl | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/clang/test/CodeGenDXIL/hlsl/intrinsics/asuint-constant-eval.hlsl b/tools/clang/test/CodeGenDXIL/hlsl/intrinsics/asuint-constant-eval.hlsl index a6db38986d..889ce12371 100644 --- a/tools/clang/test/CodeGenDXIL/hlsl/intrinsics/asuint-constant-eval.hlsl +++ b/tools/clang/test/CodeGenDXIL/hlsl/intrinsics/asuint-constant-eval.hlsl @@ -1,3 +1,4 @@ +// REQUIRES: dxil-1-9 // RUN: %dxc /T ps_6_9 -fcgl %s | FileCheck %s // Compiling this HLSL would fail this assertion in IntExprEvaluator::Success: