Skip to content

Commit 40fd524

Browse files
authored
Update glow to 0.16 (#6586)
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
1 parent 6365e2d commit 40fd524

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ windows-core = { version = "0.58", default-features = false }
153153

154154
# Gles dependencies
155155
khronos-egl = "6"
156-
glow = "0.14.2"
156+
glow = "0.16"
157157
glutin = { version = "0.31", default-features = false }
158158
glutin-winit = { version = "0.4", default-features = false }
159159
glutin_wgl_sys = "0.6"

wgpu-hal/src/gles/device.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ impl crate::Device for super::Device {
826826
0,
827827
format_desc.external,
828828
format_desc.data_type,
829-
None,
829+
glow::PixelUnpackData::Slice(None),
830830
);
831831
width = max(1, width / 2);
832832
height = max(1, height / 2);
@@ -846,7 +846,7 @@ impl crate::Device for super::Device {
846846
0,
847847
format_desc.external,
848848
format_desc.data_type,
849-
None,
849+
glow::PixelUnpackData::Slice(None),
850850
);
851851
width = max(1, width / 2);
852852
height = max(1, height / 2);
@@ -899,7 +899,7 @@ impl crate::Device for super::Device {
899899
0,
900900
format_desc.external,
901901
format_desc.data_type,
902-
None,
902+
glow::PixelUnpackData::Slice(None),
903903
);
904904
}
905905
width = max(1, width / 2);
@@ -918,7 +918,7 @@ impl crate::Device for super::Device {
918918
0,
919919
format_desc.external,
920920
format_desc.data_type,
921-
None,
921+
glow::PixelUnpackData::Slice(None),
922922
);
923923
width = max(1, width / 2);
924924
height = max(1, height / 2);

wgpu-hal/src/gles/queue.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ impl super::Queue {
744744
buffer_data = src.data.as_ref().unwrap().lock().unwrap();
745745
let src_data =
746746
&buffer_data.as_slice()[copy.buffer_layout.offset as usize..];
747-
glow::PixelUnpackData::Slice(src_data)
747+
glow::PixelUnpackData::Slice(Some(src_data))
748748
}
749749
};
750750
if is_layered_target(dst_target) {
@@ -889,7 +889,7 @@ impl super::Queue {
889889
None => {
890890
buffer_data = dst.data.as_ref().unwrap().lock().unwrap();
891891
let dst_data = &mut buffer_data.as_mut_slice()[offset as usize..];
892-
glow::PixelPackData::Slice(dst_data)
892+
glow::PixelPackData::Slice(Some(dst_data))
893893
}
894894
};
895895
unsafe {
@@ -1549,7 +1549,7 @@ impl super::Queue {
15491549
unsafe {
15501550
gl.bind_image_texture(
15511551
slot,
1552-
binding.raw,
1552+
Some(binding.raw),
15531553
binding.mip_level as i32,
15541554
binding.array_layer.is_none(),
15551555
binding.array_layer.unwrap_or_default() as i32,

0 commit comments

Comments
 (0)