migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-01 06:10:06 -04:00
Code Activity

Update MSRV to Rust 1.72 (#3595)

Browse Source 
Required to update to puffin 0.18
This commit is contained in:
Emil Ernerfeldt
2023-11-21 17:26:35 +01:00
committed by GitHub
parent 7abf8afd16
commit bfadb90d42
48 changed files with 206 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
crates/egui_glow/src/misc_util.rs
View File

@@ -7,16 +7,18 @@ pub(crate) unsafe fn compile_shader(
shader_type: u32,
source: &str,
) -> Result<glow::Shader, String> {
let shader = gl.create_shader(shader_type)?;
unsafe {
let shader = gl.create_shader(shader_type)?;
gl.shader_source(shader, source);
gl.shader_source(shader, source);
gl.compile_shader(shader);
gl.compile_shader(shader);
if gl.get_shader_compile_status(shader) {
Ok(shader)
} else {
Err(gl.get_shader_info_log(shader))
if gl.get_shader_compile_status(shader) {
Ok(shader)
} else {
Err(gl.get_shader_info_log(shader))
}
}
}
@@ -24,17 +26,19 @@ pub(crate) unsafe fn link_program<'a, T: IntoIterator<Item = &'a glow::Shader>>(
gl: &glow::Context,
shaders: T,
) -> Result<glow::Program, String> {
let program = gl.create_program()?;
unsafe {
let program = gl.create_program()?;
for shader in shaders {
gl.attach_shader(program, *shader);
}
for shader in shaders {
gl.attach_shader(program, *shader);
}
gl.link_program(program);
gl.link_program(program);
if gl.get_program_link_status(program) {
Ok(program)
} else {
Err(gl.get_program_info_log(program))
if gl.get_program_link_status(program) {
Ok(program)
} else {
Err(gl.get_program_info_log(program))
}
}
}