commit 35cd7332ab62072a0a3d81c7e259a64ad5a61ba8
author Jamie Madill <jmadill@chromium.org> Sun Dec 02 12:03:33 2018 -0500
committer Commit Bot <commit-bot@chromium.org> Mon Dec 03 13:20:23 2018 +0000
tree 184333635823c29429d6a5d82ae926759eba03e8
parent 4abdf74f0afc039d9454e3c81ddb7670ebd94a99

Refactor test shader style.

This change enforces a lot more consistency. We pass const char * to
the Compile functions instead of std::string. Also fixes the
indentation of C++11 block comments to be more consistent.

Bug: angleproject:2995
Change-Id: Id6e5ea94055d8cbd420df4ea2e81b2d96cb5ce78
Reviewed-on: https://chromium-review.googlesource.com/c/1357103
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/tests/gl_tests/FramebufferMultiviewTest.cpp

diff --git a/src/tests/gl_tests/FramebufferMultiviewTest.cpp b/src/tests/gl_tests/FramebufferMultiviewTest.cpp
index 6acc350..6108ad1 100644
--- a/src/tests/gl_tests/FramebufferMultiviewTest.cpp
+++ b/src/tests/gl_tests/FramebufferMultiviewTest.cpp
@@ -977,13 +977,13 @@
     ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
 
     // Create program to draw a quad.
-    const std::string &vs =
+    constexpr char kVS[] =
         "#version 300 es\n"
         "in vec3 vPos;\n"
         "void main(){\n"
         "   gl_Position = vec4(vPos, 1.);\n"
         "}\n";
-    const std::string &fs =
+    constexpr char kFS[] =
         "#version 300 es\n"
         "precision mediump float;\n"
         "uniform vec3 uCol;\n"
@@ -991,7 +991,7 @@
         "void main(){\n"
         "   col = vec4(uCol,1.);\n"
         "}\n";
-    ANGLE_GL_PROGRAM(program, vs, fs);
+    ANGLE_GL_PROGRAM(program, kVS, kFS);
     glUseProgram(program);
     GLuint mColorUniformLoc = glGetUniformLocation(program, "uCol");
 
@@ -1030,13 +1030,13 @@
     ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
 
     // Create program to draw a quad.
-    const std::string &vs =
+    constexpr char kVS[] =
         "#version 300 es\n"
         "in vec3 vPos;\n"
         "void main(){\n"
         "   gl_Position = vec4(vPos, 1.);\n"
         "}\n";
-    const std::string &fs =
+    constexpr char kFS[] =
         "#version 300 es\n"
         "precision mediump float;\n"
         "uniform vec3 uCol;\n"
@@ -1044,7 +1044,7 @@
         "void main(){\n"
         "   col = vec4(uCol,1.);\n"
         "}\n";
-    ANGLE_GL_PROGRAM(program, vs, fs);
+    ANGLE_GL_PROGRAM(program, kVS, kFS);
     glUseProgram(program);
     GLuint mColorUniformLoc = glGetUniformLocation(program, "uCol");
 
@@ -1185,13 +1185,13 @@
     ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
 
     // Create program to draw a quad.
-    const std::string &vs =
+    constexpr char kVS[] =
         "#version 300 es\n"
         "in vec3 vPos;\n"
         "void main(){\n"
         "   gl_Position = vec4(vPos, 1.);\n"
         "}\n";
-    const std::string &fs =
+    constexpr char kFS[] =
         "#version 300 es\n"
         "precision mediump float;\n"
         "uniform vec3 uCol;\n"
@@ -1199,7 +1199,7 @@
         "void main(){\n"
         "   col = vec4(uCol,1.);\n"
         "}\n";
-    ANGLE_GL_PROGRAM(program, vs, fs);
+    ANGLE_GL_PROGRAM(program, kVS, kFS);
     glUseProgram(program);
     GLuint mColorUniformLoc = glGetUniformLocation(program, "uCol");
 
@@ -1313,13 +1313,13 @@
     ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
 
     // Create program to draw a quad.
-    const std::string &vs =
+    constexpr char kVS[] =
         "#version 300 es\n"
         "in vec3 vPos;\n"
         "void main(){\n"
         "   gl_Position = vec4(vPos, 1.);\n"
         "}\n";
-    const std::string &fs =
+    constexpr char kFS[] =
         "#version 300 es\n"
         "precision mediump float;\n"
         "uniform vec3 uCol;\n"
@@ -1327,7 +1327,7 @@
         "void main(){\n"
         "   col = vec4(uCol,1.);\n"
         "}\n";
-    ANGLE_GL_PROGRAM(program, vs, fs);
+    ANGLE_GL_PROGRAM(program, kVS, kFS);
     glUseProgram(program);
     GLuint mColorUniformLoc = glGetUniformLocation(program, "uCol");