Return the correct count from getAttachedShaders

The count should be the total amount of shader ids written. Before this patch the code used to write the amount of attached shaders to count regardless of the value of maxCount. BUG=angleproject:1101 TEST=dEQP-GLES3.functional.state_query.shader.* Change-Id: I5ae729748c7809f03fd496c927a76f60398d2b42 Reviewed-on: https://chromium-review.googlesource.com/329865Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Return the correct count from getAttachedShaders
586bc55c · Olli Etuaho · e18eb970 · 586bc55c · 586bc55c
Commit 586bc55c authored Mar 04, 2016 by Olli Etuaho
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

Program.cpp src/libANGLE/Program.cpp +2 -4

deqp_gles3_test_expectations.txt src/tests/deqp_support/deqp_gles3_test_expectations.txt +0 -1

No files found.
--- a/src/libANGLE/Program.cpp
+++ b/src/libANGLE/Program.cpp
@@ -859,9 +859,8 @@ void Program::getAttachedShaders(GLsizei maxCount, GLsizei *count, GLuint *shade
        if (total < maxCount)
        {
            shaders[total] = mData.mAttachedVertexShader->getHandle();
+            total++;
        }
-
-        total++;
    }

    if (mData.mAttachedFragmentShader)
@@ -869,9 +868,8 @@ void Program::getAttachedShaders(GLsizei maxCount, GLsizei *count, GLuint *shade
        if (total < maxCount)
        {
            shaders[total] = mData.mAttachedFragmentShader->getHandle();
+            total++;
        }
-
-        total++;
    }

    if (count)

--- a/src/tests/deqp_support/deqp_gles3_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles3_test_expectations.txt
@@ -78,7 +78,6 @@
 1093 WIN LINUX : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_fragment.vec4 = FAIL
 1094 WIN LINUX : dEQP-GLES3.functional.shaders.builtin_variable.vertex_id = FAIL
 1101 WIN LINUX : dEQP-GLES3.functional.state_query.fbo.framebuffer_attachment_x_size_rbo = FAIL
-1101 WIN LINUX : dEQP-GLES3.functional.state_query.shader.program_attached_shaders = FAIL
 1101 WIN LINUX : dEQP-GLES3.functional.state_query.integers.sampler_binding_getboolean = FAIL
 1101 WIN LINUX : dEQP-GLES3.functional.state_query.integers.sampler_binding_getinteger = FAIL
 1101 WIN LINUX : dEQP-GLES3.functional.state_query.integers.sampler_binding_getinteger64 = FAIL