diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-07-24 11:02:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 11:02:57 -0400 |
| commit | 65df9cb73a26db2c61100ee8f1ecd13c6a80e225 (patch) | |
| tree | 0523689a4ca73a60e0313e1b40d6bc13e074ff04 /components/script/dom/webgl_extensions | |
| parent | ba6123583d328d82529fc06cdf5b41ba0d031170 (diff) | |
| parent | 3179ed59c5a2c3501d12226fa9141c33e7107bc4 (diff) | |
| download | servo-65df9cb73a26db2c61100ee8f1ecd13c6a80e225.tar.gz servo-65df9cb73a26db2c61100ee8f1ecd13c6a80e225.zip | |
Auto merge of #21240 - servo:webgl, r=jdm
Properly check for GL object ownership (fixes #21133)
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21240)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/webgl_extensions')
| -rw-r--r-- | components/script/dom/webgl_extensions/ext/oesvertexarrayobject.rs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/components/script/dom/webgl_extensions/ext/oesvertexarrayobject.rs b/components/script/dom/webgl_extensions/ext/oesvertexarrayobject.rs index 9ec3065af49..6ae83c401ba 100644 --- a/components/script/dom/webgl_extensions/ext/oesvertexarrayobject.rs +++ b/components/script/dom/webgl_extensions/ext/oesvertexarrayobject.rs @@ -48,15 +48,7 @@ impl OESVertexArrayObjectMethods for OESVertexArrayObject { fn CreateVertexArrayOES(&self) -> Option<DomRoot<WebGLVertexArrayObjectOES>> { let (sender, receiver) = webgl_channel().unwrap(); self.ctx.send_command(WebGLCommand::CreateVertexArray(sender)); - - let result = receiver.recv().unwrap(); - result.map(|vao_id| { - WebGLVertexArrayObjectOES::new( - &self.global(), - vao_id, - self.ctx.limits().max_vertex_attribs, - ) - }) + receiver.recv().unwrap().map(|id| WebGLVertexArrayObjectOES::new(&self.ctx, id)) } // https://www.khronos.org/registry/webgl/extensions/OES_vertex_array_object/ |