wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-27 01:27:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

[angle] Cherry-pick compressed tex depth stride fix.

Browse source
This commit is contained in:
Moonchild 2021-02-05 18:40:41 +00:00 • committed by roytam1
commit 8fe6e9636d
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gfx/angle/src/libANGLE/formatutils.cpp
View file

@ -863,13 +863,22 @@ gl::ErrorOrResult<GLuint> InternalFormat::computeDepthPitch(GLenum formatType,
GLint rowLength, GLint rowLength,
GLint imageHeight) const GLint imageHeight) const
{ {
GLuint rows = CheckedNumeric<GLuint> pixelsHeight(imageHeight > 0 ? static_cast<GLuint>(imageHeight)
(imageHeight > 0 ? static_cast<GLuint>(imageHeight) : static_cast<GLuint>(height)); : static_cast<GLuint>(height));
CheckedNumeric<GLuint> rowCount;
if (compressed) {
CheckedNumeric<GLuint> checkedBlockHeight(compressedBlockHeight);
rowCount = (pixelsHeight + checkedBlockHeight - 1u) / checkedBlockHeight;
} else {
rowCount = pixelsHeight;
}
GLuint rowPitch = 0; GLuint rowPitch = 0;
ANGLE_TRY_RESULT(computeRowPitch(formatType, width, alignment, rowLength), rowPitch); ANGLE_TRY_RESULT(computeRowPitch(formatType, width, alignment, rowLength), rowPitch);
CheckedNumeric<GLuint> checkedRowPitch(rowPitch); CheckedNumeric<GLuint> checkedRowPitch(rowPitch);
auto depthPitch = checkedRowPitch * rows; auto depthPitch = checkedRowPitch * rowCount;
ANGLE_TRY_CHECKED_MATH(depthPitch); ANGLE_TRY_CHECKED_MATH(depthPitch);
return depthPitch.ValueOrDie(); return depthPitch.ValueOrDie();
} }