commit 1db8a26b563f326f394dc99a76cc6a16dc388925
author Jamie Madill <jmadill@chromium.org> Thu Sep 22 13:53:47 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Sep 22 21:11:14 2016 +0000
tree 1fa9d2e75ab3605c50cd47b1a1edb9f271661175
parent 2bd9c4430e68c7a67c52f1e2ab9f93ac6b12249d

Fix warning in standalone in new validation.

BUG=angleproject:1512

Change-Id: Ifdb8d4c38e3c90e03eee42ba9fd6390dffd61363
Reviewed-on: https://chromium-review.googlesource.com/388611
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/formatutils.cpp

diff --git a/src/libANGLE/formatutils.cpp b/src/libANGLE/formatutils.cpp
index 067b224..780f2f7 100644
--- a/src/libANGLE/formatutils.cpp
+++ b/src/libANGLE/formatutils.cpp
@@ -960,11 +960,11 @@
 
     CheckedNumeric<GLuint> depthMinusOne  = size.depth - 1;
     CheckedNumeric<GLuint> heightMinusOne = size.height - 1;
-    CheckedNumeric<GLuint> pixelBytes     = computePixelBytes(formatType);
+    CheckedNumeric<GLuint> bytes          = computePixelBytes(formatType);
 
     CheckedNumeric<GLuint> totalSize = depthMinusOne * depthPitch;
     totalSize += heightMinusOne * rowPitch;
-    totalSize += size.width * pixelBytes;
+    totalSize += size.width * bytes;
 
     ANGLE_TRY_CHECKED_MATH(totalSize);