From c20ead32ad6d97a87ea64f7350f778959be91075 Mon Sep 17 00:00:00 2001 From: Takuto Ikuta Date: Wed, 17 Oct 2018 16:27:32 +0900 Subject: [PATCH] Remove unused lambda capture This is a preparation CL to remove -Wno-unused-lambda-capture warning suppression. Bug: chromium:681136 Change-Id: Ib5c1c4eeeed3b7406ede2dea33066c54e5fc3da0 Reviewed-on: https://chromium-review.googlesource.com/c/1286172 Commit-Queue: Jamie Madill Reviewed-by: Jamie Madill --- src/tests/gl_tests/RobustResourceInitTest.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tests/gl_tests/RobustResourceInitTest.cpp b/src/tests/gl_tests/RobustResourceInitTest.cpp index 3da2030a7..56b648012 100644 --- a/src/tests/gl_tests/RobustResourceInitTest.cpp +++ b/src/tests/gl_tests/RobustResourceInitTest.cpp @@ -1422,9 +1422,9 @@ TEST_P(RobustResourceInitTest, CopyTexSubImage2D) ANGLE_SKIP_TEST_IF(!hasGLExtension()); ANGLE_SKIP_TEST_IF(IsD3D11_FL93()); - constexpr int kDestSize = 4; + static constexpr int kDestSize = 4; constexpr int kSrcSize = kDestSize / 2; - constexpr int kOffset = kSrcSize / 2; + static constexpr int kOffset = kSrcSize / 2; std::vector redColors(kDestSize * kDestSize, GLColor::red); @@ -1454,7 +1454,7 @@ TEST_P(RobustResourceInitTest, CopyTexSubImage2D) glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, destTexture, 0); ASSERT_GL_NO_ERROR(); - auto srcInitTest = [kOffset, kDestSize](int x, int y) { + auto srcInitTest = [](int x, int y) { return (x >= kOffset) && x < (kDestSize - kOffset) && (y >= kOffset) && y < (kDestSize - kOffset); }; @@ -1489,9 +1489,9 @@ TEST_P(RobustResourceInitTestES3, CopyTexSubImage3D) { ANGLE_SKIP_TEST_IF(!hasGLExtension()); - constexpr int kDestSize = 4; + static constexpr int kDestSize = 4; constexpr int kSrcSize = kDestSize / 2; - constexpr int kOffset = kSrcSize / 2; + static constexpr int kOffset = kSrcSize / 2; std::vector redColors(kDestSize * kDestSize * kDestSize, GLColor::red); @@ -1522,7 +1522,7 @@ TEST_P(RobustResourceInitTestES3, CopyTexSubImage3D) glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, destTexture, 0, 0); ASSERT_GL_NO_ERROR(); - auto srcInitTest = [kOffset, kDestSize](int x, int y) { + auto srcInitTest = [](int x, int y) { return (x >= kOffset) && x < (kDestSize - kOffset) && (y >= kOffset) && y < (kDestSize - kOffset); };