From 32f789ae26bf841720e88a19e4b5d419c9ecc3e9 Mon Sep 17 00:00:00 2001 From: Joonas Javanainen Date: Sun, 27 Sep 2015 15:59:46 +0300 Subject: [PATCH] Upgrade to Glium 0.9.0 --- Cargo.toml | 4 ++-- imgui-sys/Cargo.toml | 2 +- src/glium_renderer.rs | 8 ++------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4e37af7..a311e83 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ default = ["glium"] libc = "0.1" [dependencies.glium] -version = "0.8" +version = "0.9" default-features = false optional = true @@ -30,6 +30,6 @@ gcc = "0.3" time = "0.1" [dev-dependencies.glium] -version = "0.8" +version = "0.9" features = ["glutin"] default-features = false diff --git a/imgui-sys/Cargo.toml b/imgui-sys/Cargo.toml index 75837c8..1ba89fd 100644 --- a/imgui-sys/Cargo.toml +++ b/imgui-sys/Cargo.toml @@ -16,7 +16,7 @@ bitflags = "0.3" libc = "0.1" [dependencies.glium] -version = "0.8" +version = "0.9" default-features = false optional = true diff --git a/src/glium_renderer.rs b/src/glium_renderer.rs index f453c51..daab72f 100644 --- a/src/glium_renderer.rs +++ b/src/glium_renderer.rs @@ -1,9 +1,8 @@ use glium::{ index, program, texture, vertex, - DrawError, DrawParameters, IndexBuffer, Program, Rect, Surface, Texture2d, VertexBuffer + Blend, DrawError, DrawParameters, IndexBuffer, Program, Rect, Surface, Texture2d, VertexBuffer }; use glium::backend::{Context, Facade}; -use glium::draw_parameters::{BlendingFunction, LinearBlendingFactor}; use glium::index::PrimitiveType; use glium::texture::{ClientFormat, RawImage2d}; use std::borrow::Cow; @@ -103,10 +102,7 @@ impl Renderer { texture: self.device_objects.texture.sampled() }; let draw_params = DrawParameters { - blending_function: Some(BlendingFunction::Addition { - source: LinearBlendingFactor::SourceAlpha, - destination: LinearBlendingFactor::OneMinusSourceAlpha - }), + blend: Blend::alpha_blending(), scissor: Some(Rect { left: cmd.clip_rect.x as u32, bottom: (height as f32 - cmd.clip_rect.w) as u32,