elias/imgui-rs
1
0
Fork 0
mirror of https://github.com/eliasstepanik/imgui-rs.git synced 2026-01-21 10:28:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fmt

Browse Source
This commit is contained in:
dbr 2023-03-03 18:57:01 +10:30
parent b781572e33
commit 4e146f2ef0
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
imgui-glow-renderer/src/lib.rs
View File

@ -285,9 +285,10 @@ impl Renderer {
#[cfg(feature = "bind_vertex_array_support")] #[cfg(feature = "bind_vertex_array_support")]
if self.gl_version.bind_vertex_array_support() { if self.gl_version.bind_vertex_array_support() {
unsafe { unsafe {
self.vertex_array_object = Some(gl self.vertex_array_object = Some(
.create_vertex_array() gl.create_vertex_array()
.map_err(|err| format!("Error creating vertex array object: {}", err))?); .map_err(|err| format!("Error creating vertex array object: {}", err))?,
);
gl.bind_vertex_array(self.vertex_array_object); gl.bind_vertex_array(self.vertex_array_object);
} }
} }
@ -572,7 +573,9 @@ impl TextureMap for SimpleTextureMap {
#[inline(always)] #[inline(always)]
fn gl_texture(&self, imgui_texture: imgui::TextureId) -> Option<glow::Texture> { fn gl_texture(&self, imgui_texture: imgui::TextureId) -> Option<glow::Texture> {
#[allow(clippy::cast_possible_truncation)] #[allow(clippy::cast_possible_truncation)]
Some(glow::NativeTexture(NonZeroU32::new(imgui_texture.id() as _).unwrap())) Some(glow::NativeTexture(
NonZeroU32::new(imgui_texture.id() as _).unwrap(),
))
} }
} }
@ -646,7 +649,10 @@ impl GlStateBackup {
fn post_init(&mut self, gl: &Context) { fn post_init(&mut self, gl: &Context) {
#[allow(clippy::cast_sign_loss)] #[allow(clippy::cast_sign_loss)]
unsafe { unsafe {
gl.bind_texture(glow::TEXTURE_2D, to_native_gl(self.texture, glow::NativeTexture)); gl.bind_texture(
glow::TEXTURE_2D,
to_native_gl(self.texture, glow::NativeTexture),
);
} }
} }
@ -705,7 +711,10 @@ impl GlStateBackup {
#![allow(clippy::cast_sign_loss)] #![allow(clippy::cast_sign_loss)]
unsafe { unsafe {
gl.use_program(to_native_gl(self.program, glow::NativeProgram)); gl.use_program(to_native_gl(self.program, glow::NativeProgram));
gl.bind_texture(glow::TEXTURE_2D, to_native_gl(self.texture, glow::NativeTexture)); gl.bind_texture(
glow::TEXTURE_2D,
to_native_gl(self.texture, glow::NativeTexture),
);
#[cfg(feature = "bind_sampler_support")] #[cfg(feature = "bind_sampler_support")]
if let Some(sampler) = self.sampler { if let Some(sampler) = self.sampler {
gl.bind_sampler(0, to_native_gl(sampler, glow::NativeSampler)); gl.bind_sampler(0, to_native_gl(sampler, glow::NativeSampler));
@ -715,7 +724,10 @@ impl GlStateBackup {
if let Some(vao) = self.vertex_array_object { if let Some(vao) = self.vertex_array_object {
gl.bind_vertex_array(to_native_gl(vao, glow::NativeVertexArray)); gl.bind_vertex_array(to_native_gl(vao, glow::NativeVertexArray));
} }
gl.bind_buffer(glow::ARRAY_BUFFER, to_native_gl(self.array_buffer, glow::NativeBuffer)); gl.bind_buffer(
glow::ARRAY_BUFFER,
to_native_gl(self.array_buffer, glow::NativeBuffer),
);
gl.blend_equation_separate( gl.blend_equation_separate(
self.blend_equation_rgb as _, self.blend_equation_rgb as _,
self.blend_equation_alpha as _, self.blend_equation_alpha as _,

15
imgui-winit-glow-renderer-viewports/src/lib.rs
View File

@ -305,10 +305,19 @@ impl GlStateBackup {
context.bind_vertex_array(to_native_gl(self.vao, glow::NativeVertexArray)); context.bind_vertex_array(to_native_gl(self.vao, glow::NativeVertexArray));
context.bind_buffer(glow::ARRAY_BUFFER, to_native_gl(self.vbo, glow::NativeBuffer)); context.bind_buffer(
context.bind_buffer(glow::ELEMENT_ARRAY_BUFFER, to_native_gl(self.ibo, glow::NativeBuffer)); glow::ARRAY_BUFFER,
to_native_gl(self.vbo, glow::NativeBuffer),
);
context.bind_buffer(
glow::ELEMENT_ARRAY_BUFFER,
to_native_gl(self.ibo, glow::NativeBuffer),
);
context.bind_texture(glow::TEXTURE_2D, to_native_gl(self.texture, glow::NativeTexture)); context.bind_texture(
glow::TEXTURE_2D,
to_native_gl(self.texture, glow::NativeTexture),
);
context.active_texture(self.active_texture); context.active_texture(self.active_texture);
context.use_program(to_native_gl(self.program, glow::NativeProgram)); context.use_program(to_native_gl(self.program, glow::NativeProgram));