diff --git a/Test/baseResults/empty.frag.out b/Test/baseResults/empty.frag.out
index d3c244a5fa343e01bd40ceb95a0765711b5aa726..be186bb9f8abde5d2eb16cb686afbdd80453741a 100644
--- a/Test/baseResults/empty.frag.out
+++ b/Test/baseResults/empty.frag.out
@@ -13,16 +13,5 @@ Shader version: 110
0:? Sequence
0:? Linker Objects
-
-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
-0:? Sequence
-0:? Linker Objects
+ERROR: Cannot mix ES profile with non-ES profile shaders
diff --git a/Test/baseResults/es-link1.frag.out b/Test/baseResults/es-link1.frag.out
new file mode 100644
index 0000000000000000000000000000000000000000..41ce9a0fdfe9a4b72a3e2ceacaabc8ca527e0554
--- /dev/null
+++ b/Test/baseResults/es-link1.frag.out
@@ -0,0 +1,27 @@
+es-link1.frag
+Shader version: 100
+0:? Sequence
+0:5 Function Definition: main( (global void)
+0:5 Function Parameters:
+0:7 Sequence
+0:7 move second child to first child (temp mediump 4-component vector of float)
+0:7 'gl_FragColor' (fragColor mediump 4-component vector of float FragColor)
+0:7 Function Call: calculateColor( (global mediump 4-component vector of float)
+0:? Linker Objects
+
+es-link2.frag
+Shader version: 100
+0:? Sequence
+0:5 Function Definition: calculateColor( (global mediump 4-component vector of float)
+0:5 Function Parameters:
+0:7 Sequence
+0:7 Branch: Return with expression
+0:7 vector-scale (temp mediump 4-component vector of float)
+0:7 'varyingColor' (smooth in mediump 4-component vector of float)
+0:7 Constant:
+0:7 0.500000
+0:? Linker Objects
+0:? 'varyingColor' (smooth in mediump 4-component vector of float)
+
+ERROR: Cannot attach multiple ES shaders of the same type to a single program
+
diff --git a/Test/baseResults/link1.frag.out b/Test/baseResults/link1.frag.out
index bc6cf5c882b46d780ef1446e87eecb394fe59a36..51d7475a5bf5951174ab5029bae15b9320876b13 100644
--- a/Test/baseResults/link1.frag.out
+++ b/Test/baseResults/link1.frag.out
@@ -158,136 +158,5 @@ Requested GL_OES_texture_3D
0:? Linker Objects
0:? 'iv3' (smooth in highp 2-component vector of float)
-
-Linked fragment stage:
-
-ERROR: Linking fragment stage: Types must match:
- glass: "uniform 3-component vector of float" versus "uniform 2-component vector of float"
-ERROR: Linking fragment stage: Interpolation and auxiliary storage qualifiers must match:
- cup: "smooth in 4-component vector of float" versus "flat in 4-component vector of float"
-ERROR: Linking fragment stage: Initializers must match:
- cv3e
-ERROR: Linking fragment stage: Initializers must match:
- um2e
-ERROR: Linking fragment stage: Initializers must match:
- se
-ERROR: Linking fragment stage: Cannot mix ES profile with non-ES profile shaders
-
-ERROR: Linking fragment stage: Types must match:
-ERROR: Linking fragment stage: Precision qualifiers must match:
- iv3: "smooth in 3-component vector of float" versus "smooth in highp 2-component vector of float"
-
-Shader version: 300
-Requested GL_OES_EGL_image_external
-Requested GL_OES_standard_derivatives
-Requested GL_OES_texture_3D
-0:? Sequence
-0:8 Sequence
-0:8 move second child to first child (temp 4-component vector of float)
-0:8 'a' (global 4-component vector of float)
-0:8 vector-scale (temp 4-component vector of float)
-0:8 Constant:
-0:8 8.000000
-0:8 'uv4' (uniform 4-component vector of float)
-0:13 Function Definition: main( (global void)
-0:13 Function Parameters:
-0:17 Sequence
-0:17 move second child to first child (temp 4-component vector of float)
-0:17 'b' (global 4-component vector of float)
-0:17 vector-scale (temp 4-component vector of float)
-0:17 Constant:
-0:17 8.000000
-0:17 'a' (global 4-component vector of float)
-0:19 Function Definition: foo(mf22; (global 2-component vector of int)
-0:19 Function Parameters:
-0:19 'm' (in 2X2 matrix of float)
-0:21 Sequence
-0:21 Branch: Return with expression
-0:21 Convert float to int (temp 2-component vector of int)
-0:21 direct index (temp 2-component vector of float)
-0:21 'm' (in 2X2 matrix of float)
-0:21 Constant:
-0:21 0 (const int)
-0:24 Sequence
-0:24 move second child to first child (temp 4-component vector of float)
-0:24 'c' (global 4-component vector of float)
-0:24 component-wise multiply (temp 4-component vector of float)
-0:24 'b' (global 4-component vector of float)
-0:24 'b' (global 4-component vector of float)
-0:8 Sequence
-0:8 move second child to first child (temp 4-component vector of float)
-0:8 'd' (global 4-component vector of float)
-0:8 vector-scale (temp 4-component vector of float)
-0:8 Constant:
-0:8 8.000000
-0:8 'uv4' (uniform 4-component vector of float)
-0:13 Sequence
-0:13 move second child to first child (temp 4-component vector of float)
-0:13 'e' (global 4-component vector of float)
-0:13 vector-scale (temp 4-component vector of float)
-0:13 Constant:
-0:13 8.000000
-0:13 'd' (global 4-component vector of float)
-0:15 Function Definition: foo( (global 2-component vector of int)
-0:15 Function Parameters:
-0:17 Sequence
-0:17 Branch: Return with expression
-0:17 Constant:
-0:17 2 (const int)
-0:17 2 (const int)
-0:20 Sequence
-0:20 move second child to first child (temp 4-component vector of float)
-0:20 'f' (global 4-component vector of float)
-0:20 component-wise multiply (temp 4-component vector of float)
-0:20 'e' (global 4-component vector of float)
-0:20 'e' (global 4-component vector of float)
-0:? Linker Objects
-0:? 'uv4' (uniform 4-component vector of float)
-0:? 'glass' (uniform 3-component vector of float)
-0:? 'ci' (const int)
-0:? 8 (const int)
-0:? 'a' (global 4-component vector of float)
-0:? 'iv3' (smooth in 3-component vector of float)
-0:? 'cup' (smooth in 4-component vector of float)
-0:? 'b' (global 4-component vector of float)
-0:? 'c' (global 4-component vector of float)
-0:? 'cv3' (const 3-component vector of float)
-0:? 43.000000
-0:? 0.340000
-0:? 9.900000
-0:? 'cv3n' (const 3-component vector of float)
-0:? 43.000000
-0:? 0.340000
-0:? 9.900000
-0:? 'cv3e' (const 3-component vector of float)
-0:? 43.000000
-0:? 0.340000
-0:? 9.900000
-0:? 'um2' (uniform 2X2 matrix of float)
-0:? 4.000000
-0:? 0.000000
-0:? 0.000000
-0:? 4.000000
-0:? 'um2n' (uniform 2X2 matrix of float)
-0:? 4.000000
-0:? 0.000000
-0:? 0.000000
-0:? 4.000000
-0:? 'um2e' (uniform 2X2 matrix of float)
-0:? 4.000000
-0:? 0.000000
-0:? 0.000000
-0:? 4.000000
-0:? 's' (uniform structure{global int a, global float b})
-0:? 82 (const int)
-0:? 3.900000
-0:? 'sn' (uniform structure{global int a, global float b})
-0:? 82 (const int)
-0:? 3.900000
-0:? 'se' (uniform structure{global int a, global float b})
-0:? 82 (const int)
-0:? 3.900000
-0:? 'd' (global 4-component vector of float)
-0:? 'e' (global 4-component vector of float)
-0:? 'f' (global 4-component vector of float)
+ERROR: Cannot mix ES profile with non-ES profile shaders
diff --git a/Test/es-link1.frag b/Test/es-link1.frag
new file mode 100644
index 0000000000000000000000000000000000000000..fe4da41d034df93ca24fccab58d049bae763b610
--- /dev/null
+++ b/Test/es-link1.frag
@@ -0,0 +1,8 @@
+#version 100
+
+mediump vec4 calculateColor();
+
+void main()
+{
+ gl_FragColor = calculateColor();
+}
diff --git a/Test/es-link2.frag b/Test/es-link2.frag
new file mode 100644
index 0000000000000000000000000000000000000000..e7b5a4779b77c88a1e2fccc41faa487991e67b12
--- /dev/null
+++ b/Test/es-link2.frag
@@ -0,0 +1,8 @@
+#version 100
+
+varying mediump vec4 varyingColor;
+
+mediump vec4 calculateColor()
+{
+ return varyingColor * 0.5;
+}
diff --git a/Test/runtests b/Test/runtests
index 6e6524abb5741f37bbf977ff4530543b9bc940c9..d54fb580e82d532ebbc92a994035e5b62879103e 100755
--- a/Test/runtests
+++ b/Test/runtests
@@ -96,6 +96,7 @@ function runBulkTest {
runBulkTest mains1.frag mains2.frag noMain1.geom noMain2.geom
runBulkTest noMain.vert mains.frag
runBulkTest link1.frag link2.frag link3.frag
+runBulkTest es-link1.frag es-link2.frag
runBulkTest recurse1.vert recurse1.frag recurse2.frag
runBulkTest 300link.frag
runBulkTest 300link2.frag
diff --git a/glslang/MachineIndependent/ShaderLang.cpp b/glslang/MachineIndependent/ShaderLang.cpp
index 3a3bd58c318a629838955d78d53aa0f8103447b9..1446298ceba968e12eb4a9ddff088e7f4f2ff9ac 100644
--- a/glslang/MachineIndependent/ShaderLang.cpp
+++ b/glslang/MachineIndependent/ShaderLang.cpp
@@ -1526,14 +1526,34 @@ bool TProgram::linkStage(EShLanguage stage, EShMessages messages)
if (stages[stage].size() == 0)
return true;
+ int numEsShaders = 0, numNonEsShaders = 0;
+ for (auto it = stages[stage].begin(); it != stages[stage].end(); ++it) {
+ if ((*it)->intermediate->getProfile() == EEsProfile) {
+ numEsShaders++;
+ } else {
+ numNonEsShaders++;
+ }
+ }
+
+ if (numEsShaders > 0 && numNonEsShaders > 0) {
+ infoSink->info.message(EPrefixError, "Cannot mix ES profile with non-ES profile shaders");
+ return false;
+ } else if (numEsShaders > 1) {
+ infoSink->info.message(EPrefixError, "Cannot attach multiple ES shaders of the same type to a single program");
+ return false;
+ }
+
//
// Be efficient for the common single compilation unit per stage case,
// reusing it's TIntermediate instead of merging into a new one.
//
+ TIntermediate *firstIntermediate = stages[stage].front()->intermediate;
if (stages[stage].size() == 1)
- intermediate[stage] = stages[stage].front()->intermediate;
+ intermediate[stage] = firstIntermediate;
else {
- intermediate[stage] = new TIntermediate(stage);
+ intermediate[stage] = new TIntermediate(stage,
+ firstIntermediate->getVersion(),
+ firstIntermediate->getProfile());
newedIntermediate[stage] = true;
}
diff --git a/glslang/MachineIndependent/linkValidate.cpp b/glslang/MachineIndependent/linkValidate.cpp
index c48e7bff7475064a5c13c689caee9ff5f6dd3cb9..1cda57d36e94949116c2f4871c6c2372f317c8cc 100644
--- a/glslang/MachineIndependent/linkValidate.cpp
+++ b/glslang/MachineIndependent/linkValidate.cpp
@@ -86,10 +86,6 @@ void TIntermediate::merge(TInfoSink& infoSink, TIntermediate& unit)
numPushConstants += unit.numPushConstants;
callGraph.insert(callGraph.end(), unit.callGraph.begin(), unit.callGraph.end());
- if ((profile != EEsProfile && unit.profile == EEsProfile) ||
- (profile == EEsProfile && unit.profile != EEsProfile))
- error(infoSink, "Cannot mix ES profile with non-ES profile shaders\n");
-
if (originUpperLeft != unit.originUpperLeft || pixelCenterInteger != unit.pixelCenterInteger)
error(infoSink, "gl_FragCoord redeclarations must match across shaders\n");
diff --git a/gtests/Link.FromFile.cpp b/gtests/Link.FromFile.cpp
index 6db43d9c9f2a2b3dba964ca20d47b1966ca0ee68..331c5b2710ce0ba2863458cc7b6f374330d3d528 100644
--- a/gtests/Link.FromFile.cpp
+++ b/gtests/Link.FromFile.cpp
@@ -99,6 +99,7 @@ INSTANTIATE_TEST_CASE_P(
{"empty.frag", "empty2.frag", "empty3.frag"},
{"150.tesc", "150.tese", "400.tesc", "400.tese", "410.tesc", "420.tesc", "420.tese"},
{"max_vertices_0.geom"},
+ {"es-link1.frag", "es-link2.frag"},
})),
);
// clang-format on