Clean up MultiviewDrawTest.cpp

The patch cleans up MultiviewDrawTest.cpp by removing some calls to glUseProgram as that would be done by drawQuad anyway. BUG=angleproject:2062 TEST=angle_end2end_tests Change-Id: If9aff686b0ea25e63467852845c46582fdf741c5 Reviewed-on: https://chromium-review.googlesource.com/657678Reviewed-by: Olli Etuaho <oetuaho@nvidia.com> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Clean up MultiviewDrawTest.cpp
67a8a014 · Martin Radev · Commit Bot · 63490943 · 67a8a014 · 67a8a014
Commit 67a8a014 authored Sep 08, 2017 by Martin Radev Committed by Commit Bot Sep 18, 2017
Showing with 26 additions and 7 deletions

MultiviewDrawTest.cpp src/tests/gl_tests/MultiviewDrawTest.cpp +0 -0

ANGLETest.cpp src/tests/test_utils/ANGLETest.cpp +11 -0

ANGLETest.h src/tests/test_utils/ANGLETest.h +15 -7

No files found.
--- a/src/tests/gl_tests/MultiviewDrawTest.cpp
+++ b/src/tests/gl_tests/MultiviewDrawTest.cpp
--- a/src/tests/test_utils/ANGLETest.cpp
+++ b/src/tests/test_utils/ANGLETest.cpp
@@ -413,6 +413,17 @@ void ANGLETestBase::drawQuad(GLuint program,
             false, 0u);
 }
+void ANGLETestBase::drawQuadInstanced(GLuint program,
+                                      const std::string &positionAttribName,
+                                      GLfloat positionAttribZ,
+                                      GLfloat positionAttribXYScale,
+                                      bool useVertexBuffer,
+                                      GLuint numInstances)
+{
+    drawQuad(program, positionAttribName, positionAttribZ, positionAttribXYScale, useVertexBuffer,
+             true, numInstances);
+}
 void ANGLETestBase::drawQuad(GLuint program,
                             const std::string &positionAttribName,
                             GLfloat positionAttribZ,

--- a/src/tests/test_utils/ANGLETest.h
+++ b/src/tests/test_utils/ANGLETest.h
@@ -250,13 +250,13 @@ class ANGLETestBase
                  GLfloat positionAttribZ,
                  GLfloat positionAttribXYScale,
                  bool useVertexBuffer);
-    void drawQuad(GLuint program,
+    void drawQuadInstanced(GLuint program,
-                  const std::string &positionAttribName,
+                           const std::string &positionAttribName,
-                  GLfloat positionAttribZ,
+                           GLfloat positionAttribZ,
-                  GLfloat positionAttribXYScale,
+                           GLfloat positionAttribXYScale,
-                  bool useVertexBuffer,
+                           bool useVertexBuffer,
-                  bool useInstancedDrawCalls,
+                           GLuint numInstances);
-                  GLuint numInstances);
    static std::array<angle::Vector3, 6> GetQuadVertices();
    void drawIndexedQuad(GLuint program,
                         const std::string &positionAttribName,
@@ -345,6 +345,14 @@ class ANGLETestBase
    GLuint get2DTexturedQuadProgram();
+    void drawQuad(GLuint program,
+                  const std::string &positionAttribName,
+                  GLfloat positionAttribZ,
+                  GLfloat positionAttribXYScale,
+                  bool useVertexBuffer,
+                  bool useInstancedDrawCalls,
+                  GLuint numInstances);
    EGLWindow *mEGLWindow;
    int mWidth;
    int mHeight;