|
@@ -287,9 +287,7 @@ public:
|
|
|
TEST_METHOD(BasicTriangleTest);
|
|
|
TEST_METHOD(BasicTriangleOpTest);
|
|
|
|
|
|
- BEGIN_TEST_METHOD(BasicTriangleOpTestHalf)
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.2
|
|
|
- END_TEST_METHOD()
|
|
|
+ TEST_METHOD(BasicTriangleOpTestHalf);
|
|
|
|
|
|
TEST_METHOD(OutOfBoundsTest);
|
|
|
TEST_METHOD(SaturateTest);
|
|
@@ -316,14 +314,10 @@ public:
|
|
|
TEST_METHOD(DynamicResourcesTest)
|
|
|
TEST_METHOD(QuadReadTest)
|
|
|
|
|
|
- BEGIN_TEST_METHOD(CBufferTestHalf)
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.2
|
|
|
- END_TEST_METHOD()
|
|
|
+ TEST_METHOD(CBufferTestHalf);
|
|
|
|
|
|
TEST_METHOD(BasicShaderModel61);
|
|
|
- BEGIN_TEST_METHOD(BasicShaderModel63)
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.3
|
|
|
- END_TEST_METHOD()
|
|
|
+ TEST_METHOD(BasicShaderModel63);
|
|
|
|
|
|
BEGIN_TEST_METHOD(WaveIntrinsicsActiveIntTest)
|
|
|
TEST_METHOD_PROPERTY(L"DataSource", L"Table:ShaderOpArithTable.xml#WaveIntrinsicsActiveIntTable")
|
|
@@ -362,15 +356,12 @@ public:
|
|
|
|
|
|
BEGIN_TEST_METHOD(UnaryHalfOpTest)
|
|
|
TEST_METHOD_PROPERTY(L"DataSource", L"Table:ShaderOpArithTable.xml#UnaryHalfOpTable")
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.2
|
|
|
END_TEST_METHOD()
|
|
|
BEGIN_TEST_METHOD(BinaryHalfOpTest)
|
|
|
TEST_METHOD_PROPERTY(L"DataSource", L"Table:ShaderOpArithTable.xml#BinaryHalfOpTable")
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.2
|
|
|
END_TEST_METHOD()
|
|
|
BEGIN_TEST_METHOD(TertiaryHalfOpTest)
|
|
|
TEST_METHOD_PROPERTY(L"DataSource", L"Table:ShaderOpArithTable.xml#TertiaryHalfOpTable")
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.2
|
|
|
END_TEST_METHOD()
|
|
|
|
|
|
BEGIN_TEST_METHOD(UnaryIntOpTest)
|
|
@@ -395,28 +386,22 @@ public:
|
|
|
|
|
|
BEGIN_TEST_METHOD(UnaryInt16OpTest)
|
|
|
TEST_METHOD_PROPERTY(L"DataSource", L"Table:ShaderOpArithTable.xml#UnaryInt16OpTable")
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.2
|
|
|
END_TEST_METHOD()
|
|
|
BEGIN_TEST_METHOD(BinaryInt16OpTest)
|
|
|
TEST_METHOD_PROPERTY(L"DataSource", L"Table:ShaderOpArithTable.xml#BinaryInt16OpTable")
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.2
|
|
|
END_TEST_METHOD()
|
|
|
BEGIN_TEST_METHOD(TertiaryInt16OpTest)
|
|
|
TEST_METHOD_PROPERTY(L"DataSource", L"Table:ShaderOpArithTable.xml#TertiaryInt16OpTable")
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.2
|
|
|
END_TEST_METHOD()
|
|
|
|
|
|
BEGIN_TEST_METHOD(UnaryUint16OpTest)
|
|
|
TEST_METHOD_PROPERTY(L"DataSource", L"Table:ShaderOpArithTable.xml#UnaryUint16OpTable")
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.2
|
|
|
END_TEST_METHOD()
|
|
|
BEGIN_TEST_METHOD(BinaryUint16OpTest)
|
|
|
TEST_METHOD_PROPERTY(L"DataSource", L"Table:ShaderOpArithTable.xml#BinaryUint16OpTable")
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.2
|
|
|
END_TEST_METHOD()
|
|
|
BEGIN_TEST_METHOD(TertiaryUint16OpTest)
|
|
|
TEST_METHOD_PROPERTY(L"DataSource", L"Table:ShaderOpArithTable.xml#TertiaryUint16OpTable")
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.2
|
|
|
END_TEST_METHOD()
|
|
|
|
|
|
BEGIN_TEST_METHOD(DotTest)
|
|
@@ -441,12 +426,10 @@ public:
|
|
|
|
|
|
BEGIN_TEST_METHOD(DenormBinaryFloatOpTest)
|
|
|
TEST_METHOD_PROPERTY(L"DataSource", L"Table:ShaderOpArithTable.xml#DenormBinaryFloatOpTable")
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.2
|
|
|
END_TEST_METHOD()
|
|
|
|
|
|
BEGIN_TEST_METHOD(DenormTertiaryFloatOpTest)
|
|
|
TEST_METHOD_PROPERTY(L"DataSource", L"Table:ShaderOpArithTable.xml#DenormTertiaryFloatOpTable")
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.2
|
|
|
END_TEST_METHOD()
|
|
|
|
|
|
TEST_METHOD(BarycentricsTest);
|
|
@@ -454,36 +437,20 @@ public:
|
|
|
TEST_METHOD(ComputeRawBufferLdStI32);
|
|
|
TEST_METHOD(ComputeRawBufferLdStFloat);
|
|
|
|
|
|
- BEGIN_TEST_METHOD(ComputeRawBufferLdStI64)
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.3
|
|
|
- END_TEST_METHOD()
|
|
|
- BEGIN_TEST_METHOD(ComputeRawBufferLdStDouble)
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.3
|
|
|
- END_TEST_METHOD()
|
|
|
+ TEST_METHOD(ComputeRawBufferLdStI64);
|
|
|
+ TEST_METHOD(ComputeRawBufferLdStDouble);
|
|
|
|
|
|
- BEGIN_TEST_METHOD(ComputeRawBufferLdStI16)
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // This test is disabled because of a bug in WARP; TODO: enable once the bug is fixed
|
|
|
- END_TEST_METHOD()
|
|
|
- BEGIN_TEST_METHOD(ComputeRawBufferLdStHalf)
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // This test is disabled because of a bug in WARP; TODO: enable once the bug is fixed
|
|
|
- END_TEST_METHOD()
|
|
|
+ TEST_METHOD(ComputeRawBufferLdStI16);
|
|
|
+ TEST_METHOD(ComputeRawBufferLdStHalf);
|
|
|
|
|
|
TEST_METHOD(GraphicsRawBufferLdStI32);
|
|
|
TEST_METHOD(GraphicsRawBufferLdStFloat);
|
|
|
|
|
|
- BEGIN_TEST_METHOD(GraphicsRawBufferLdStI64)
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.3
|
|
|
- END_TEST_METHOD()
|
|
|
- BEGIN_TEST_METHOD(GraphicsRawBufferLdStDouble)
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // Remove this line once warp supports this feature in Shader Model 6.3
|
|
|
- END_TEST_METHOD()
|
|
|
+ TEST_METHOD(GraphicsRawBufferLdStI64);
|
|
|
+ TEST_METHOD(GraphicsRawBufferLdStDouble);
|
|
|
|
|
|
- BEGIN_TEST_METHOD(GraphicsRawBufferLdStI16)
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // This test is disabled because of a bug in WARP; TODO: enable once the bug is fixed
|
|
|
- END_TEST_METHOD()
|
|
|
- BEGIN_TEST_METHOD(GraphicsRawBufferLdStHalf)
|
|
|
- TEST_METHOD_PROPERTY(L"Priority", L"2") // This test is disabled because of a bug in WARP; TODO: enable once the bug is fixed
|
|
|
- END_TEST_METHOD()
|
|
|
+ TEST_METHOD(GraphicsRawBufferLdStI16);
|
|
|
+ TEST_METHOD(GraphicsRawBufferLdStHalf);
|
|
|
|
|
|
BEGIN_TEST_METHOD(PackUnpackTest)
|
|
|
TEST_METHOD_PROPERTY(L"DataSource", L"Table:ShaderOpArithTable.xml#PackUnpackOpTable")
|
|
@@ -2974,6 +2941,13 @@ void ExecutionTest::BasicTriangleTestSetup(LPCSTR ShaderOpName, LPCWSTR FileName
|
|
|
if (!CreateDevice(&pDevice, testModel))
|
|
|
return;
|
|
|
|
|
|
+ // As this is used, 6.2 requirement always comes with requiring native 16-bit ops
|
|
|
+ if (testModel == D3D_SHADER_MODEL_6_2 && !DoesDeviceSupportNative16bitOps(pDevice)) {
|
|
|
+ WEX::Logging::Log::Comment(L"Device does not support native 16-bit operations.");
|
|
|
+ WEX::Logging::Log::Result(WEX::Logging::TestResults::Skipped);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
std::shared_ptr<ShaderOpTestResult> test = RunShaderOpTest(pDevice, m_support, pStream, ShaderOpName, nullptr);
|
|
|
MappedData data;
|
|
|
D3D12_RESOURCE_DESC &D = test->ShaderOp->GetResourceByName("RTarget")->Desc;
|