diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2018-11-17 11:29:48 +0100 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2018-11-20 10:14:49 +0100 |
| commit | 2a5539caeffcc7db910e8eb3e29365a028e86a44 (patch) | |
| tree | 6157843ebcda9039decdaf235822ae96a35520b0 | |
| parent | f1dd31f70440fa9c7a40525bd1e03eede568f74d (diff) | |
| download | servo-2a5539caeffcc7db910e8eb3e29365a028e86a44.tar.gz servo-2a5539caeffcc7db910e8eb3e29365a028e86a44.zip | |
Use Size2D in TexImage2D and TexSubImage2D messages
| -rw-r--r-- | components/canvas/webgl_thread.rs | 14 | ||||
| -rw-r--r-- | components/canvas_traits/webgl.rs | 6 | ||||
| -rw-r--r-- | components/script/dom/webglrenderingcontext.rs | 6 |
3 files changed, 10 insertions, 16 deletions
diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs index af7ebe19dc1..700fdf0db72 100644 --- a/components/canvas/webgl_thread.rs +++ b/components/canvas/webgl_thread.rs @@ -1046,8 +1046,7 @@ impl WebGLImpl { target, level, internal_format, - width, - height, + size, format, data_type, unpacking_alignment, @@ -1059,8 +1058,8 @@ impl WebGLImpl { target, level as i32, internal_format as i32, - width as i32, - height as i32, + size.width as i32, + size.height as i32, 0, format, data_type, @@ -1072,8 +1071,7 @@ impl WebGLImpl { level, xoffset, yoffset, - width, - height, + size, format, data_type, unpacking_alignment, @@ -1086,8 +1084,8 @@ impl WebGLImpl { level as i32, xoffset, yoffset, - width as i32, - height as i32, + size.width as i32, + size.height as i32, format, data_type, &receiver.recv().unwrap(), diff --git a/components/canvas_traits/webgl.rs b/components/canvas_traits/webgl.rs index f513bf93180..000bf0ba119 100644 --- a/components/canvas_traits/webgl.rs +++ b/components/canvas_traits/webgl.rs @@ -276,8 +276,7 @@ pub enum WebGLCommand { target: u32, level: u32, internal_format: u32, - width: u32, - height: u32, + size: Size2D<u32>, format: u32, data_type: u32, unpacking_alignment: u32, @@ -288,8 +287,7 @@ pub enum WebGLCommand { level: u32, xoffset: i32, yoffset: i32, - width: u32, - height: u32, + size: Size2D<u32>, format: u32, data_type: u32, unpacking_alignment: u32, diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index 50f5f577257..bbd9a12538b 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -751,8 +751,7 @@ impl WebGLRenderingContext { target: target.as_gl_constant(), level, internal_format, - width: pixels.size.width, - height: pixels.size.height, + size: pixels.size, format, data_type: self.extension_manager.effective_type(data_type), unpacking_alignment, @@ -835,8 +834,7 @@ impl WebGLRenderingContext { level, xoffset, yoffset, - width: pixels.size.width, - height: pixels.size.height, + size: pixels.size, format: format.as_gl_constant(), data_type: self .extension_manager |