Clamp "count" in glUniform* before passing to the backend

src/libANGLE/Program.h

@@ -460,11 +460,15 @@ class Program final : angle::NonCopyable, public LabeledObject
 
     void defineUniformBlock(const sh::InterfaceBlock &interfaceBlock, GLenum shaderType);
 
+    // Both these function update the cached uniform values and return a modified "count"
+    // so that the uniform update doesn't overflow the uniform.
     template <typename T>
-    void setUniformInternal(GLint location, GLsizei count, const T *v);
-
+    GLsizei setUniformInternal(GLint location, GLsizei count, int vectorSize, const T *v);
     template <size_t cols, size_t rows, typename T>
-    void setMatrixUniformInternal(GLint location, GLsizei count, GLboolean transpose, const T *v);
+    GLsizei setMatrixUniformInternal(GLint location,
+                                     GLsizei count,
+                                     GLboolean transpose,
+                                     const T *v);
 
     template <typename DestT>
     void getUniformInternal(GLint location, DestT *dataOut) const;

src/tests/gl_tests/UniformTest.cpp

@@ -462,13 +462,6 @@ TEST_P(UniformTestES3, TranposedMatrixArrayUniformStateQuery)
 // Check that trying setting too many elements of an array doesn't overflow
 TEST_P(UniformTestES3, OverflowArray)
 {
-    // TODO(cwallez): fix on the Wintel OpenGL driver
-    if (IsIntel() && IsOpenGL() && IsWindows())
-    {
-        std::cout << "Test skipped on Intel Windows OpenGL." << std::endl;
-        return;
-    }
-
     const std::string &vertexShader =
         "#version 300 es\n"
         "void main() { gl_Position = vec4(1); }";