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

Remove offscreen_gl_context dependency from canvas_traits and script.

Browse source
This commit is contained in:
Josh Matthews 2018-11-14 18:06:35 -05:00
parent 0f3108ce79
commit 3121f42d52
11 changed files with 85 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/canvas/webgl_thread.rs
View file

@ -2,16 +2,14 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use super::gl_context::{GLContextFactory, GLContextWrapper};
use super::gl_context::{map_attrs_to_script_attrs, GLContextFactory, GLContextWrapper};
use byteorder::{ByteOrder, NativeEndian, WriteBytesExt};
use canvas_traits::webgl::*;
use euclid::Size2D;
use fnv::FnvHashMap;
use gleam::gl;
use half::f16;
use offscreen_gl_context::{
DrawBuffer, GLContext, GLContextAttributes, GLLimits, NativeGLContextMethods,
};
use offscreen_gl_context::{DrawBuffer, GLContext, NativeGLContextMethods};
use pixels::{self, PixelFormat};
use std::borrow::Cow;
use std::thread;
@ -795,9 +793,9 @@ impl WebGLImpl {
_backtrace: WebGLCommandBacktrace,
) {
match command {
WebGLCommand::GetContextAttributes(ref sender) => {
sender.send(*ctx.borrow_attributes()).unwrap()
},
WebGLCommand::GetContextAttributes(ref sender) => sender
.send(map_attrs_to_script_attrs(*ctx.borrow_attributes()))
.unwrap(),
WebGLCommand::ActiveTexture(target) => ctx.gl().active_texture(target),
WebGLCommand::AttachShader(program_id, shader_id) => {
ctx.gl().attach_shader(program_id.get(), shader_id.get())