AuroraMiddleware/glslang
1
0
Fork 0
mirror of https://github.com/KhronosGroup/glslang synced 2024-11-08 11:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update tests to use the new iomapper interface

Browse Source 
This updates the test to use the new public GetGlslIoMapper() and
TProgram::getGlslIoResolver() entry points, instead of depending on
internal points that are not available in shared library builds.
This commit is contained in:
Arcady Goldmints-Orlov 2024-09-13 13:31:45 -07:00 committed by arcady-lunarg
parent d081b4d8c6
commit 02bc074ac4
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtests/GlslMapIO.FromFile.cpp
View File

@ -285,19 +285,21 @@ TEST_P(GlslMapIOTest, FromFile)
result.linkingOutput = program.getInfoLog();
result.linkingError = program.getInfoDebugLog();
unsigned int stage = 0;
glslang::TIntermediate* firstIntermediate = nullptr;
while (!program.getIntermediate((EShLanguage)stage) && stage < EShLangCount) { stage++; }
firstIntermediate = program.getIntermediate((EShLanguage)stage);
glslang::TDefaultGlslIoResolver resolver(*firstIntermediate);
glslang::TGlslIoMapper ioMapper;
glslang::TIoMapResolver *resolver;
for (unsigned stage = 0; stage < EShLangCount; stage++) {
resolver = program.getGlslIoResolver((EShLanguage)stage);
if (resolver)
break;
}
glslang::TIoMapper *ioMapper = glslang::GetGlslIoMapper();
if (success) {
success &= program.mapIO(&resolver, &ioMapper);
success &= program.mapIO(resolver, ioMapper);
result.linkingOutput = program.getInfoLog();
result.linkingError = program.getInfoDebugLog();
}
delete ioMapper;
delete resolver;
success &= verifyIOMapping(result.linkingError, program);
result.validationResult = success;

18
gtests/VkRelaxed.FromFile.cpp
View File

@ -237,19 +237,21 @@ TEST_P(VulkanRelaxedTest, FromFile)
shaders[i]->setResourceSetBinding(resourceSetBindings[i]);
}
unsigned int stage = 0;
glslang::TIntermediate* firstIntermediate = nullptr;
while (!program.getIntermediate((EShLanguage)stage) && stage < EShLangCount) { stage++; }
firstIntermediate = program.getIntermediate((EShLanguage)stage);
glslang::TDefaultGlslIoResolver resolver(*firstIntermediate);
glslang::TGlslIoMapper ioMapper;
glslang::TIoMapResolver *resolver;
for (unsigned stage = 0; stage < EShLangCount; stage++) {
resolver = program.getGlslIoResolver((EShLanguage)stage);
if (resolver)
break;
}
glslang::TIoMapper *ioMapper = glslang::GetGlslIoMapper();
if (success) {
success &= program.mapIO(&resolver, &ioMapper);
success &= program.mapIO(resolver, ioMapper);
result.linkingOutput = program.getInfoLog();
result.linkingError = program.getInfoDebugLog();
}
delete ioMapper;
delete resolver;
success &= verifyIOMapping(result.linkingError, program);
result.validationResult = success;