Skip to content

Commit 89d9817

Browse files
alsepkowCopilot
andcommitted
Fix build errors in HLSLExec tests
- Add missing #include <windows.h> in HLSLTestDataTypes.h before HlslTestUtils.h to resolve LPCSTR/LPCWSTR undeclared errors - Define D3D_SHADER_MODEL_6_10 (0x6a) in LinearAlgebra.cpp since the Windows SDK only defines up to 6.9 - Rename ValidationConfig member to Validation in all TrigonometricValidation structs in LongVectors.cpp to match the renamed member in DefaultValidation/StrictValidation Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 7331894 commit 89d9817

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

tools/clang/unittests/HLSLExec/HLSLTestDataTypes.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
#include <ostream>
88
#include <type_traits>
99

10+
#include <windows.h>
11+
1012
#include <DirectXMath.h>
1113
#include <DirectXPackedVector.h>
1214

tools/clang/unittests/HLSLExec/LongVectors.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -799,28 +799,28 @@ CAST_OP(OpType::CastToFloat64, double, (CastToFloat64(A)));
799799
// https://microsoft.github.io/DirectX-Specs/d3d/archive/D3D11_3_FunctionalSpec.htm#22.10.20
800800

801801
template <typename T, OpType OP> struct TrigonometricValidation {
802-
ValidationConfig ValidationConfig = ValidationConfig::Epsilon(0.0008f);
802+
ValidationConfig Validation = ValidationConfig::Epsilon(0.0008f);
803803
};
804804

805805
// Half precision trig functions have a larger tolerance due to their lower
806806
// precision. Note that the D3D spec
807807
// does not mention half precision trig functions.
808808
template <OpType OP> struct TrigonometricValidation<HLSLHalf_t, OP> {
809-
ValidationConfig ValidationConfig = ValidationConfig::Epsilon(0.003f);
809+
ValidationConfig Validation = ValidationConfig::Epsilon(0.003f);
810810
};
811811

812812
// For the half precision trig functions with an infinite range in either
813813
// direction we use 2 ULPs of tolerance instead.
814814
template <> struct TrigonometricValidation<HLSLHalf_t, OpType::Cosh> {
815-
ValidationConfig ValidationConfig = ValidationConfig::Ulp(2.0f);
815+
ValidationConfig Validation = ValidationConfig::Ulp(2.0f);
816816
};
817817

818818
template <> struct TrigonometricValidation<HLSLHalf_t, OpType::Tan> {
819-
ValidationConfig ValidationConfig = ValidationConfig::Ulp(2.0f);
819+
ValidationConfig Validation = ValidationConfig::Ulp(2.0f);
820820
};
821821

822822
template <> struct TrigonometricValidation<HLSLHalf_t, OpType::Sinh> {
823-
ValidationConfig ValidationConfig = ValidationConfig::Ulp(2.0f);
823+
ValidationConfig Validation = ValidationConfig::Ulp(2.0f);
824824
};
825825

826826
#define TRIG_OP(OP, IMPL) \

0 commit comments

Comments
 (0)