Don't write to the <length> parameter if an error is generated.

extensions/ANGLE_robust_client_memory.txt

@@ -20,7 +20,7 @@ Status
 
 Version
 
-    Version 1, September 26, 2016
+    Version 3, October 7, 2016
 
 Number
 
@@ -125,7 +125,7 @@ Additions to the OpenGL ES Specification:
     to the provided buffer.  INVALID_OPERATION is generated if <bufSize> is not
     large enough.  The optional <length> specifies an address of a variable to
     recieve the number of values written to the buffer.  When an error is
-    generated 0 will be written to <length>.
+    generated nothing will be written to <length>.
 
     Calls to "xRobustANGLE" will generate errors under the same conditions as
     "x". Any instances of undefined behaviour in "x" will also be undefined in
@@ -154,6 +154,10 @@ Issues
        specify data by void* such as TexImage2DRobustANGLE treat the client
        data as bytes.
 
+    4) Should <length> be written to if an error is generated?
+
+       RESOLVED: No, using the prescedent set by glGetSynciv.
+
 Revision History
 
     Rev.    Date         Author     Changes
@@ -161,3 +165,4 @@ Revision History
       1   Sept 26, 2016  geofflang  Initial version
       2   Sept 28, 2016  geofflang  Changed name from ANGLE_robust_queries to
                                     ANGLE_robust_client_memory, added issue 3.
+      3   Oct 7, 2016    geofflang  Added and resolved issue 4.

src/libGLESv2/entry_points_gles_2_0_ext.cpp

@@ -1998,8 +1998,6 @@ ANGLE_EXPORT void GL_APIENTRY GetBooleanvRobustANGLE(GLenum pname,
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        SetRobustLengthParam(length, 0);
-
         GLenum nativeType;
         unsigned int numParams = 0;
         if (!ValidateRobustStateQuery(context, pname, bufSize, &nativeType, &numParams))
@@ -2032,8 +2030,6 @@ ANGLE_EXPORT void GL_APIENTRY GetBufferParameterivRobustANGLE(GLenum target,
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        SetRobustLengthParam(length, 0);
-
         GLsizei numParams = 0;
         if (!ValidateGetBufferParameteriv(context, target, pname, &numParams))
         {
@@ -2060,8 +2056,6 @@ ANGLE_EXPORT void GL_APIENTRY GetFloatvRobustANGLE(GLenum pname,
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        SetRobustLengthParam(length, 0);
-
         GLenum nativeType;
         unsigned int numParams = 0;
         if (!ValidateRobustStateQuery(context, pname, bufSize, &nativeType, &numParams))
@@ -2097,8 +2091,6 @@ ANGLE_EXPORT void GL_APIENTRY GetFramebufferAttachmentParameterivRobustANGLE(GLe
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        SetRobustLengthParam(length, 0);
-
         GLsizei numParams = 0;
         if (!ValidateGetFramebufferAttachmentParameterivRobustANGLE(context, target, attachment,
                                                                     pname, bufSize, &numParams))
@@ -2125,8 +2117,6 @@ ANGLE_EXPORT void GL_APIENTRY GetIntegervRobustANGLE(GLenum pname,
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        SetRobustLengthParam(length, 0);
-
         GLenum nativeType;
         unsigned int numParams = 0;
         if (!ValidateRobustStateQuery(context, pname, bufSize, &nativeType, &numParams))
@@ -2160,8 +2150,6 @@ ANGLE_EXPORT void GL_APIENTRY GetProgramivRobustANGLE(GLuint program,
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        SetRobustLengthParam(length, 0);
-
         GLsizei numParams = 0;
         if (!ValidateGetProgramivRobustANGLE(context, program, pname, bufSize, &numParams))
         {

src/tests/gl_tests/RobustClientMemoryTest.cpp

@@ -272,7 +272,6 @@ TEST_P(RobustClientMemoryTest, GetInteger)
         glGetIntegervRobustANGLE(GL_COMPRESSED_TEXTURE_FORMATS, numCompressedFormats - 1, &length,
                                  resultBuf.data());
         EXPECT_GL_ERROR(GL_INVALID_OPERATION);
-        EXPECT_EQ(0, length);
         EXPECT_TRUE(std::all_of(resultBuf.begin(), resultBuf.end(),
                                 [](GLint value) { return value == 0; }));