Use Size2D in TexImage2D and TexSubImage2D messages

servo · Nov 20, 2018 · 2a5539c · 2a5539c
1 parent f1dd31f
commit 2a5539c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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