Use Size2D in TexImage2D and TexSubImage2D messages

This commit is contained in:
Anthony Ramine 2018-11-17 11:29:48 +01:00
parent f1dd31f704
commit 2a5539caef
3 changed files with 10 additions and 16 deletions

View file

@ -1046,8 +1046,7 @@ impl WebGLImpl {
target, target,
level, level,
internal_format, internal_format,
width, size,
height,
format, format,
data_type, data_type,
unpacking_alignment, unpacking_alignment,
@ -1059,8 +1058,8 @@ impl WebGLImpl {
target, target,
level as i32, level as i32,
internal_format as i32, internal_format as i32,
width as i32, size.width as i32,
height as i32, size.height as i32,
0, 0,
format, format,
data_type, data_type,
@ -1072,8 +1071,7 @@ impl WebGLImpl {
level, level,
xoffset, xoffset,
yoffset, yoffset,
width, size,
height,
format, format,
data_type, data_type,
unpacking_alignment, unpacking_alignment,
@ -1086,8 +1084,8 @@ impl WebGLImpl {
level as i32, level as i32,
xoffset, xoffset,
yoffset, yoffset,
width as i32, size.width as i32,
height as i32, size.height as i32,
format, format,
data_type, data_type,
&receiver.recv().unwrap(), &receiver.recv().unwrap(),

View file

@ -276,8 +276,7 @@ pub enum WebGLCommand {
target: u32, target: u32,
level: u32, level: u32,
internal_format: u32, internal_format: u32,
width: u32, size: Size2D<u32>,
height: u32,
format: u32, format: u32,
data_type: u32, data_type: u32,
unpacking_alignment: u32, unpacking_alignment: u32,
@ -288,8 +287,7 @@ pub enum WebGLCommand {
level: u32, level: u32,
xoffset: i32, xoffset: i32,
yoffset: i32, yoffset: i32,
width: u32, size: Size2D<u32>,
height: u32,
format: u32, format: u32,
data_type: u32, data_type: u32,
unpacking_alignment: u32, unpacking_alignment: u32,

View file

@ -751,8 +751,7 @@ impl WebGLRenderingContext {
target: target.as_gl_constant(), target: target.as_gl_constant(),
level, level,
internal_format, internal_format,
width: pixels.size.width, size: pixels.size,
height: pixels.size.height,
format, format,
data_type: self.extension_manager.effective_type(data_type), data_type: self.extension_manager.effective_type(data_type),
unpacking_alignment, unpacking_alignment,
@ -835,8 +834,7 @@ impl WebGLRenderingContext {
level, level,
xoffset, xoffset,
yoffset, yoffset,
width: pixels.size.width, size: pixels.size,
height: pixels.size.height,
format: format.as_gl_constant(), format: format.as_gl_constant(),
data_type: self data_type: self
.extension_manager .extension_manager