wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1136428 - Ensure we never create more than the amount supported of color attachments in WebGLFrameBuffer or try to get an attachment point higher than the supported number. r=jgilbert

Browse Source
This commit is contained in:
Kyle 2015-08-05 16:45:44 -04:00
parent 825ec93fa4
commit c10b6815a5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/canvas/WebGLFramebuffer.cpp
View File

@ -509,7 +509,7 @@ WebGLFramebuffer::GetAttachPoint(FBAttachment attachPoint)
if (attachPoint >= LOCAL_GL_COLOR_ATTACHMENT1) {
size_t colorAttachmentId = attachPoint.get() - LOCAL_GL_COLOR_ATTACHMENT0;
if (colorAttachmentId < WebGLContext::kMaxColorAttachments) {
if (colorAttachmentId < (size_t)mContext->mGLMaxColorAttachments) {
EnsureColorAttachPoints(colorAttachmentId);
return mMoreColorAttachments[colorAttachmentId - 1];
}
@ -832,17 +832,19 @@ WebGLFramebuffer::CheckAndInitializeAttachments()
void WebGLFramebuffer::EnsureColorAttachPoints(size_t colorAttachmentId)
{
MOZ_ASSERT(colorAttachmentId < WebGLContext::kMaxColorAttachments);
size_t maxColorAttachments = mContext->mGLMaxColorAttachments;
MOZ_ASSERT(colorAttachmentId < maxColorAttachments);
if (colorAttachmentId < ColorAttachmentCount())
return;
while (ColorAttachmentCount() < WebGLContext::kMaxColorAttachments) {
while (ColorAttachmentCount() < maxColorAttachments) {
GLenum nextAttachPoint = LOCAL_GL_COLOR_ATTACHMENT0 + ColorAttachmentCount();
mMoreColorAttachments.AppendElement(WebGLFBAttachPoint(this, nextAttachPoint));
}
MOZ_ASSERT(ColorAttachmentCount() == WebGLContext::kMaxColorAttachments);
MOZ_ASSERT(ColorAttachmentCount() == maxColorAttachments);
}
static void