mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Temporarily disable spirv1.6 tests

Browse Source 
These tests will be re-enabled when a Vulkan version is released that
supports spirv1.6.

Fixes #2858
This commit is contained in:
Greg Fischer
2022-01-11 13:13:50 -07:00
parent 57e25195eb
commit 140a76a447
3 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gtests/Hlsl.FromFile.cpp
View File

@@ -59,7 +59,7 @@ std::string FileNameAsCustomTestSuffix(
using HlslCompileTest = GlslangTest<::testing::TestWithParam<FileNameEntryPointPair>>;
using HlslVulkan1_1CompileTest = GlslangTest<::testing::TestWithParam<FileNameEntryPointPair>>;
using HlslSpv1_6CompileTest = GlslangTest<::testing::TestWithParam<FileNameEntryPointPair>>;
//using HlslSpv1_6CompileTest = GlslangTest<::testing::TestWithParam<FileNameEntryPointPair>>;
using HlslCompileAndFlattenTest = GlslangTest<::testing::TestWithParam<FileNameEntryPointPair>>;
using HlslLegalizeTest = GlslangTest<::testing::TestWithParam<FileNameEntryPointPair>>;
using HlslDebugTest = GlslangTest<::testing::TestWithParam<FileNameEntryPointPair>>;
@@ -82,12 +82,14 @@ TEST_P(HlslVulkan1_1CompileTest, FromFile)
Target::BothASTAndSpv, true, GetParam().entryPoint);
}
TEST_P(HlslSpv1_6CompileTest, FromFile)
{
loadFileCompileAndCheck(GlobalTestSettings.testRoot, GetParam().fileName,
Source::HLSL, Semantics::Vulkan, glslang::EShTargetUniversal, glslang::EShTargetSpv_1_6,
Target::BothASTAndSpv, true, GetParam().entryPoint);
}
// TODO(greg-lunarg): Re-enable tests when Vulkan1.3 ClientTarget is available
//TEST_P(HlslSpv1_6CompileTest, FromFile)
//{
// loadFileCompileAndCheck(GlobalTestSettings.testRoot, GetParam().fileName,
// Source::HLSL, Semantics::Vulkan, glslang::EShTargetUniversal, glslang::EShTargetSpv_1_6,
// Target::BothASTAndSpv, true, GetParam().entryPoint);
//}
TEST_P(HlslCompileAndFlattenTest, FromFile)
{
@@ -459,13 +461,13 @@ INSTANTIATE_TEST_SUITE_P(
// clang-format on
// clang-format off
INSTANTIATE_TEST_SUITE_P(
ToSpirv, HlslSpv1_6CompileTest,
::testing::ValuesIn(std::vector<FileNameEntryPointPair>{
{"hlsl.spv.1.6.discard.frag", "PixelShaderFunction"}
}),
FileNameAsCustomTestSuffix
);
//INSTANTIATE_TEST_SUITE_P(
// ToSpirv, HlslSpv1_6CompileTest,
// ::testing::ValuesIn(std::vector<FileNameEntryPointPair>{
// {"hlsl.spv.1.6.discard.frag", "PixelShaderFunction"}
// }),
// FileNameAsCustomTestSuffix
//);
// clang-format on
// clang-format off