Skip to content

Update glow and image #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update glow and image #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ categories = ["gui", "rendering"]

[dependencies]
imgui = { version = "0.12.0", git = "https://github.com/imgui-rs/imgui-rs" }
glow = "0.14"
glow = "0.16.0"
memoffset = "0.9"

[dev-dependencies]
glutin = "0.32"
glutin-winit = "0.5"
imgui-winit-support = { version = "0.13.0", git = "https://github.com/imgui-rs/imgui-winit-support" }
image = "0.23"
image = "0.25.5"
raw-window-handle = "0.6.0"
winit = { version = "0.30", features = ["rwh_06"] }

Expand Down
2 changes: 1 addition & 1 deletion examples/glow_03_triangle_gles.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//! using OpenGL ES, rather than full-fat OpenGL.
//!
//! Note this example uses `Renderer` rather than `AutoRenderer` and
//! therefore requries more lifetime-management of the OpenGL context.
//! therefore requires more lifetime-management of the OpenGL context.

use std::{num::NonZeroU32, time::Instant};

Expand Down
8 changes: 4 additions & 4 deletions examples/glow_04_custom_textures.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

use std::{io::Cursor, num::NonZeroU32, time::Instant};

use glow::HasContext;
use glow::{HasContext, PixelUnpackData};
use glutin::surface::GlSurface;
use imgui::Condition;

Expand Down Expand Up @@ -162,7 +162,7 @@ impl TexturesUi {
0,
glow::RGB,
glow::UNSIGNED_BYTE,
Some(&data),
PixelUnpackData::Slice(Some(&data)),
)
}

Expand Down Expand Up @@ -266,7 +266,7 @@ struct SipiPng {

impl SipiPng {
fn load(gl: &glow::Context, textures: &mut imgui::Textures<glow::Texture>) -> Self {
let sipi_png = image::io::Reader::new(Cursor::new(SIPI_PNG))
let sipi_png = image::ImageReader::new(Cursor::new(SIPI_PNG))
.with_guessed_format()
.unwrap()
.decode()
Expand Down Expand Up @@ -297,7 +297,7 @@ impl SipiPng {
0,
glow::RGBA,
glow::UNSIGNED_BYTE,
Some(&sipi_png),
PixelUnpackData::Slice(Some(&sipi_png)),
)
}

Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use crate::versions::{GlVersion, GlslVersion};

// Re-export glow to make it easier for users to use the correct version.
pub use glow;
use glow::{Context, HasContext};
use glow::{Context, HasContext, PixelUnpackData};

pub mod versions;

Expand Down Expand Up @@ -1077,7 +1077,7 @@ fn prepare_font_atlas<T: TextureMap>(
0,
glow::RGBA,
glow::UNSIGNED_BYTE,
Some(atlas_texture.data),
PixelUnpackData::Slice(Some(atlas_texture.data)),
);
}

Expand Down