From c5ec153488a1e559aa3a5af7199df77d997f8af9 Mon Sep 17 00:00:00 2001
From: Benedikt Mandelkow <benedikt.mandelkow@rwth-aachen.de>
Date: Mon, 23 Nov 2020 00:30:06 +0100
Subject: [PATCH] update imgui 0.6

---
 Cargo.toml                                          |  2 +-
 implot-examples/examples-shared/Cargo.toml          |  2 +-
 implot-examples/implot-glium-demo/Cargo.toml        | 10 +++++-----
 implot-examples/implot-wgpu-demo/Cargo.toml         |  8 ++++----
 implot-examples/implot-wgpu-demo/src/support/mod.rs | 11 +++++++----
 implot-sys-bindgen/Cargo.toml                       |  2 +-
 implot-sys/Cargo.toml                               |  2 +-
 7 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e2df0d2..0759f8a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ readme = "README.md"
 
 [dependencies]
 implot-sys = { version = "0.2.0", path = "implot-sys" }
-imgui = { version = "0.5.0" }
+imgui = { version = "0.6.0" }
 bitflags = "1.0"
 parking_lot = "0.11"
 lazy_static = "1.1"
diff --git a/implot-examples/examples-shared/Cargo.toml b/implot-examples/examples-shared/Cargo.toml
index 892d458..fdf6be5 100644
--- a/implot-examples/examples-shared/Cargo.toml
+++ b/implot-examples/examples-shared/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2018"
 
 [dependencies]
 implot = { path = "../../" }
-imgui = "0.5.0"
+imgui = "0.6.0"
diff --git a/implot-examples/implot-glium-demo/Cargo.toml b/implot-examples/implot-glium-demo/Cargo.toml
index a6b4fc1..09a4bc6 100644
--- a/implot-examples/implot-glium-demo/Cargo.toml
+++ b/implot-examples/implot-glium-demo/Cargo.toml
@@ -11,12 +11,12 @@ publish = false
 
 [dependencies]
 clipboard = "0.5"
-glium = { version = "0.27", default-features = true }
+glium = { version = "0.28", default-features = true }
 image = "0.23"
-imgui-sys = "0.5.0"
-imgui = "0.5.0"
-imgui-glium-renderer = "0.5.0"
-imgui-winit-support = "0.5.0"
+imgui-sys = "0.6.0"
+imgui = "0.6.0"
+imgui-glium-renderer = "0.6.0"
+imgui-winit-support = "0.6.0"
 
 implot-sys = { path = "../../implot-sys" }
 implot = { path = "../../" }
diff --git a/implot-examples/implot-wgpu-demo/Cargo.toml b/implot-examples/implot-wgpu-demo/Cargo.toml
index 932ca67..42bae72 100644
--- a/implot-examples/implot-wgpu-demo/Cargo.toml
+++ b/implot-examples/implot-wgpu-demo/Cargo.toml
@@ -8,9 +8,9 @@ edition = "2018"
 implot = { path = "../../" }
 
 wgpu = "^0.6.0"
-winit = "^0.22.2" # opening windows and handling input
+winit = "^0.23" # opening windows and handling input
 futures = "^0.3.5" # executing async functions using blocking executor
-imgui = "^0.5.0"
-imgui-winit-support = "^0.5.0" # connection of input (keys) to imgui
-imgui-wgpu = "^0.11.0" # imgui backend for drawing using wgpu
+imgui = "^0.6.0"
+imgui-winit-support = "^0.6.0" # connection of input (keys) to imgui
+imgui-wgpu = "^0.12.0" # imgui backend for drawing using wgpu
 examples-shared = { path = "../examples-shared" }
diff --git a/implot-examples/implot-wgpu-demo/src/support/mod.rs b/implot-examples/implot-wgpu-demo/src/support/mod.rs
index a514204..933e9ed 100644
--- a/implot-examples/implot-wgpu-demo/src/support/mod.rs
+++ b/implot-examples/implot-wgpu-demo/src/support/mod.rs
@@ -63,7 +63,7 @@ pub fn init(title: &str) -> System {
     // Set up swap chain
     let sc_desc = wgpu::SwapChainDescriptor {
         usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
-        format: wgpu::TextureFormat::Bgra8Unorm,
+        format: wgpu::TextureFormat::Bgra8UnormSrgb,
         width: size.width,
         height: size.height,
         present_mode: wgpu::PresentMode::Mailbox,
@@ -99,9 +99,12 @@ pub fn init(title: &str) -> System {
     //
     // Set up dear imgui wgpu renderer
     //
-    let renderer = RendererConfig::new()
-        .set_texture_format(sc_desc.format)
-        .build(&mut imgui, &device, &queue);
+    let renderer_config = RendererConfig {
+        texture_format: sc_desc.format,
+        ..Default::default()
+    };
+
+    let renderer = Renderer::new(&mut imgui, &device, &queue, renderer_config);
 
     System {
         event_loop,
diff --git a/implot-sys-bindgen/Cargo.toml b/implot-sys-bindgen/Cargo.toml
index 0a00bd3..d6bdc60 100644
--- a/implot-sys-bindgen/Cargo.toml
+++ b/implot-sys-bindgen/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2018"
 
 [dependencies]
 bindgen = "0.55.1"
-imgui-sys = { version = "0.5.0" }
+imgui-sys = { version = "0.6.0" }
diff --git a/implot-sys/Cargo.toml b/implot-sys/Cargo.toml
index f64dd3d..9c41fdd 100644
--- a/implot-sys/Cargo.toml
+++ b/implot-sys/Cargo.toml
@@ -12,7 +12,7 @@ build = "build.rs"
 links = "implot"
 
 [dependencies]
-imgui-sys = "0.5.0"
+imgui-sys = "0.6.0"
 
 [build-dependencies]
 cc = "1.0"