Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid a panic when closing webgl pages using VAOs #25998

Merged
merged 1 commit into from Mar 27, 2020
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

webgl: Ignore webgl communication errors when dropping vertex array o…

…bjects.
  • Loading branch information
jdm committed Mar 20, 2020
commit 3a3397fbce728c79aa5edf469a1a7763c3efcbde
@@ -59,11 +59,11 @@ impl VertexArrayObject {

for attrib_data in &**self.vertex_attribs.borrow() {
if let Some(buffer) = attrib_data.buffer() {
buffer.decrement_attached_counter();
buffer.decrement_attached_counter(fallible);
}
}
if let Some(buffer) = self.element_array_buffer.get() {
buffer.decrement_attached_counter();
buffer.decrement_attached_counter(fallible);
}
}

@@ -136,7 +136,7 @@ impl VertexArrayObject {
offset as u32,
));
if let Some(old) = data.buffer() {
old.decrement_attached_counter();
old.decrement_attached_counter(false);
}

*data = VertexAttribData {
@@ -168,7 +168,7 @@ impl VertexArrayObject {
if b.id() != buffer.id() {
continue;
}
b.decrement_attached_counter();
b.decrement_attached_counter(false);
}
attrib.buffer = None;
}
@@ -177,7 +177,7 @@ impl VertexArrayObject {
.get()
.map_or(false, |b| buffer == &*b)
{
buffer.decrement_attached_counter();
buffer.decrement_attached_counter(false);
self.element_array_buffer.set(None);
}
}
@@ -222,7 +222,7 @@ impl WebGL2RenderingContext {

fn unbind_from(&self, slot: &MutNullableDom<WebGLBuffer>, buffer: &WebGLBuffer) {
if slot.get().map_or(false, |b| buffer == &*b) {
buffer.decrement_attached_counter();
buffer.decrement_attached_counter(false);
slot.set(None);
}
}
@@ -3405,7 +3405,7 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {

for slot in &[&generic_slot, &indexed_binding.buffer] {
if let Some(old) = slot.get() {
old.decrement_attached_counter();
old.decrement_attached_counter(false);
}
slot.set(buffer);
}
@@ -3483,7 +3483,7 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {

for slot in &[&generic_slot, &indexed_binding.buffer] {
if let Some(old) = slot.get() {
old.decrement_attached_counter();
old.decrement_attached_counter(false);
}
slot.set(buffer);
}
@@ -166,15 +166,15 @@ impl WebGLBuffer {
);
}

pub fn decrement_attached_counter(&self) {
pub fn decrement_attached_counter(&self, fallible: bool) {

This comment has been minimized.

@nox

nox Mar 27, 2020

Member

Not a fan of the boolean argument.

This comment has been minimized.

@jdm

jdm Mar 27, 2020

Author Member

Filed #26047.

self.attached_counter.set(
self.attached_counter
.get()
.checked_sub(1)
.expect("refcount underflowed"),
);
if self.is_deleted() {
self.delete(false);
self.delete(fallible);
}
}

@@ -1317,7 +1317,7 @@ impl WebGLRenderingContext {

self.send_command(WebGLCommand::BindBuffer(target, buffer.map(|b| b.id())));
if let Some(old) = slot.get() {
old.decrement_attached_counter();
old.decrement_attached_counter(false);
}

slot.set(buffer);
@@ -2565,7 +2565,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
.map_or(false, |b| buffer == &*b)
{
self.bound_buffer_array.set(None);
buffer.decrement_attached_counter();
buffer.decrement_attached_counter(false);
}
buffer.mark_for_deletion(false);
}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.