archive-gh-me/wgpu
1
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-12-08 21:26:17 +00:00
Code Issues Projects Releases Wiki Activity

Update glow to 0.16 (#6586)

Browse Source 
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
Samson 2024-11-22 09:49:03 +01:00 committed by GitHub
parent 6365e2dd75
commit 40fd5245df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -1311,9 +1311,9 @@ dependencies = [
[[package]] [[package]]
name = "glow" name = "glow"
version = "0.14.2" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d51fa363f025f5c111e03f13eda21162faeacb6911fe8caa0c0349f9cf0c4483" checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08"
dependencies = [ dependencies = [
"js-sys", "js-sys",
"slotmap", "slotmap",

2
Cargo.toml
View File

@ -153,7 +153,7 @@ windows-core = { version = "0.58", default-features = false }
# Gles dependencies # Gles dependencies
khronos-egl = "6" khronos-egl = "6"
glow = "0.14.2" glow = "0.16"
glutin = { version = "0.31", default-features = false } glutin = { version = "0.31", default-features = false }
glutin-winit = { version = "0.4", default-features = false } glutin-winit = { version = "0.4", default-features = false }
glutin_wgl_sys = "0.6" glutin_wgl_sys = "0.6"

8
wgpu-hal/src/gles/device.rs
View File

@ -826,7 +826,7 @@ impl crate::Device for super::Device {
0, 0,
format_desc.external, format_desc.external,
format_desc.data_type, format_desc.data_type,
None, glow::PixelUnpackData::Slice(None),
); );
width = max(1, width / 2); width = max(1, width / 2);
height = max(1, height / 2); height = max(1, height / 2);
@ -846,7 +846,7 @@ impl crate::Device for super::Device {
0, 0,
format_desc.external, format_desc.external,
format_desc.data_type, format_desc.data_type,
None, glow::PixelUnpackData::Slice(None),
); );
width = max(1, width / 2); width = max(1, width / 2);
height = max(1, height / 2); height = max(1, height / 2);
@ -899,7 +899,7 @@ impl crate::Device for super::Device {
0, 0,
format_desc.external, format_desc.external,
format_desc.data_type, format_desc.data_type,
None, glow::PixelUnpackData::Slice(None),
); );
} }
width = max(1, width / 2); width = max(1, width / 2);
@ -918,7 +918,7 @@ impl crate::Device for super::Device {
0, 0,
format_desc.external, format_desc.external,
format_desc.data_type, format_desc.data_type,
None, glow::PixelUnpackData::Slice(None),
); );
width = max(1, width / 2); width = max(1, width / 2);
height = max(1, height / 2); height = max(1, height / 2);

6
wgpu-hal/src/gles/queue.rs
View File

@ -744,7 +744,7 @@ impl super::Queue {
buffer_data = src.data.as_ref().unwrap().lock().unwrap(); buffer_data = src.data.as_ref().unwrap().lock().unwrap();
let src_data = let src_data =
&buffer_data.as_slice()[copy.buffer_layout.offset as usize..]; &buffer_data.as_slice()[copy.buffer_layout.offset as usize..];
glow::PixelUnpackData::Slice(src_data) glow::PixelUnpackData::Slice(Some(src_data))
} }
}; };
if is_layered_target(dst_target) { if is_layered_target(dst_target) {
@ -889,7 +889,7 @@ impl super::Queue {
None => { None => {
buffer_data = dst.data.as_ref().unwrap().lock().unwrap(); buffer_data = dst.data.as_ref().unwrap().lock().unwrap();
let dst_data = &mut buffer_data.as_mut_slice()[offset as usize..]; let dst_data = &mut buffer_data.as_mut_slice()[offset as usize..];
glow::PixelPackData::Slice(dst_data) glow::PixelPackData::Slice(Some(dst_data))
} }
}; };
unsafe { unsafe {
@ -1549,7 +1549,7 @@ impl super::Queue {
unsafe { unsafe {
gl.bind_image_texture( gl.bind_image_texture(
slot, slot,
binding.raw, Some(binding.raw),
binding.mip_level as i32, binding.mip_level as i32,
binding.array_layer.is_none(), binding.array_layer.is_none(),
binding.array_layer.unwrap_or_default() as i32, binding.array_layer.unwrap_or_default() as i32,