@@ -6880,22 +6880,6 @@ ToleranceType ToleranceStringToEnum(LPCWSTR toleranceType) {
6880
6880
}
6881
6881
}
6882
6882
6883
- static bool CompareOutputWithExpectedValueFloat(
6884
- float output, float ref, ToleranceType type, double tolerance,
6885
- hlsl::DXIL::Float32DenormMode mode = hlsl::DXIL::Float32DenormMode::Any) {
6886
- if (type == ToleranceType::RELATIVE_EPSILON) {
6887
- return CompareFloatRelativeEpsilon(output, ref, (int)tolerance, mode);
6888
- } else if (type == ToleranceType::EPSILON) {
6889
- return CompareFloatEpsilon(output, ref, (float)tolerance, mode);
6890
- } else if (type == ToleranceType::ULP) {
6891
- return CompareFloatULP(output, ref, (int)tolerance, mode);
6892
- } else {
6893
- LogErrorFmt(L"Failed to read comparison type %S", type);
6894
- }
6895
-
6896
- return false;
6897
- }
6898
-
6899
6883
static bool CompareOutputWithExpectedValueFloat(
6900
6884
float output, float ref, LPCWSTR type, double tolerance,
6901
6885
hlsl::DXIL::Float32DenormMode mode = hlsl::DXIL::Float32DenormMode::Any) {
@@ -6919,21 +6903,6 @@ static bool VerifyOutputWithExpectedValueFloat(
6919
6903
CompareOutputWithExpectedValueFloat(output, ref, type, tolerance, mode));
6920
6904
}
6921
6905
6922
- static bool CompareOutputWithExpectedValueHalf(uint16_t output, uint16_t ref,
6923
- ToleranceType type,
6924
- double tolerance) {
6925
- if (type == ToleranceType::RELATIVE_EPSILON) {
6926
- return CompareHalfRelativeEpsilon(output, ref, (int)tolerance);
6927
- } else if (type == ToleranceType::EPSILON) {
6928
- return CompareHalfEpsilon(output, ref, (float)tolerance);
6929
- } else if (type == ToleranceType::ULP) {
6930
- return CompareHalfULP(output, ref, (float)tolerance);
6931
- } else {
6932
- LogErrorFmt(L"Failed to read comparison type %S", type);
6933
- return false;
6934
- }
6935
- }
6936
-
6937
6906
static bool CompareOutputWithExpectedValueHalf(uint16_t output, uint16_t ref,
6938
6907
LPCWSTR type, double tolerance) {
6939
6908
if (_wcsicmp(type, L"Relative") == 0) {
@@ -6954,29 +6923,6 @@ static bool VerifyOutputWithExpectedValueHalf(uint16_t output, uint16_t ref,
6954
6923
CompareOutputWithExpectedValueHalf(output, ref, type, tolerance));
6955
6924
}
6956
6925
6957
- template <typename T>
6958
- static bool CompareOutputWithExpectedValue(T output, T ref,
6959
- ToleranceType toleranceType,
6960
- double tolerance) {
6961
- if (std::is_same<T, DirectX::PackedVector::HALF>::value) { // uint16 treated
6962
- // as half
6963
- return CompareOutputWithExpectedValueHalf((uint16_t)output, (uint16_t)ref,
6964
- toleranceType, tolerance);
6965
- } else if (std::is_integral<T>::value &&
6966
- std::is_signed<T>::value) { // signed ints
6967
- return CompareOutputWithExpectedValueInt((int)output, (int)ref,
6968
- (int)tolerance);
6969
- } else if (std::is_integral<T>::value) { // unsigned ints
6970
- return CompareOutputWithExpectedValueUInt((uint32_t)output, (uint32_t)ref,
6971
- (uint32_t)tolerance);
6972
- } else if (std::is_floating_point<T>::value) { // floating point
6973
- return CompareOutputWithExpectedValueFloat((float)output, (float)ref,
6974
- toleranceType, tolerance);
6975
- }
6976
-
6977
- DXASSERT_NOMSG("Invalid Parameter Type");
6978
- }
6979
-
6980
6926
template <typename T>
6981
6927
static bool CompareOutputWithExpectedValue(T output, T ref,
6982
6928
LPCWSTR toleranceType,
0 commit comments