webgl: Add multiple WebGL calls (activeTexture + blend*)

* activeTexture
* blendColor
* blendFunc
* blendFuncSeparate
* blendEquation
* blendEquationSeparate

Blocked on gleam.

6 files changed, 199 insertions, 61 deletions

diff --git a/components/canvas/webgl_paint_task.rs b/components/canvas/webgl_paint_task.rs
index 758aa751b84..8f8b82c908b 100644
--- a/components/canvas/webgl_paint_task.rs
+++ b/components/canvas/webgl_paint_task.rs
@@ -47,46 +47,90 @@ impl WebGLPaintTask {
 
     pub fn handle_webgl_message(&self, message: CanvasWebGLMsg) {
         match message {
-            CanvasWebGLMsg::GetContextAttributes(sender) => self.get_context_attributes(sender),
-            CanvasWebGLMsg::AttachShader(program_id, shader_id) => self.attach_shader(program_id, shader_id),
-            CanvasWebGLMsg::BufferData(buffer_type, data, usage) => self.buffer_data(buffer_type, data, usage),
-            CanvasWebGLMsg::Clear(mask) => self.clear(mask),
-            CanvasWebGLMsg::ClearColor(r, g, b, a) => self.clear_color(r, g, b, a),
-            CanvasWebGLMsg::DrawArrays(mode, first, count) => self.draw_arrays(mode, first, count),
-            CanvasWebGLMsg::EnableVertexAttribArray(attrib_id) => self.enable_vertex_attrib_array(attrib_id),
+            CanvasWebGLMsg::GetContextAttributes(sender) =>
+                self.get_context_attributes(sender),
+            CanvasWebGLMsg::ActiveTexture(target) =>
+                self.active_texture(target),
+            CanvasWebGLMsg::BlendColor(r, g, b, a) =>
+                self.blend_color(r, g, b, a),
+            CanvasWebGLMsg::BlendEquation(mode) =>
+                self.blend_equation(mode),
+            CanvasWebGLMsg::BlendEquationSeparate(mode_rgb, mode_alpha) =>
+                self.blend_equation_separate(mode_rgb, mode_alpha),
+            CanvasWebGLMsg::BlendFunc(src, dest) =>
+                self.blend_func(src, dest),
+            CanvasWebGLMsg::BlendFuncSeparate(src_rgb, dest_rgb, src_alpha, dest_alpha) =>
+                self.blend_func_separate(src_rgb, dest_rgb, src_alpha, dest_alpha),
+            CanvasWebGLMsg::AttachShader(program_id, shader_id) =>
+                self.attach_shader(program_id, shader_id),
+            CanvasWebGLMsg::BufferData(buffer_type, data, usage) =>
+                self.buffer_data(buffer_type, data, usage),
+            CanvasWebGLMsg::Clear(mask) =>
+                self.clear(mask),
+            CanvasWebGLMsg::ClearColor(r, g, b, a) =>
+                self.clear_color(r, g, b, a),
+            CanvasWebGLMsg::DrawArrays(mode, first, count) =>
+                self.draw_arrays(mode, first, count),
+            CanvasWebGLMsg::EnableVertexAttribArray(attrib_id) =>
+                self.enable_vertex_attrib_array(attrib_id),
             CanvasWebGLMsg::GetAttribLocation(program_id, name, chan) =>
                 self.get_attrib_location(program_id, name, chan),
-            CanvasWebGLMsg::GetShaderInfoLog(shader_id, chan) => self.get_shader_info_log(shader_id, chan),
+            CanvasWebGLMsg::GetShaderInfoLog(shader_id, chan) =>
+                self.get_shader_info_log(shader_id, chan),
             CanvasWebGLMsg::GetShaderParameter(shader_id, param_id, chan) =>
                 self.get_shader_parameter(shader_id, param_id, chan),
             CanvasWebGLMsg::GetUniformLocation(program_id, name, chan) =>
                 self.get_uniform_location(program_id, name, chan),
-            CanvasWebGLMsg::CompileShader(shader_id) => self.compile_shader(shader_id),
-            CanvasWebGLMsg::CreateBuffer(chan) => self.create_buffer(chan),
-            CanvasWebGLMsg::CreateFramebuffer(chan) => self.create_framebuffer(chan),
-            CanvasWebGLMsg::CreateRenderbuffer(chan) => self.create_renderbuffer(chan),
-            CanvasWebGLMsg::CreateTexture(chan) => self.create_texture(chan),
-            CanvasWebGLMsg::CreateProgram(chan) => self.create_program(chan),
-            CanvasWebGLMsg::CreateShader(shader_type, chan) => self.create_shader(shader_type, chan),
-            CanvasWebGLMsg::DeleteBuffer(id) => self.delete_buffer(id),
-            CanvasWebGLMsg::DeleteFramebuffer(id) => self.delete_framebuffer(id),
-            CanvasWebGLMsg::DeleteRenderbuffer(id) => self.delete_renderbuffer(id),
-            CanvasWebGLMsg::DeleteTexture(id) => self.delete_texture(id),
-            CanvasWebGLMsg::DeleteProgram(id) => self.delete_program(id),
-            CanvasWebGLMsg::DeleteShader(id) => self.delete_shader(id),
-            CanvasWebGLMsg::BindBuffer(target, id) => self.bind_buffer(target, id),
-            CanvasWebGLMsg::BindFramebuffer(target, id) => self.bind_framebuffer(target, id),
-            CanvasWebGLMsg::BindRenderbuffer(target, id) => self.bind_renderbuffer(target, id),
-            CanvasWebGLMsg::BindTexture(target, id) => self.bind_texture(target, id),
-            CanvasWebGLMsg::LinkProgram(program_id) => self.link_program(program_id),
-            CanvasWebGLMsg::ShaderSource(shader_id, source) => self.shader_source(shader_id, source),
-            CanvasWebGLMsg::Uniform4fv(uniform_id, data) => self.uniform_4fv(uniform_id, data),
-            CanvasWebGLMsg::UseProgram(program_id) => self.use_program(program_id),
+            CanvasWebGLMsg::CompileShader(shader_id) =>
+                self.compile_shader(shader_id),
+            CanvasWebGLMsg::CreateBuffer(chan) =>
+                self.create_buffer(chan),
+            CanvasWebGLMsg::CreateFramebuffer(chan) =>
+                self.create_framebuffer(chan),
+            CanvasWebGLMsg::CreateRenderbuffer(chan) =>
+                self.create_renderbuffer(chan),
+            CanvasWebGLMsg::CreateTexture(chan) =>
+                self.create_texture(chan),
+            CanvasWebGLMsg::CreateProgram(chan) =>
+                self.create_program(chan),
+            CanvasWebGLMsg::CreateShader(shader_type, chan) =>
+                self.create_shader(shader_type, chan),
+            CanvasWebGLMsg::DeleteBuffer(id) =>
+                self.delete_buffer(id),
+            CanvasWebGLMsg::DeleteFramebuffer(id) =>
+                self.delete_framebuffer(id),
+            CanvasWebGLMsg::DeleteRenderbuffer(id) =>
+                self.delete_renderbuffer(id),
+            CanvasWebGLMsg::DeleteTexture(id) =>
+                self.delete_texture(id),
+            CanvasWebGLMsg::DeleteProgram(id) =>
+                self.delete_program(id),
+            CanvasWebGLMsg::DeleteShader(id) =>
+                self.delete_shader(id),
+            CanvasWebGLMsg::BindBuffer(target, id) =>
+                self.bind_buffer(target, id),
+            CanvasWebGLMsg::BindFramebuffer(target, id) =>
+                self.bind_framebuffer(target, id),
+            CanvasWebGLMsg::BindRenderbuffer(target, id) =>
+                self.bind_renderbuffer(target, id),
+            CanvasWebGLMsg::BindTexture(target, id) =>
+                self.bind_texture(target, id),
+            CanvasWebGLMsg::LinkProgram(program_id) =>
+                self.link_program(program_id),
+            CanvasWebGLMsg::ShaderSource(shader_id, source) =>
+                self.shader_source(shader_id, source),
+            CanvasWebGLMsg::Uniform4fv(uniform_id, data) =>
+                self.uniform_4fv(uniform_id, data),
+            CanvasWebGLMsg::UseProgram(program_id) =>
+                self.use_program(program_id),
             CanvasWebGLMsg::VertexAttribPointer2f(attrib_id, size, normalized, stride, offset) =>
                 self.vertex_attrib_pointer_f32(attrib_id, size, normalized, stride, offset),
-            CanvasWebGLMsg::Viewport(x, y, width, height) => self.viewport(x, y, width, height),
-            CanvasWebGLMsg::DrawingBufferWidth(sender) => self.send_drawing_buffer_width(sender),
-            CanvasWebGLMsg::DrawingBufferHeight(sender) => self.send_drawing_buffer_height(sender),
+            CanvasWebGLMsg::Viewport(x, y, width, height) =>
+                self.viewport(x, y, width, height),
+            CanvasWebGLMsg::DrawingBufferWidth(sender) =>
+                self.send_drawing_buffer_width(sender),
+            CanvasWebGLMsg::DrawingBufferHeight(sender) =>
+                self.send_drawing_buffer_height(sender),
         }
     }
 
@@ -117,30 +161,74 @@ impl WebGLPaintTask {
         Ok(chan)
     }
 
+    #[inline]
     fn get_context_attributes(&self, sender: Sender<GLContextAttributes>) {
         sender.send(*self.gl_context.borrow_attributes()).unwrap()
     }
 
+    #[inline]
     fn send_drawing_buffer_width(&self, sender: Sender<i32>) {
         sender.send(self.size.width).unwrap()
     }
 
+    #[inline]
     fn send_drawing_buffer_height(&self, sender: Sender<i32>) {
         sender.send(self.size.height).unwrap()
     }
 
+    #[inline]
+    fn active_texture(&self, texture: u32) {
+        gl::active_texture(texture);
+    }
+
+    #[inline]
+    fn blend_color(&self, r: f32, g: f32, b: f32, a: f32) {
+        gl::blend_color(r, g, b, a);
+    }
+
+    #[inline]
+    fn blend_equation(&self, mode: u32) {
+        gl::blend_equation(mode);
+    }
+
+    #[inline]
+    fn blend_equation_separate(&self, mode_rgb: u32, mode_alpha: u32) {
+        gl::blend_equation_separate(mode_rgb, mode_alpha);
+    }
+
+    #[inline]
+    fn blend_func(&self, src_factor: u32, dest_factor: u32) {
+        gl::blend_func(src_factor, dest_factor);
+    }
+
+    #[inline]
+    fn blend_func_separate(&self,
+                           src_rgb_factor: u32,
+                           dest_rgb_factor: u32,
+                           src_alpha_factor: u32,
+                           dest_alpha_factor: u32) {
+        gl::blend_func_separate(src_rgb_factor,
+                                dest_rgb_factor,
+                                src_alpha_factor,
+                                dest_alpha_factor);
+    }
+
+    #[inline]
     fn attach_shader(&self, program_id: u32, shader_id: u32) {
         gl::attach_shader(program_id, shader_id);
     }
 
+    #[inline]
     fn buffer_data(&self, buffer_type: u32, data: Vec<f32>, usage: u32) {
         gl::buffer_data(buffer_type, &data, usage);
     }
 
+    #[inline]
     fn clear(&self, mask: u32) {
         gl::clear(mask);
     }
 
+    #[inline]
     fn clear_color(&self, r: f32, g: f32, b: f32, a: f32) {
         gl::clear_color(r, g, b, a);
     }
@@ -258,14 +346,17 @@ impl WebGLPaintTask {
     // TODO(ecoal95): This is not spec-compliant, we must check
     // the version of GLSL used. This functionality should probably
     // be in the WebGLShader object
+    #[inline]
     fn compile_shader(&self, shader_id: u32) {
         gl::compile_shader(shader_id);
     }
 
+    #[inline]
     fn draw_arrays(&self, mode: u32, first: i32, count: i32) {
         gl::draw_arrays(mode, first, count);
     }
 
+    #[inline]
     fn enable_vertex_attrib_array(&self, attrib_id: u32) {
         gl::enable_vertex_attrib_array(attrib_id);
     }
@@ -296,10 +387,37 @@ impl WebGLPaintTask {
         chan.send(location).unwrap();
     }
 
+    #[inline]
     fn link_program(&self, program_id: u32) {
         gl::link_program(program_id);
     }
 
+    #[inline]
+    fn shader_source(&self, shader_id: u32, source: String) {
+        gl::shader_source(shader_id, &[source.as_bytes()]);
+    }
+
+    #[inline]
+    fn uniform_4fv(&self, uniform_id: i32, data: Vec<f32>) {
+        gl::uniform_4f(uniform_id, data[0], data[1], data[2], data[3]);
+    }
+
+    #[inline]
+    fn use_program(&self, program_id: u32) {
+        gl::use_program(program_id);
+    }
+
+    #[inline]
+    fn vertex_attrib_pointer_f32(&self, attrib_id: u32, size: i32,
+                              normalized: bool, stride: i32, offset: i64) {
+        gl::vertex_attrib_pointer_f32(attrib_id, size, normalized, stride, offset as u32);
+    }
+
+    #[inline]
+    fn viewport(&self, x: i32, y: i32, width: i32, height: i32) {
+        gl::viewport(x, y, width, height);
+    }
+
     fn send_pixel_contents(&mut self, chan: Sender<Vec<u8>>) {
         // FIXME(#5652, dmarcos) Instead of a readback strategy we have
         // to layerize the canvas
@@ -330,27 +448,6 @@ impl WebGLPaintTask {
         unimplemented!()
     }
 
-    fn shader_source(&self, shader_id: u32, source: String) {
-        gl::shader_source(shader_id, &[source.as_bytes()]);
-    }
-
-    fn uniform_4fv(&self, uniform_id: i32, data: Vec<f32>) {
-        gl::uniform_4f(uniform_id, data[0], data[1], data[2], data[3]);
-    }
-
-    fn use_program(&self, program_id: u32) {
-        gl::use_program(program_id);
-    }
-
-    fn vertex_attrib_pointer_f32(&self, attrib_id: u32, size: i32,
-                              normalized: bool, stride: i32, offset: i64) {
-        gl::vertex_attrib_pointer_f32(attrib_id, size, normalized, stride, offset as u32);
-    }
-
-    fn viewport(&self, x: i32, y: i32, width: i32, height: i32) {
-        gl::viewport(x, y, width, height);
-    }
-
     fn recreate(&mut self, size: Size2D<i32>) -> Result<(), &'static str> {
         if size.width > self.original_context_size.width ||
            size.height > self.original_context_size.height {
diff --git a/components/canvas_traits/lib.rs b/components/canvas_traits/lib.rs
index dcf27baeea1..4e09d371ad7 100644
--- a/components/canvas_traits/lib.rs
+++ b/components/canvas_traits/lib.rs
@@ -77,6 +77,12 @@ pub enum Canvas2dMsg {
 #[derive(Clone)]
 pub enum CanvasWebGLMsg {
     GetContextAttributes(Sender<GLContextAttributes>),
+    ActiveTexture(u32),
+    BlendColor(f32, f32, f32, f32),
+    BlendEquation(u32),
+    BlendEquationSeparate(u32, u32),
+    BlendFunc(u32, u32),
+    BlendFuncSeparate(u32, u32, u32, u32),
     AttachShader(u32, u32),
     BufferData(u32, Vec<f32>, u32),
     Clear(u32),
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 8e5e23cb3c6..1ce9561d90a 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -138,6 +138,37 @@ impl<'a> WebGLRenderingContextMethods for JSRef<'a, WebGLRenderingContext> {
         0 as *mut JSObject
     }
 
+    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3
+    fn ActiveTexture(self, texture: u32) {
+        self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::ActiveTexture(texture))).unwrap();
+    }
+
+    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3
+    fn BlendColor(self, r: f32, g: f32, b: f32, a: f32) {
+        self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::BlendColor(r, g, b, a))).unwrap();
+    }
+
+    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3
+    fn BlendEquation(self, mode: u32) {
+        self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::BlendEquation(mode))).unwrap();
+    }
+
+    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3
+    fn BlendEquationSeparate(self, mode_rgb: u32, mode_alpha: u32) {
+        self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::BlendEquationSeparate(mode_rgb, mode_alpha))).unwrap();
+    }
+
+    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3
+    fn BlendFunc(self, src_factor: u32, dest_factor: u32) {
+        self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::BlendFunc(src_factor, dest_factor))).unwrap();
+    }
+
+    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3
+    fn BlendFuncSeparate(self, src_rgb: u32, dest_rgb: u32, src_alpha: u32, dest_alpha: u32) {
+        self.renderer.send(
+            CanvasMsg::WebGL(CanvasWebGLMsg::BlendFuncSeparate(src_rgb, dest_rgb, src_alpha, dest_alpha))).unwrap();
+    }
+
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9
     fn AttachShader(self, program: Option<JSRef<WebGLProgram>>, shader: Option<JSRef<WebGLShader>>) {
         let program_id = match program {
diff --git a/components/script/dom/webglshaderprecisionformat.rs b/components/script/dom/webglshaderprecisionformat.rs
index bde53afddd8..368d57358f6 100644
--- a/components/script/dom/webglshaderprecisionformat.rs
+++ b/components/script/dom/webglshaderprecisionformat.rs
@@ -27,7 +27,10 @@ impl WebGLShaderPrecisionFormat {
         }
     }
 
-    pub fn new(global: GlobalRef, range_min: i32, range_max: i32, precision: i32) -> Temporary<WebGLShaderPrecisionFormat> {
+    pub fn new(global: GlobalRef,
+               range_min: i32,
+               range_max: i32,
+               precision: i32) -> Temporary<WebGLShaderPrecisionFormat> {
         reflect_dom_object(
             box WebGLShaderPrecisionFormat::new_inherited(range_min, range_max, precision),
             global,
diff --git a/components/script/dom/webidls/WebGLRenderingContext.webidl b/components/script/dom/webidls/WebGLRenderingContext.webidl
index ae262a69eba..d3865c91c4a 100644
--- a/components/script/dom/webidls/WebGLRenderingContext.webidl
+++ b/components/script/dom/webidls/WebGLRenderingContext.webidl
@@ -466,19 +466,19 @@ interface WebGLRenderingContextBase
     //sequence<DOMString>? getSupportedExtensions();
     object? getExtension(DOMString name);
 
-    //void activeTexture(GLenum texture);
+    void activeTexture(GLenum texture);
     void attachShader(WebGLProgram? program, WebGLShader? shader);
     //void bindAttribLocation(WebGLProgram? program, GLuint index, DOMString name);
     void bindBuffer(GLenum target, WebGLBuffer? buffer);
     void bindFramebuffer(GLenum target, WebGLFramebuffer? framebuffer);
     void bindRenderbuffer(GLenum target, WebGLRenderbuffer? renderbuffer);
     void bindTexture(GLenum target, WebGLTexture? texture);
-    //void blendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-    //void blendEquation(GLenum mode);
-    //void blendEquationSeparate(GLenum modeRGB, GLenum modeAlpha);
-    //void blendFunc(GLenum sfactor, GLenum dfactor);
-    //void blendFuncSeparate(GLenum srcRGB, GLenum dstRGB,
-    //                       GLenum srcAlpha, GLenum dstAlpha);
+    void blendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+    void blendEquation(GLenum mode);
+    void blendEquationSeparate(GLenum modeRGB, GLenum modeAlpha);
+    void blendFunc(GLenum sfactor, GLenum dfactor);
+    void blendFuncSeparate(GLenum srcRGB, GLenum dstRGB,
+                           GLenum srcAlpha, GLenum dstAlpha);
 
     // typedef (ArrayBuffer or ArrayBufferView) BufferDataSource;
     //void bufferData(GLenum target, GLsizeiptr size, GLenum usage);
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index eae16bf3274..8a65fe9700f 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -1041,6 +1041,7 @@ dependencies = [
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
  "gfx 0.0.1",
+ "gfx_traits 0.0.1",
  "html5ever 0.0.0 (git+https://github.com/servo/html5ever)",
  "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "js 0.1.0 (git+https://github.com/servo/rust-mozjs)",