diff options
| -rwxr-xr-x | gfx/angle/src/libANGLE/formatutils.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gfx/angle/src/libANGLE/formatutils.cpp b/gfx/angle/src/libANGLE/formatutils.cpp index 9a8c1b790..caeaf6c6e 100755 --- a/gfx/angle/src/libANGLE/formatutils.cpp +++ b/gfx/angle/src/libANGLE/formatutils.cpp @@ -863,13 +863,22 @@ gl::ErrorOrResult<GLuint> InternalFormat::computeDepthPitch(GLenum formatType, GLint rowLength, GLint imageHeight) const { - GLuint rows = - (imageHeight > 0 ? static_cast<GLuint>(imageHeight) : static_cast<GLuint>(height)); + CheckedNumeric<GLuint> pixelsHeight(imageHeight > 0 ? static_cast<GLuint>(imageHeight) + : static_cast<GLuint>(height)); + + CheckedNumeric<GLuint> rowCount; + if (compressed) { + CheckedNumeric<GLuint> checkedBlockHeight(compressedBlockHeight); + rowCount = (pixelsHeight + checkedBlockHeight - 1u) / checkedBlockHeight; + } else { + rowCount = pixelsHeight; + } + GLuint rowPitch = 0; ANGLE_TRY_RESULT(computeRowPitch(formatType, width, alignment, rowLength), rowPitch); CheckedNumeric<GLuint> checkedRowPitch(rowPitch); - auto depthPitch = checkedRowPitch * rows; + auto depthPitch = checkedRowPitch * rowCount; ANGLE_TRY_CHECKED_MATH(depthPitch); return depthPitch.ValueOrDie(); } |