From 7dd47c67ef629c6fcaead34e876d3cab3bb26690 Mon Sep 17 00:00:00 2001 From: Boscop Date: Tue, 31 Mar 2020 05:15:41 +0200 Subject: [PATCH 1/2] Clamp textures to border (GL_CLAMP_TO_BORDER) --- imgui-glium-renderer/src/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/imgui-glium-renderer/src/lib.rs b/imgui-glium-renderer/src/lib.rs index b788bf9..496b6c5 100644 --- a/imgui-glium-renderer/src/lib.rs +++ b/imgui-glium-renderer/src/lib.rs @@ -5,7 +5,7 @@ use glium::backend::{Context, Facade}; use glium::index::{self, PrimitiveType}; use glium::program::ProgramChooserCreationError; use glium::texture::{ClientFormat, MipmapsOption, RawImage2d, TextureCreationError}; -use glium::uniforms::{MagnifySamplerFilter, MinifySamplerFilter}; +use glium::uniforms::{MagnifySamplerFilter, MinifySamplerFilter, SamplerWrapFunction}; use glium::{ program, uniform, vertex, Blend, DrawError, DrawParameters, IndexBuffer, Program, Rect, Surface, Texture2d, VertexBuffer, @@ -198,6 +198,7 @@ impl Renderer { tex: self.lookup_texture(texture_id)?.sampled() .minify_filter(MinifySamplerFilter::Linear) .magnify_filter(MagnifySamplerFilter::Linear) + .wrap_function(SamplerWrapFunction::BorderClamp) }, &DrawParameters { blend: Blend::alpha_blending(), From 0c28845ad8846d7290fae70b21f47953a927d11c Mon Sep 17 00:00:00 2001 From: Joonas Javanainen Date: Sat, 18 Apr 2020 12:42:21 +0300 Subject: [PATCH 2/2] Bump minimum Rust to 1.40 --- .github/workflows/ci.yml | 2 +- CHANGELOG.markdown | 1 + README.markdown | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 888b07f..c0dff4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,7 +105,7 @@ jobs: rust: - stable - beta - - 1.38.0 + - 1.40.0 os: - ubuntu-latest - macos-latest diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown index 93cf305..74e4639 100644 --- a/CHANGELOG.markdown +++ b/CHANGELOG.markdown @@ -5,6 +5,7 @@ ### Changed - Redesigned tree / collapsing header API +- Bump minimum Rust version to 1.40 (at least xml-rs crate requires it) ## [0.3.1] - 2020-03-16 diff --git a/README.markdown b/README.markdown index 7186677..2b4e662 100644 --- a/README.markdown +++ b/README.markdown @@ -2,7 +2,7 @@ **Still fairly experimental!** -Minimum Rust version: 1.38 +Minimum Rust version: 1.40 Wrapped Dear ImGui version: 1.75