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

Add Vulkan 1.3 support

Browse Source 
Also update known goods to Vulkan 1.3 support
Also re-enable SPIR-V 1.6 tests with vulkan1.3 target
Also re-cache SPIRV 1.6 header which somehow regressed back to 1.5
This commit is contained in:
Greg Fischer
2022-01-26 14:45:58 -07:00
parent 81cc10a498
commit 9ebd8ff6c1
13 changed files with 261 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
gtests/Spv.FromFile.cpp
View File

@@ -69,7 +69,7 @@ using CompileVulkanToSpirvDeadCodeElimTest = GlslangTest<::testing::TestWithPara
using CompileVulkanToDebugSpirvTest = GlslangTest<::testing::TestWithParam<std::string>>;
using CompileVulkan1_1ToSpirvTest = GlslangTest<::testing::TestWithParam<std::string>>;
using CompileToSpirv14Test = GlslangTest<::testing::TestWithParam<std::string>>;
//using CompileToSpirv16Test = GlslangTest<::testing::TestWithParam<std::string>>;
using CompileToSpirv16Test = GlslangTest<::testing::TestWithParam<std::string>>;
using CompileOpenGLToSpirvTest = GlslangTest<::testing::TestWithParam<std::string>>;
using VulkanSemantics = GlslangTest<::testing::TestWithParam<std::string>>;
using OpenGLSemantics = GlslangTest<::testing::TestWithParam<std::string>>;
@@ -123,14 +123,12 @@ TEST_P(CompileToSpirv14Test, FromFile)
Target::Spv);
}
// TODO(greg-lunarg): Re-enable tests when Vulkan1.3 ClientTarget is available
//TEST_P(CompileToSpirv16Test, FromFile)
//{
// loadFileCompileAndCheck(GlobalTestSettings.testRoot, GetParam(),
// Source::GLSL, Semantics::Vulkan, glslang::EShTargetUniversal, glslang::EShTargetSpv_1_6,
// Target::Spv);
//}
TEST_P(CompileToSpirv16Test, FromFile)
{
loadFileCompileAndCheck(GlobalTestSettings.testRoot, GetParam(),
Source::GLSL, Semantics::Vulkan, glslang::EShTargetVulkan_1_3, glslang::EShTargetSpv_1_6,
Target::Spv);
}
// Compiling GLSL to SPIR-V under OpenGL semantics. Expected to successfully
// generate SPIR-V.
@@ -632,15 +630,15 @@ INSTANTIATE_TEST_SUITE_P(
);
// clang-format off
//INSTANTIATE_TEST_SUITE_P(
// Glsl, CompileToSpirv16Test,
// ::testing::ValuesIn(std::vector<std::string>({
// "spv.1.6.conditionalDiscard.frag",
// "spv.1.6.helperInvocation.frag",
// "spv.1.6.specConstant.comp",
// })),
// FileNameAsCustomTestSuffix
//);
INSTANTIATE_TEST_SUITE_P(
Glsl, CompileToSpirv16Test,
::testing::ValuesIn(std::vector<std::string>({
"spv.1.6.conditionalDiscard.frag",
"spv.1.6.helperInvocation.frag",
"spv.1.6.specConstant.comp",
})),
FileNameAsCustomTestSuffix
);
// clang-format off