Fail link and validation of invalid tessellation program

The GL_EXT_tessellation_shader spec says - The tessellation control and evaluation shaders are both optional. If neither shader type is present, the tessellation stage has no effect. However, if either a tessellation control or a tessellation evaluation shader is present, the other must also be present. Fail link and validation if a program contains TCS or TES shader but not both. Bug: angleproject:3572 Tests: KHR-GLES32.core.tessellation_shader.single.xfb_captures_data_from_correct_stage Change-Id: I6799f101a186f3bfae738df442e9aeee691fd91a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5410646 Reviewed-by: Shahbaz Youssefi <[email protected]> Commit-Queue: mohan maiya <[email protected]>
google · Apr 2, 2024 · 85b3e96 · 85b3e96
1 parent 47ca755
commit 85b3e96
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/libANGLE/ProgramPipeline.cpp b/src/libANGLE/ProgramPipeline.cpp
@@ -535,6 +535,12 @@ angle::Result ProgramPipeline::link(const Context *context)
     const Version &clientVersion   = context->getClientVersion();
     const bool isWebGL             = context->isWebGL();
 
+    if (mState.mExecutable->hasLinkedShaderStage(gl::ShaderType::TessControl) !=
+        mState.mExecutable->hasLinkedShaderStage(gl::ShaderType::TessEvaluation))
+    {
+        return angle::Result::Stop;
+    }
+
     if (mState.mExecutable->hasLinkedShaderStage(ShaderType::Vertex))
     {
         if (!linkVaryings())
@@ -706,6 +712,15 @@ void ProgramPipeline::validate(const Context *context)
     mState.mValid    = true;
     mState.mInfoLog.reset();
 
+    if (mState.mExecutable->hasLinkedShaderStage(gl::ShaderType::TessControl) !=
+        mState.mExecutable->hasLinkedShaderStage(gl::ShaderType::TessEvaluation))
+    {
+        mState.mValid = false;
+        mState.mInfoLog << "Program pipeline must have both a Tessellation Control and Evaluation "
+                           "shader or neither\n";
+        return;
+    }
+
     for (const ShaderType shaderType : mState.mExecutable->getLinkedShaderStages())
     {
         Program *shaderProgram = mState.mPrograms[shaderType];

diff --git a/src/tests/deqp_support/deqp_khr_gles32_test_expectations.txt b/src/tests/deqp_support/deqp_khr_gles32_test_expectations.txt
@@ -24,8 +24,6 @@
 // Failures on older nvidia drivers
 5557 VULKAN WIN NVIDIA : KHR-GLES32.core.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_PatchVerticesIn = FAIL
 5557 VULKAN WIN NVIDIA : KHR-GLES32.core.tessellation_shader.tessellation_shader_tessellation.gl_InvocationID_PatchVerticesIn_PrimitiveID = FAIL
-// Expects separable program to fail but doesn't
-5557 VULKAN WIN : KHR-GLES32.core.tessellation_shader.single.xfb_captures_data_from_correct_stage = SKIP
 
 // Slow test
 5557 VULKAN WIN : KHR-GLES32.core.tessellation_shader.vertex.vertex_ordering = SKIP
@@ -114,7 +112,6 @@
 
 // Samsung Galaxy S22 (Xclipse)
 b/267953710 GALAXYS22 VULKAN : KHR-GLES32.core.tessellation_shader.tessellation_shader_tessellation.gl_InvocationID_PatchVerticesIn_PrimitiveID = SKIP
-b/267953710 GALAXYS22 VULKAN : KHR-GLES32.core.tessellation_shader.single.xfb_captures_data_from_correct_stage = SKIP
 
 // Samsung Galaxy S23
 8157 GALAXYS23 VULKAN : KHR-GLES32.shaders.function.global_variable_aliasing_fragment = SKIP