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

Fix call to macro MOZ_ASSERT_UNREACHABLE

Browse source 
Fallout from 227b23606b0401245c9f0b15effd45b876b90260
This commit is contained in:
adeshkp 2019-07-23 00:30:15 +05:30 • committed by Roy Tam
commit 1459c396a3
1 changed files with 37 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

40
gfx/gl/GLUploadHelpers.cpp
View file

@ -161,7 +161,22 @@ TexSubImage2DWithoutUnpackSubimage(GLContext* gl,
// isn't supported. We make a copy of the texture data we're using, // isn't supported. We make a copy of the texture data we're using,
// such that we're using the whole row of data in the copy. This turns // such that we're using the whole row of data in the copy. This turns
// out to be more efficient than uploading row-by-row; see bug 698197. // out to be more efficient than uploading row-by-row; see bug 698197.
unsigned char* newPixels = new (fallible) unsigned char[width*height*pixelsize];
// Width and height are never more than 16384. At 16Ki*16Ki, 4Bpp is 1GiB, but
// if we allow 8Bpp (16-bit channels, or higher) here, that's 2GiB+, which would
// overflow on 32-bit.
MOZ_ASSERT(width <= 16384);
MOZ_ASSERT(height <= 16384);
MOZ_ASSERT(pixelsize < 8);
const auto size = CheckedInt<size_t>(width) * height * pixelsize;
if (!size.isValid()) {
// This should never happen, but we use a defensive check.
MOZ_ASSERT_UNREACHABLE("Unacceptable size calculated.!");
return;
}
unsigned char* newPixels = new (fallible) unsigned char[size.value()];
if (newPixels) { if (newPixels) {
unsigned char* rowDest = newPixels; unsigned char* rowDest = newPixels;
@ -286,7 +301,22 @@ TexImage2DHelper(GLContext* gl,
GLsizei paddedWidth = RoundUpPow2((uint32_t)width); GLsizei paddedWidth = RoundUpPow2((uint32_t)width);
GLsizei paddedHeight = RoundUpPow2((uint32_t)height); GLsizei paddedHeight = RoundUpPow2((uint32_t)height);
GLvoid* paddedPixels = new unsigned char[paddedWidth * paddedHeight * pixelsize]; // Width and height are never more than 16384. At 16Ki*16Ki, 4Bpp
// is 1GiB, but if we allow 8Bpp (or higher) here, that's 2GiB,
// which would overflow on 32-bit.
MOZ_ASSERT(width <= 16384);
MOZ_ASSERT(height <= 16384);
MOZ_ASSERT(pixelsize < 8);
const auto size =
CheckedInt<size_t>(paddedWidth) * paddedHeight * pixelsize;
if (!size.isValid()) {
// This should never happen, but we use a defensive check.
MOZ_ASSERT_UNREACHABLE("Unacceptable size calculated.!");
return;
}
GLvoid* paddedPixels = new unsigned char[size.value()];
// Pad out texture data to be in a POT sized buffer for uploading to // Pad out texture data to be in a POT sized buffer for uploading to
// a POT sized texture // a POT sized texture
@ -465,13 +495,17 @@ UploadImageDataToTexture(GLContext* gl,
surfaceFormat = SurfaceFormat::A8; surfaceFormat = SurfaceFormat::A8;
break; break;
default: default:
NS_ASSERTION(false, "Unhandled image surface format!"); MOZ_ASSERT_UNREACHABLE("Unhandled image surface format!");
} }
if (aOutUploadSize) { if (aOutUploadSize) {
*aOutUploadSize = 0; *aOutUploadSize = 0;
} }
if (surfaceFormat == gfx::SurfaceFormat::UNKNOWN) {
return gfx::SurfaceFormat::UNKNOWN;
}
if (aNeedInit || !CanUploadSubTextures(gl)) { if (aNeedInit || !CanUploadSubTextures(gl)) {
// If the texture needs initialized, or we are unable to // If the texture needs initialized, or we are unable to
// upload sub textures, then initialize and upload the entire // upload sub textures, then initialize and upload the entire