Fix UpdateAttribBindingByVertexAttribDivisor test.

Test should clear before drawing. With the clears added it became apparent the second draw wasn't working because an attrib was left in instanced mode after the first draw. BUG=angleproject:2672 Change-Id: I6c3ee7302d24babb80a9b9affcf357145bb03dcb Reviewed-on: https://chromium-review.googlesource.com/c/1306822Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Frank Henigman <fjhenigman@chromium.org>

Fix UpdateAttribBindingByVertexAttribDivisor test.
af9dd608 · Frank Henigman · Commit Bot · 7cba6be8 · af9dd608
Commit af9dd608 authored Oct 29, 2018 by Frank Henigman Committed by Commit Bot Oct 30, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

InstancingTest.cpp src/tests/gl_tests/InstancingTest.cpp +5 -0

No files found.
--- a/src/tests/gl_tests/InstancingTest.cpp
+++ b/src/tests/gl_tests/InstancingTest.cpp
@@ -499,10 +499,14 @@ TEST_P(InstancingTestES31, UpdateAttribBindingByVertexAttribDivisor)
    glVertexBindingDivisor(instanceBinding, 1);

    // Do the first instanced draw
+    glClear(GL_COLOR_BUFFER_BIT);
    glDrawElementsInstanced(GL_TRIANGLES, static_cast<GLsizei>(mIndices.size()), GL_UNSIGNED_SHORT,
                            mIndices.data(), static_cast<GLsizei>(mInstances.size()) / 3);
    checkQuads();

+    // Disable instancing.
+    glVertexBindingDivisor(instanceBinding, 0);
+
    // Load the vertex position into the binding indexed positionLoc.
    // Load the instance position into the binding indexed instancePosLoc.
    glBindVertexBuffer(positionLoc, quadBuffer, 0, kFloatStride * 3);
@@ -516,6 +520,7 @@ TEST_P(InstancingTestES31, UpdateAttribBindingByVertexAttribDivisor)
    glVertexAttribDivisor(instancePosLoc, 1);

    // Do the second instanced draw
+    glClear(GL_COLOR_BUFFER_BIT);
    glDrawElementsInstanced(GL_TRIANGLES, static_cast<GLsizei>(mIndices.size()), GL_UNSIGNED_SHORT,
                            mIndices.data(), static_cast<GLsizei>(mInstances.size()) / 3);
    checkQuads();