Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't panic if WebGL thread can't be reached during finalization.

Browse source
This commit is contained in:
Josh Matthews 2019-07-29 10:05:48 -04:00
parent eb4f2d150a
commit 8f5c37c0b5
8 changed files with 78 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/script/dom/webglprogram.rs
View file

@ -77,14 +77,18 @@ impl WebGLProgram {
}
/// glDeleteProgram
pub fn mark_for_deletion(&self) {
pub fn mark_for_deletion(&self, fallible: bool) {
if self.marked_for_deletion.get() {
return;
}
self.marked_for_deletion.set(true);
self.upcast::<WebGLObject>()
.context()
.send_command(WebGLCommand::DeleteProgram(self.id));
let cmd = WebGLCommand::DeleteProgram(self.id);
let context = self.upcast::<WebGLObject>().context();
if fallible {
context.send_command_ignored(cmd);
} else {
context.send_command(cmd);
}
if self.is_deleted() {
self.detach_shaders();
}
@ -443,7 +447,7 @@ impl WebGLProgram {
impl Drop for WebGLProgram {
fn drop(&mut self) {
self.in_use(false);
self.mark_for_deletion();
self.mark_for_deletion(true);
}
}