Fix querying large vertex attrib divisors

src/libANGLE/queryconversions.cpp

@@ -121,6 +121,7 @@ template GLint CastFromStateValue<GLint, GLint64>(GLenum pname, GLint64 value);
 template GLint64 CastFromStateValue<GLint64, GLint>(GLenum pname, GLint value);
 template GLint64 CastFromStateValue<GLint64, GLint64>(GLenum pname, GLint64 value);
 template GLfloat CastFromStateValue<GLfloat, GLint>(GLenum pname, GLint value);
+template GLfloat CastFromStateValue<GLfloat, GLuint>(GLenum pname, GLuint value);
 template GLfloat CastFromStateValue<GLfloat, GLfloat>(GLenum pname, GLfloat value);
 template GLint CastFromStateValue<GLint, GLfloat>(GLenum pname, GLfloat value);
 template GLuint CastFromStateValue<GLuint, GLint>(GLenum pname, GLint value);

src/libANGLE/queryutils.cpp

@@ -423,7 +423,7 @@ void QueryVertexAttribBase(const VertexAttribute &attrib,
             *params = CastFromGLintStateValue<ParamType>(pname, binding.getBuffer().id());
             break;
         case GL_VERTEX_ATTRIB_ARRAY_DIVISOR:
-            *params = CastFromGLintStateValue<ParamType>(pname, binding.getDivisor());
+            *params = CastFromStateValue<ParamType>(pname, binding.getDivisor());
             break;
         case GL_VERTEX_ATTRIB_ARRAY_INTEGER:
             *params = CastFromGLintStateValue<ParamType>(pname, attrib.pureInteger);

src/tests/gl_tests/InstancingTest.cpp

@@ -621,6 +621,19 @@ void main()
     }
 }
 
+// This is a regression test. If VertexAttribDivisor was returned as a signed integer, it would be
+// incorrectly clamped down to the maximum signed integer.
+TEST_P(InstancingTestES3, LargestDivisor)
+{
+    constexpr GLuint kLargeDivisor = std::numeric_limits<GLuint>::max();
+    glVertexAttribDivisor(0, kLargeDivisor);
+
+    GLuint divisor = 0;
+    glGetVertexAttribIuiv(0, GL_VERTEX_ATTRIB_ARRAY_DIVISOR, &divisor);
+    EXPECT_EQ(kLargeDivisor, divisor)
+        << "Vertex attrib divisor read was not the same that was passed in.";
+}
+
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these
 // tests should be run against. We test on D3D9 and D3D11 9_3 because they use special codepaths
 // when attribute zero is instanced, unlike D3D11.