Commit 1db8a26b by Jamie Madill Committed by Commit Bot

Fix warning in standalone in new validation.

BUG=angleproject:1512 Change-Id: Ifdb8d4c38e3c90e03eee42ba9fd6390dffd61363 Reviewed-on: https://chromium-review.googlesource.com/388611Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 2bd9c443
...@@ -55,6 +55,7 @@ config("extra_warnings") { ...@@ -55,6 +55,7 @@ config("extra_warnings") {
cflags = [ cflags = [
"/we4244", # Conversion: possible loss of data. "/we4244", # Conversion: possible loss of data.
"/we4456", # Variable shadowing. "/we4456", # Variable shadowing.
"/we4458", # declaration hides class member.
] ]
} }
} }
......
...@@ -960,11 +960,11 @@ gl::ErrorOrResult<GLuint> InternalFormat::computeUnpackSize( ...@@ -960,11 +960,11 @@ gl::ErrorOrResult<GLuint> InternalFormat::computeUnpackSize(
CheckedNumeric<GLuint> depthMinusOne = size.depth - 1; CheckedNumeric<GLuint> depthMinusOne = size.depth - 1;
CheckedNumeric<GLuint> heightMinusOne = size.height - 1; CheckedNumeric<GLuint> heightMinusOne = size.height - 1;
CheckedNumeric<GLuint> pixelBytes = computePixelBytes(formatType); CheckedNumeric<GLuint> bytes = computePixelBytes(formatType);
CheckedNumeric<GLuint> totalSize = depthMinusOne * depthPitch; CheckedNumeric<GLuint> totalSize = depthMinusOne * depthPitch;
totalSize += heightMinusOne * rowPitch; totalSize += heightMinusOne * rowPitch;
totalSize += size.width * pixelBytes; totalSize += size.width * bytes;
ANGLE_TRY_CHECKED_MATH(totalSize); ANGLE_TRY_CHECKED_MATH(totalSize);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment