Fix compilation error in RobustResourceInitTest.cpp

The patch fixes a compilation bug caused from having local variable names clash with the variables names from a parent scope. BUG=angleproject:1815 Change-Id: I3d23faaafdea9be503da99512b204d7a50a3b228 Reviewed-on: https://chromium-review.googlesource.com/571000Reviewed-by: Olli Etuaho <oetuaho@nvidia.com> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Fix compilation error in RobustResourceInitTest.cpp
cca63f2e · Martin Radev · Commit Bot · c43be720 · cca63f2e
Commit cca63f2e authored Jul 14, 2017 by Martin Radev Committed by Commit Bot Jul 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 15 deletions

RobustResourceInitTest.cpp src/tests/gl_tests/RobustResourceInitTest.cpp +15 -15

No files found.
--- a/src/tests/gl_tests/RobustResourceInitTest.cpp
+++ b/src/tests/gl_tests/RobustResourceInitTest.cpp
@@ -440,19 +440,19 @@ TEST_P(RobustResourceInitTest, CopyTexSubImage3DTextureWronglyInitialized)
        return;
    }
-    constexpr GLint kLayer     = 0;
+    constexpr GLint kTextureLayer     = 0;
-    constexpr GLint kWidth     = 2;
+    constexpr GLint kTextureWidth     = 2;
-    constexpr GLint kHeight    = 2;
+    constexpr GLint kTextureHeight    = 2;
-    constexpr GLint kDepth     = 2;
+    constexpr GLint kTextureDepth     = 2;
-    constexpr size_t kDataSize = kWidth * kHeight * 4;
+    constexpr size_t kTextureDataSize = kTextureWidth * kTextureHeight * 4;
    GLTexture texture2D;
    glBindTexture(GL_TEXTURE_2D, texture2D);
-    constexpr std::array<uint8_t, kDataSize> data = {{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    constexpr std::array<uint8_t, kTextureDataSize> data = {{0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
-                                                      0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,
+                                                             0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C,
-                                                      0x0F, 0x10}};
+                                                             0x0D, 0x0E, 0x0F, 0x10}};
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kWidth, kHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE,
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kTextureWidth, kTextureHeight, 0, GL_RGBA,
-                 data.data());
+                 GL_UNSIGNED_BYTE, data.data());
    GLFramebuffer fbo;
    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
@@ -461,12 +461,12 @@ TEST_P(RobustResourceInitTest, CopyTexSubImage3DTextureWronglyInitialized)
    GLTexture texture3D;
    glBindTexture(GL_TEXTURE_3D, texture3D);
-    glTexStorage3D(GL_TEXTURE_3D, 1, GL_RGBA8, kWidth, kHeight, kDepth);
+    glTexStorage3D(GL_TEXTURE_3D, 1, GL_RGBA8, kTextureWidth, kTextureHeight, kTextureDepth);
-    glCopyTexSubImage3D(GL_TEXTURE_3D, 0, 0, 0, kLayer, 0, 0, kWidth, kHeight);
+    glCopyTexSubImage3D(GL_TEXTURE_3D, 0, 0, 0, kTextureLayer, 0, 0, kTextureWidth, kTextureHeight);
-    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texture3D, 0, kLayer);
+    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texture3D, 0, kTextureLayer);
-    std::array<uint8_t, kDataSize> pixels;
+    std::array<uint8_t, kTextureDataSize> pixels;
-    glReadPixels(0, 0, kWidth, kHeight, GL_RGBA, GL_UNSIGNED_BYTE, pixels.data());
+    glReadPixels(0, 0, kTextureWidth, kTextureHeight, GL_RGBA, GL_UNSIGNED_BYTE, pixels.data());
    ASSERT_GL_NO_ERROR();
    EXPECT_EQ(data, pixels);
 }