From 7268d35be72740e937a033bc3f81a922691c9096 Mon Sep 17 00:00:00 2001 From: Malik Olivier Boussejra Date: Sat, 1 Dec 2018 17:57:01 +0900 Subject: [PATCH] [gfx_examples] Update glutin to 0.19.0 Attempt to fix #172 for gfx back-end. --- imgui-examples/Cargo.toml | 4 ++-- imgui-examples/examples/support_gfx/mod.rs | 4 ++-- imgui-glutin-support/Cargo.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/imgui-examples/Cargo.toml b/imgui-examples/Cargo.toml index 99d7b4a..a9b9e76 100644 --- a/imgui-examples/Cargo.toml +++ b/imgui-examples/Cargo.toml @@ -10,8 +10,8 @@ publish = false [dev-dependencies] gfx = "0.17" -gfx_window_glutin = "0.26" -glutin = "0.18" +gfx_window_glutin = "0.27" +glutin = "0.19" imgui = { version = "0.0.22-pre", path = "../" } imgui-gfx-renderer = { version = "0.0.22-pre", path = "../imgui-gfx-renderer" } imgui-glutin-support = { version = "0.0.22-pre", path = "../imgui-glutin-support" } diff --git a/imgui-examples/examples/support_gfx/mod.rs b/imgui-examples/examples/support_gfx/mod.rs index aa385d4..c8fad01 100644 --- a/imgui-examples/examples/support_gfx/mod.rs +++ b/imgui-examples/examples/support_gfx/mod.rs @@ -6,7 +6,7 @@ use std::time::Instant; pub fn run bool>(title: String, clear_color: [f32; 4], mut run_ui: F) { use gfx::{self, Device}; use gfx_window_glutin; - use glutin::{self, GlContext}; + use glutin; type ColorFormat = gfx::format::Rgba8; type DepthFormat = gfx::format::DepthStencil; @@ -140,7 +140,7 @@ pub fn run bool>(title: String, clear_color: [f32; 4], mut run_ .render(ui, &mut factory, &mut encoder) .expect("Rendering failed"); encoder.flush(&mut device); - window.context().swap_buffers().unwrap(); + window.swap_buffers().unwrap(); device.cleanup(); } } diff --git a/imgui-glutin-support/Cargo.toml b/imgui-glutin-support/Cargo.toml index b50348d..5b9648b 100644 --- a/imgui-glutin-support/Cargo.toml +++ b/imgui-glutin-support/Cargo.toml @@ -12,5 +12,5 @@ categories = ["gui"] travis-ci = { repository = "Gekkio/imgui-rs" } [dependencies] -glutin = ">= 0.17, <= 0.18" +glutin = ">= 0.17, <= 0.19" imgui = { version = "0.0.22-pre", path = "../" }