aboutsummaryrefslogtreecommitdiffstats
path: root/components/canvas/gl_context.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-09-16 13:15:40 -0400
committerGitHub <noreply@github.com>2019-09-16 13:15:40 -0400
commit636e82108d02624d8089ddca1c4f5736ed9ef226 (patch)
treeb9dab5f1d6cd304ac10d0e1b2996eb99f7126fa2 /components/canvas/gl_context.rs
parent06a07909c1dec52c9986db62a7a048efc0b42a05 (diff)
parent0d88c13186ff7e13cd3151bf92d921b3cd293aaa (diff)
downloadservo-636e82108d02624d8089ddca1c4f5736ed9ef226.tar.gz
servo-636e82108d02624d8089ddca1c4f5736ed9ef226.zip
Auto merge of #24111 - jdm:mac-vao-fix, r=nox
webgl: Support vertex array objects on macOS. - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #23960 and fix #12644 <!-- 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/24111) <!-- Reviewable:end -->
Diffstat (limited to 'components/canvas/gl_context.rs')
-rw-r--r--components/canvas/gl_context.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/components/canvas/gl_context.rs b/components/canvas/gl_context.rs
index b8168753fa4..66fd3001277 100644
--- a/components/canvas/gl_context.rs
+++ b/components/canvas/gl_context.rs
@@ -158,15 +158,16 @@ impl GLContextWrapper {
pub fn apply_command(
&self,
cmd: WebGLCommand,
+ use_apple_vertex_array: bool,
backtrace: WebGLCommandBacktrace,
state: &mut GLState,
) {
match *self {
GLContextWrapper::Native(ref ctx) => {
- WebGLImpl::apply(ctx, state, cmd, backtrace);
+ WebGLImpl::apply(ctx, state, use_apple_vertex_array, cmd, backtrace);
},
GLContextWrapper::OSMesa(ref ctx) => {
- WebGLImpl::apply(ctx, state, cmd, backtrace);
+ WebGLImpl::apply(ctx, state, false, cmd, backtrace);
},
}
}