Ensure ValidateDelete{Program|Shader} consistency

Deleting program zero is valid.

Deleting shader zero is valid.

Bug: angleproject:406922380
Change-Id: I2a26be8200585fae3a70c0a904be96ff590ebe7b
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6409251
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Alexey Knyazev <lexa.knyazev@gmail.com>

Author: lexaknyazev

src/libANGLE/capture/FrameCapture.cpp

@@ -7088,6 +7088,10 @@ void FrameCaptureShared::maybeCapturePreCallUpdates(
             // If we're capturing, track which programs have been deleted
             const ParamCapture &param =
                 call.params.getParam("programPacked", ParamType::TShaderProgramID, 0);
+            if (param.value.ShaderProgramIDVal.value == 0)
+            {
+                break;  // no-op
+            }
             handleDeletedResource(context, param.value.ShaderProgramIDVal);
 
             // If this assert fires, it means a ShaderProgramID has changed from program to shader
@@ -7113,6 +7117,10 @@ void FrameCaptureShared::maybeCapturePreCallUpdates(
             // If we're capturing, track which shaders have been deleted
             const ParamCapture &param =
                 call.params.getParam("shaderPacked", ParamType::TShaderProgramID, 0);
+            if (param.value.ShaderProgramIDVal.value == 0)
+            {
+                break;  // no-op
+            }
             handleDeletedResource(context, param.value.ShaderProgramIDVal);
 
             // If this assert fires, it means a ShaderProgramID has changed from shader to program
@@ -7761,6 +7769,10 @@ void FrameCaptureShared::maybeCapturePostCallUpdates(const gl::Context *context)
         {
             const ParamCapture &param =
                 lastCall.params.getParam("programPacked", ParamType::TShaderProgramID, 0);
+            if (param.value.ShaderProgramIDVal.value == 0)
+            {
+                break;  // no-op
+            }
             CaptureDeleteUniformLocations(param.value.ShaderProgramIDVal, &mFrameCalls);
             break;
         }

src/libANGLE/validationES2.cpp

@@ -4438,7 +4438,7 @@ bool ValidateDeleteProgram(const Context *context,
 {
     if (program.value == 0)
     {
-        return false;
+        return true;  // no-op
     }
 
     if (!context->getProgramResolveLink(program))
@@ -4464,7 +4464,7 @@ bool ValidateDeleteShader(const Context *context,
 {
     if (shader.value == 0)
     {
-        return false;
+        return true;  // no-op
     }
 
     if (!context->getShaderNoResolveCompile(shader))

src/tests/gl_tests/SimpleOperationTest.cpp

@@ -214,6 +214,20 @@ TEST_P(SimpleOperationTest, ClearAndSwap)
     ASSERT_FALSE(getGLWindow()->hasError());
 }
 
+// Deleting shader zero is no-op.
+TEST_P(SimpleOperationTest, DeleteShaderZero)
+{
+    glDeleteShader(0);
+    EXPECT_GL_NO_ERROR();
+}
+
+// Deleting program zero is no-op.
+TEST_P(SimpleOperationTest, DeleteProgramZero)
+{
+    glDeleteProgram(0);
+    EXPECT_GL_NO_ERROR();
+}
+
 // Simple case of setting a scissor, enabled or disabled.
 TEST_P(SimpleOperationTest, ScissorTest)
 {