Ver Fonte

set test as blocked for invalid shader model test (#1061)

Young Kim há 7 anos atrás
pai
commit
faafc68222
1 ficheiros alterados com 2 adições e 1 exclusões
  1. 2 1
      tools/clang/unittests/HLSL/ExecutionTest.cpp

+ 2 - 1
tools/clang/unittests/HLSL/ExecutionTest.cpp

@@ -446,6 +446,7 @@ public:
       UINT minor = testModel & 0x0f;
       UINT minor = testModel & 0x0f;
       LogCommentFmt(L"Installed SDK does not support "
       LogCommentFmt(L"Installed SDK does not support "
           L"shader model 6.%1u", minor);
           L"shader model 6.%1u", minor);
+      WEX::Logging::Log::Result(WEX::Logging::TestResults::Blocked);
       return false;
       return false;
     }
     }
     const D3D_FEATURE_LEVEL FeatureLevelRequired = D3D_FEATURE_LEVEL_11_0;
     const D3D_FEATURE_LEVEL FeatureLevelRequired = D3D_FEATURE_LEVEL_11_0;
@@ -492,7 +493,7 @@ public:
       } D3D12_FEATURE_DATA_SHADER_MODEL;
       } D3D12_FEATURE_DATA_SHADER_MODEL;
       const UINT D3D12_FEATURE_SHADER_MODEL = 7;
       const UINT D3D12_FEATURE_SHADER_MODEL = 7;
       D3D12_FEATURE_DATA_SHADER_MODEL SMData;
       D3D12_FEATURE_DATA_SHADER_MODEL SMData;
-      SMData.HighestShaderModel = HIGHEST_SHADER_MODEL;
+      SMData.HighestShaderModel = testModel;
       VERIFY_SUCCEEDED(pDevice->CheckFeatureSupport(
       VERIFY_SUCCEEDED(pDevice->CheckFeatureSupport(
         (D3D12_FEATURE)D3D12_FEATURE_SHADER_MODEL, &SMData, sizeof(SMData)));
         (D3D12_FEATURE)D3D12_FEATURE_SHADER_MODEL, &SMData, sizeof(SMData)));
       if (SMData.HighestShaderModel < testModel) {
       if (SMData.HighestShaderModel < testModel) {