Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1445980 - TexStorage should validate both highest and lowest levels. - r=kvark

Browse Source 
MozReview-Commit-ID: 3MtNEAtuadY
This commit is contained in:
Jeff Gilbert 2018-03-26 18:39:46 -07:00
parent dc54f72213
commit e4e4683663
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dom/canvas/WebGLTextureUpload.cpp
View File

@ -1107,16 +1107,17 @@ WebGLTexture::TexStorage(const char* funcName, TexTarget target, GLsizei levels,
const TexImageTarget testTarget = IsCubeMap() ? LOCAL_GL_TEXTURE_CUBE_MAP_POSITIVE_X
: target.get();
const GLint testLevel = 0;
WebGLTexture::ImageInfo* testImageInfo;
if (!ValidateTexImageSpecification(funcName, testTarget, testLevel, width, height,
depth, &testImageInfo))
WebGLTexture::ImageInfo* baseImageInfo;
WebGLTexture::ImageInfo* lastImageInfo;
if (!ValidateTexImageSpecification(funcName, testTarget, 0, width, height, depth,
&baseImageInfo) ||
!ValidateTexImageSpecification(funcName, testTarget, levels-1, 1, 1, 1,
&lastImageInfo))
{
return;
}
MOZ_ASSERT(testImageInfo);
mozilla::Unused << testImageInfo;
MOZ_ALWAYS_TRUE(baseImageInfo);
MOZ_ALWAYS_TRUE(lastImageInfo);
auto dstUsage = mContext->mFormatUsage->GetSizedTexUsage(sizedFormat);
if (!dstUsage) {
@ -1130,9 +1131,8 @@ WebGLTexture::TexStorage(const char* funcName, TexTarget target, GLsizei levels,
return;
if (dstFormat->compression) {
if (!ValidateCompressedTexImageRestrictions(funcName, mContext, testTarget,
testLevel, dstFormat, width, height,
depth))
if (!ValidateCompressedTexImageRestrictions(funcName, mContext, testTarget, 0,
dstFormat, width, height, depth))
{
return;
}