Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1530576 - WR track vao bindings better r=gw

Browse Source 
this change makes sure that bindings are always synced.

Differential Revision: https://phabricator.services.mozilla.com/D21159

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Dzmitry Malyshau 2019-02-26 06:30:44 +00:00
parent 66bda67c38
commit 4d33ea2da4
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/wr/webrender/src/device/gl.rs
View File

@ -2345,18 +2345,14 @@ impl Device {
ibo_id: IBOId,
owns_vertices_and_indices: bool,
) -> VAO {
debug_assert!(self.inside_frame);
let instance_stride = descriptor.instance_stride() as usize;
let vao_id = self.gl.gen_vertex_arrays(1)[0];
self.gl.bind_vertex_array(vao_id);
self.bind_vao_impl(vao_id);
descriptor.bind(self.gl(), main_vbo_id, instance_vbo_id);
ibo_id.bind(self.gl()); // force it to be a part of VAO
self.gl.bind_vertex_array(0);
VAO {
id: vao_id,
ibo_id,
@ -2374,7 +2370,7 @@ impl Device {
debug_assert!(self.inside_frame);
let vao_id = self.gl.gen_vertex_arrays(1)[0];
self.gl.bind_vertex_array(vao_id);
self.bind_vao_impl(vao_id);
let mut attrib_index = 0;
for stream in streams {
@ -2388,8 +2384,6 @@ impl Device {
attrib_index += stream.attributes.len();
}
self.gl.bind_vertex_array(0);
CustomVAO {
id: vao_id,
}