Tweak example App drop order

alexheretic · Jun 29, 2024 · 2927d71 · 2927d71
1 parent 0697ced
commit 2927d71
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/gfx-glyph/examples/depth.rs b/gfx-glyph/examples/depth.rs
@@ -53,9 +53,6 @@ impl winit::application::ApplicationHandler for WinitApp {
 }
 
 struct App {
-    window: winit::window::Window,
-    gl_surface: glutin::surface::Surface<glutin::surface::WindowSurface>,
-    gl_context: glutin::context::PossiblyCurrentContext,
     device: gfx_device_gl::Device,
     encoder: gfx::Encoder<gfx_device_gl::Resources, gfx_device_gl::CommandBuffer>,
     color_view: gfx::handle::RenderTargetView<gfx_device_gl::Resources, Srgba8>,
@@ -64,6 +61,9 @@ struct App {
     view_size: PhysicalSize<u32>,
     interval: spin_sleep_util::Interval,
     reporter: spin_sleep_util::RateReporter,
+    gl_surface: glutin::surface::Surface<glutin::surface::WindowSurface>,
+    gl_context: glutin::context::PossiblyCurrentContext,
+    window: winit::window::Window,
 }
 
 impl App {

diff --git a/gfx-glyph/examples/paragraph.rs b/gfx-glyph/examples/paragraph.rs
@@ -69,9 +69,6 @@ impl winit::application::ApplicationHandler for WinitApp {
 }
 
 struct App {
-    window: winit::window::Window,
-    gl_surface: glutin::surface::Surface<glutin::surface::WindowSurface>,
-    gl_context: glutin::context::PossiblyCurrentContext,
     device: gfx_device_gl::Device,
     encoder: gfx::Encoder<gfx_device_gl::Resources, gfx_device_gl::CommandBuffer>,
     color_view: gfx::handle::RenderTargetView<gfx_device_gl::Resources, Srgba8>,
@@ -85,6 +82,9 @@ struct App {
     font_size: f32,
     zoom: f32,
     angle: f32,
+    gl_surface: glutin::surface::Surface<glutin::surface::WindowSurface>,
+    gl_context: glutin::context::PossiblyCurrentContext,
+    window: winit::window::Window,
 }
 
 impl App {

diff --git a/gfx-glyph/examples/performance.rs b/gfx-glyph/examples/performance.rs
@@ -63,9 +63,6 @@ impl winit::application::ApplicationHandler for WinitApp {
 }
 
 struct App {
-    window: winit::window::Window,
-    gl_surface: glutin::surface::Surface<glutin::surface::WindowSurface>,
-    gl_context: glutin::context::PossiblyCurrentContext,
     device: gfx_device_gl::Device,
     encoder: gfx::Encoder<gfx_device_gl::Resources, gfx_device_gl::CommandBuffer>,
     color_view: gfx::handle::RenderTargetView<gfx_device_gl::Resources, Srgba8>,
@@ -75,6 +72,9 @@ struct App {
     reporter: spin_sleep_util::RateReporter,
     text: String,
     font_size: f32,
+    gl_surface: glutin::surface::Surface<glutin::surface::WindowSurface>,
+    gl_context: glutin::context::PossiblyCurrentContext,
+    window: winit::window::Window,
 }
 
 impl App {

diff --git a/gfx-glyph/examples/pre_positioned.rs b/gfx-glyph/examples/pre_positioned.rs
@@ -55,9 +55,6 @@ impl winit::application::ApplicationHandler for WinitApp {
 }
 
 struct App {
-    window: winit::window::Window,
-    gl_surface: glutin::surface::Surface<glutin::surface::WindowSurface>,
-    gl_context: glutin::context::PossiblyCurrentContext,
     device: gfx_device_gl::Device,
     encoder: gfx::Encoder<gfx_device_gl::Resources, gfx_device_gl::CommandBuffer>,
     color_view: gfx::handle::RenderTargetView<gfx_device_gl::Resources, Srgba8>,
@@ -69,6 +66,9 @@ struct App {
     glyphs: Vec<SectionGlyph>,
     width: f32,
     height: f32,
+    gl_surface: glutin::surface::Surface<glutin::surface::WindowSurface>,
+    gl_context: glutin::context::PossiblyCurrentContext,
+    window: winit::window::Window,
 }
 
 impl App {

diff --git a/gfx-glyph/examples/varied.rs b/gfx-glyph/examples/varied.rs
@@ -57,9 +57,6 @@ impl winit::application::ApplicationHandler for WinitApp {
 }
 
 struct App {
-    window: winit::window::Window,
-    gl_surface: glutin::surface::Surface<glutin::surface::WindowSurface>,
-    gl_context: glutin::context::PossiblyCurrentContext,
     device: gfx_device_gl::Device,
     encoder: gfx::Encoder<gfx_device_gl::Resources, gfx_device_gl::CommandBuffer>,
     color_view: gfx::handle::RenderTargetView<gfx_device_gl::Resources, Srgba8>,
@@ -72,6 +69,9 @@ struct App {
     italic_font: FontId,
     serif_font: FontId,
     mono_font: FontId,
+    gl_surface: glutin::surface::Surface<glutin::surface::WindowSurface>,
+    gl_context: glutin::context::PossiblyCurrentContext,
+    window: winit::window::Window,
 }
 
 impl App {

diff --git a/glyph-brush/examples/draw_cache_guts.rs b/glyph-brush/examples/draw_cache_guts.rs
@@ -74,9 +74,6 @@ impl winit::application::ApplicationHandler for WinitApp {
 }
 
 struct App {
-    window: Window,
-    gl_surface: Surface<WindowSurface>,
-    gl_ctx: PossiblyCurrentContext,
     glyph_brush: GlyphBrush<Vertex, Extra, FontRef<'static>>,
     texture: GlGlyphTexture,
     text_pipe: GlTextPipe,
@@ -90,6 +87,9 @@ struct App {
     dimensions: PhysicalSize<u32>,
     fps: f64,
     title: String,
+    gl_surface: Surface<WindowSurface>,
+    gl_ctx: PossiblyCurrentContext,
+    window: Window,
 }
 
 impl App {

diff --git a/glyph-brush/examples/opengl.rs b/glyph-brush/examples/opengl.rs
@@ -97,9 +97,6 @@ impl winit::application::ApplicationHandler for WinitApp {
 }
 
 struct App {
-    window: Window,
-    gl_surface: Surface<WindowSurface>,
-    gl_ctx: PossiblyCurrentContext,
     glyph_brush: GlyphBrush<Vertex, Extra, FontRef<'static>>,
     texture: GlGlyphTexture,
     text_pipe: GlTextPipe,
@@ -109,6 +106,9 @@ struct App {
     reporter: spin_sleep_util::RateReporter,
     max_image_dimension: u32,
     dimensions: PhysicalSize<u32>,
+    gl_surface: Surface<WindowSurface>,
+    gl_ctx: PossiblyCurrentContext,
+    window: Window,
 }
 
 impl App {