зеркало из https://github.com/mozilla/gecko-dev.git
Backout changeset 740e4ce7bb16 (bug 1220450) for landing with oddball whitespace.
This commit is contained in:
Родитель
f93b41b27c
Коммит
6c23983753
|
@ -177,9 +177,7 @@ WebGLContext::BufferData(GLenum target, WebGLsizeiptr size, GLenum usage)
|
||||||
}
|
}
|
||||||
|
|
||||||
boundBuffer->SetByteLength(size);
|
boundBuffer->SetByteLength(size);
|
||||||
|
|
||||||
if (!boundBuffer->ElementArrayCacheBufferData(nullptr, size)) {
|
if (!boundBuffer->ElementArrayCacheBufferData(nullptr, size)) {
|
||||||
boundBuffer->SetByteLength(0);
|
|
||||||
return ErrorOutOfMemory("bufferData: out of memory");
|
return ErrorOutOfMemory("bufferData: out of memory");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -229,12 +227,9 @@ WebGLContext::BufferDataT(GLenum target,
|
||||||
}
|
}
|
||||||
|
|
||||||
boundBuffer->SetByteLength(data.LengthAllowShared());
|
boundBuffer->SetByteLength(data.LengthAllowShared());
|
||||||
|
|
||||||
// Warning: Possibly shared memory. See bug 1225033.
|
// Warning: Possibly shared memory. See bug 1225033.
|
||||||
if (!boundBuffer->ElementArrayCacheBufferData(data.DataAllowShared(), data.LengthAllowShared())) {
|
if (!boundBuffer->ElementArrayCacheBufferData(data.DataAllowShared(), data.LengthAllowShared()))
|
||||||
boundBuffer->SetByteLength(0);
|
|
||||||
return ErrorOutOfMemory("bufferData: out of memory");
|
return ErrorOutOfMemory("bufferData: out of memory");
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Загрузка…
Ссылка в новой задаче