commit c847a75f95be1251b07bbd3f87aed86de6c0b9cd
author shrekshao <shrekshao@google.com> Fri Sep 20 14:08:32 2019 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Oct 03 18:45:43 2019 +0000
tree fea56bb0d13941cd0493a266a14aa31cf03ec8fa
parent 1850492e30ce26c8254a90e694c6e227f250f1f3

Fix redundant draw in DrawBaseVertexBaseInstanceTest

Discovered this redundant draw issue when writing javascript
webgl conformance test.

Together fix some broken formatting.

TBR=geofflang@chromium.org

Bug: 3402
Change-Id: I29dbcd04da7e47d9e0bc79074ff69202378c1214
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1816822
Reviewed-by: Shrek Shao <shrekshao@google.com>
Commit-Queue: Shrek Shao <shrekshao@google.com>

src/tests/gl_tests/DrawBaseVertexBaseInstanceTest.cpp

diff --git a/src/tests/gl_tests/DrawBaseVertexBaseInstanceTest.cpp b/src/tests/gl_tests/DrawBaseVertexBaseInstanceTest.cpp
index fb7f62f..f39de9f 100644
--- a/src/tests/gl_tests/DrawBaseVertexBaseInstanceTest.cpp
+++ b/src/tests/gl_tests/DrawBaseVertexBaseInstanceTest.cpp
@@ -309,18 +309,18 @@
 
         const uint32_t countPerDraw = kCountY * 6;
 
-            const GLsizei drawCount = kCountX;
-            const std::vector<GLsizei> counts(drawCount, countPerDraw);
-            const std::vector<GLsizei> firsts(drawCount, 0);
-            const std::vector<GLsizei> instanceCounts(drawCount, 2);
-            std::vector<GLuint> baseInstances(drawCount);
-            for (size_t i = 0; i < drawCount; i++)
-            {
-                baseInstances[i] = i * 2;
-            }
-            glMultiDrawArraysInstancedBaseInstanceANGLE(GL_TRIANGLES, drawCount, counts.data(),
-                                                        instanceCounts.data(), firsts.data(),
-                                                        baseInstances.data());
+        const GLsizei drawCount = kCountX / 2;
+        const std::vector<GLsizei> counts(drawCount, countPerDraw);
+        const std::vector<GLsizei> firsts(drawCount, 0);
+        const std::vector<GLsizei> instanceCounts(drawCount, 2);
+        std::vector<GLuint> baseInstances(drawCount);
+        for (size_t i = 0; i < drawCount; i++)
+        {
+            baseInstances[i] = i * 2;
+        }
+        glMultiDrawArraysInstancedBaseInstanceANGLE(GL_TRIANGLES, drawCount, counts.data(),
+                                                    instanceCounts.data(), firsts.data(),
+                                                    baseInstances.data());
     }
 
     void doDrawElementsInstancedBaseVertexBaseInstance()
@@ -331,12 +331,12 @@
 
         for (uint32_t v = 0; v < kCountY; v++)
         {
-                for (uint32_t i = 0; i < kCountX; i += 2)
-                {
-                    glDrawElementsInstancedBaseVertexBaseInstanceANGLE(
-                        GL_TRIANGLES, countPerDraw, GL_UNSIGNED_SHORT,
-                        reinterpret_cast<GLvoid *>(static_cast<uintptr_t>(0)), 2, v * 4, i);
-                }
+            for (uint32_t i = 0; i < kCountX; i += 2)
+            {
+                glDrawElementsInstancedBaseVertexBaseInstanceANGLE(
+                    GL_TRIANGLES, countPerDraw, GL_UNSIGNED_SHORT,
+                    reinterpret_cast<GLvoid *>(static_cast<uintptr_t>(0)), 2, v * 4, i);
+            }
         }
     }