Ensure ValidateUniform* consistency

Uniform calls are valid when
location is -1 or ignored.

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

Author: lexaknyazev

src/libANGLE/validationES.cpp

@@ -2970,9 +2970,16 @@ bool ValidateUniform(const Context *context,
 {
     const LinkedUniform *uniform = nullptr;
     Program *programObject       = context->getActiveLinkedProgram();
-    return ValidateUniformCommonBase(context, entryPoint, programObject, location, count,
-                                     &uniform) &&
-           ValidateUniformValue(context, entryPoint, valueType, uniform->getType());
+    if (!ValidateUniformCommonBase(context, entryPoint, programObject, location, count, &uniform))
+    {
+        // Error already generated.
+        return false;
+    }
+    if (uniform == nullptr)
+    {
+        return true;  // no-op
+    }
+    return ValidateUniformValue(context, entryPoint, valueType, uniform->getType());
 }
 
 bool ValidateUniform1iv(const Context *context,
@@ -2983,9 +2990,16 @@ bool ValidateUniform1iv(const Context *context,
 {
     const LinkedUniform *uniform = nullptr;
     Program *programObject       = context->getActiveLinkedProgram();
-    return ValidateUniformCommonBase(context, entryPoint, programObject, location, count,
-                                     &uniform) &&
-           ValidateUniform1ivValue(context, entryPoint, uniform->getType(), count, value);
+    if (!ValidateUniformCommonBase(context, entryPoint, programObject, location, count, &uniform))
+    {
+        // Error already generated.
+        return false;
+    }
+    if (uniform == nullptr)
+    {
+        return true;  // no-op
+    }
+    return ValidateUniform1ivValue(context, entryPoint, uniform->getType(), count, value);
 }
 
 bool ValidateUniformMatrix(const Context *context,
@@ -3003,9 +3017,16 @@ bool ValidateUniformMatrix(const Context *context,
 
     const LinkedUniform *uniform = nullptr;
     Program *programObject       = context->getActiveLinkedProgram();
-    return ValidateUniformCommonBase(context, entryPoint, programObject, location, count,
-                                     &uniform) &&
-           ValidateUniformMatrixValue(context, entryPoint, valueType, uniform->getType());
+    if (!ValidateUniformCommonBase(context, entryPoint, programObject, location, count, &uniform))
+    {
+        // Error already generated.
+        return false;
+    }
+    if (uniform == nullptr)
+    {
+        return true;  // no-op
+    }
+    return ValidateUniformMatrixValue(context, entryPoint, valueType, uniform->getType());
 }
 
 bool ValidateStateQuery(const Context *context,

src/libANGLE/validationES.h

@@ -346,8 +346,7 @@ ANGLE_INLINE bool ValidateUniformCommonBase(const Context *context,
 
     if (location.value == -1)
     {
-        // Silently ignore the uniform command
-        return false;
+        return true;  // no-op
     }
 
     const ProgramExecutable &executable = program->getExecutable();
@@ -362,8 +361,7 @@ ANGLE_INLINE bool ValidateUniformCommonBase(const Context *context,
     const auto &uniformLocation = uniformLocations[castedLocation];
     if (uniformLocation.ignored)
     {
-        // Silently ignore the uniform command
-        return false;
+        return true;  // no-op
     }
 
     if (!uniformLocation.used())

src/libANGLE/validationES31.cpp

@@ -327,9 +327,16 @@ bool ValidateProgramUniformBase(const Context *context,
 {
     const LinkedUniform *uniform = nullptr;
     Program *programObject       = GetValidProgram(context, entryPoint, program);
-    return ValidateUniformCommonBase(context, entryPoint, programObject, location, count,
-                                     &uniform) &&
-           ValidateUniformValue(context, entryPoint, valueType, uniform->getType());
+    if (!ValidateUniformCommonBase(context, entryPoint, programObject, location, count, &uniform))
+    {
+        // Error already generated.
+        return false;
+    }
+    if (uniform == nullptr)
+    {
+        return true;  // no-op
+    }
+    return ValidateUniformValue(context, entryPoint, valueType, uniform->getType());
 }
 
 bool ValidateProgramUniformMatrixBase(const Context *context,
@@ -342,9 +349,16 @@ bool ValidateProgramUniformMatrixBase(const Context *context,
 {
     const LinkedUniform *uniform = nullptr;
     Program *programObject       = GetValidProgram(context, entryPoint, program);
-    return ValidateUniformCommonBase(context, entryPoint, programObject, location, count,
-                                     &uniform) &&
-           ValidateUniformMatrixValue(context, entryPoint, valueType, uniform->getType());
+    if (!ValidateUniformCommonBase(context, entryPoint, programObject, location, count, &uniform))
+    {
+        // Error already generated.
+        return false;
+    }
+    if (uniform == nullptr)
+    {
+        return true;  // no-op
+    }
+    return ValidateUniformMatrixValue(context, entryPoint, valueType, uniform->getType());
 }
 
 bool ValidateVertexAttribFormatCommon(const Context *context,
@@ -742,9 +756,16 @@ bool ValidateProgramUniform1ivBase(const Context *context,
 {
     const LinkedUniform *uniform = nullptr;
     Program *programObject       = GetValidProgram(context, entryPoint, program);
-    return ValidateUniformCommonBase(context, entryPoint, programObject, location, count,
-                                     &uniform) &&
-           ValidateUniform1ivValue(context, entryPoint, uniform->getType(), count, value);
+    if (!ValidateUniformCommonBase(context, entryPoint, programObject, location, count, &uniform))
+    {
+        // Error already generated.
+        return false;
+    }
+    if (uniform == nullptr)
+    {
+        return true;  // no-op
+    }
+    return ValidateUniform1ivValue(context, entryPoint, uniform->getType(), count, value);
 }
 
 bool ValidateProgramUniform2ivBase(const Context *context,