From 0bb546f8ae76a595fb08c288a0a868930f222d77 Mon Sep 17 00:00:00 2001 From: Thomas Perl <m@thp.io> Date: Tue, 24 May 2016 13:18:31 +0200 Subject: [PATCH] Fix test case for the "empty" linker test case The test result should only give one error about linking ES and non-ES shading language compilation units: - empty.frag: No version info, interpreted as 100, ES - empty2.frag: No version info, interpreted as 100, ES - empty3.frag: Version declared as 110, non-ES Previously, because the new intermediate is always created without version/profile information, there would be two linker errors: 1.) When merging the new intermediate with empty.frag 2.) When merging (new intermediate + empty.frag + empty2.frag) with empty3.frag Now, there is only one error; as the error with merging the new intermediate with empty.frag has been removed. --- Test/baseResults/empty.frag.out | 2 -- 1 file changed, 2 deletions(-) diff --git a/Test/baseResults/empty.frag.out b/Test/baseResults/empty.frag.out index d3c244a5f..95db9ef86 100644 --- a/Test/baseResults/empty.frag.out +++ b/Test/baseResults/empty.frag.out @@ -18,8 +18,6 @@ Linked fragment stage: ERROR: Linking fragment stage: Cannot mix ES profile with non-ES profile shaders -ERROR: Linking fragment stage: Cannot mix ES profile with non-ES profile shaders - ERROR: Linking fragment stage: Missing entry point: Each stage requires one "void main()" entry point Shader version: 110 -- GitLab