Skip to content

Commit 96dd873

Browse files
committed
global fn enable_debug_layer()
1 parent 3cdcc86 commit 96dd873

File tree

6 files changed

+24
-15
lines changed

6 files changed

+24
-15
lines changed

generated/graphics/cargo-gpu/mygraphics/src/ash_renderer/mod.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::ash_renderer::device::MyDevice;
22
use crate::ash_renderer::graphics::{MyRenderPipelineManager, MyRenderer};
33
use crate::ash_renderer::swapchain::MySwapchainManager;
4+
use crate::enable_debug_layer;
45
use ash::util::read_spv;
56
use mygraphics_shaders::ShaderConstants;
67
use raw_window_handle::HasDisplayHandle as _;
@@ -16,10 +17,6 @@ pub mod single_command_buffer;
1617
pub mod swapchain;
1718

1819
pub fn main() -> anyhow::Result<()> {
19-
let enable_debug_layer = std::env::var("DEBUG_LAYER")
20-
.map(|e| !(e == "0" || e == "false"))
21-
.unwrap_or(false);
22-
2320
// runtime setup
2421
let event_loop = EventLoop::new()?;
2522
// FIXME(eddyb) incomplete `winit` upgrade, follow the guides in:
@@ -35,7 +32,7 @@ pub fn main() -> anyhow::Result<()> {
3532
)?;
3633

3734
let extensions = ash_window::enumerate_required_extensions(window.display_handle()?.as_raw())?;
38-
let device = MyDevice::new(extensions, enable_debug_layer)?;
35+
let device = MyDevice::new(extensions, enable_debug_layer())?;
3936
let mut swapchain = MySwapchainManager::new(device.clone(), window)?;
4037
let mut renderer = MyRenderer::new(MyRenderPipelineManager::new(
4138
device.clone(),

generated/graphics/cargo-gpu/mygraphics/src/main.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,9 @@ pub mod ash_renderer;
7575
pub fn main() -> anyhow::Result<()> {
7676
ash_renderer::main()
7777
}
78+
79+
pub fn enable_debug_layer() -> bool {
80+
std::env::var("DEBUG_LAYER")
81+
.map(|e| !(e == "0" || e == "false"))
82+
.unwrap_or(false)
83+
}

generated/graphics/spirv-builder/mygraphics/src/ash_renderer/mod.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::ash_renderer::device::MyDevice;
22
use crate::ash_renderer::graphics::{MyRenderPipelineManager, MyRenderer};
33
use crate::ash_renderer::swapchain::MySwapchainManager;
4+
use crate::enable_debug_layer;
45
use ash::util::read_spv;
56
use mygraphics_shaders::ShaderConstants;
67
use raw_window_handle::HasDisplayHandle as _;
@@ -16,10 +17,6 @@ pub mod single_command_buffer;
1617
pub mod swapchain;
1718

1819
pub fn main() -> anyhow::Result<()> {
19-
let enable_debug_layer = std::env::var("DEBUG_LAYER")
20-
.map(|e| !(e == "0" || e == "false"))
21-
.unwrap_or(false);
22-
2320
// runtime setup
2421
let event_loop = EventLoop::new()?;
2522
// FIXME(eddyb) incomplete `winit` upgrade, follow the guides in:
@@ -35,7 +32,7 @@ pub fn main() -> anyhow::Result<()> {
3532
)?;
3633

3734
let extensions = ash_window::enumerate_required_extensions(window.display_handle()?.as_raw())?;
38-
let device = MyDevice::new(extensions, enable_debug_layer)?;
35+
let device = MyDevice::new(extensions, enable_debug_layer())?;
3936
let mut swapchain = MySwapchainManager::new(device.clone(), window)?;
4037
let mut renderer = MyRenderer::new(MyRenderPipelineManager::new(
4138
device.clone(),

generated/graphics/spirv-builder/mygraphics/src/main.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,9 @@ pub mod ash_renderer;
7575
pub fn main() -> anyhow::Result<()> {
7676
ash_renderer::main()
7777
}
78+
79+
pub fn enable_debug_layer() -> bool {
80+
std::env::var("DEBUG_LAYER")
81+
.map(|e| !(e == "0" || e == "false"))
82+
.unwrap_or(false)
83+
}

graphics/mygraphics/src/ash_renderer/mod.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::ash_renderer::device::MyDevice;
22
use crate::ash_renderer::graphics::{MyRenderPipelineManager, MyRenderer};
33
use crate::ash_renderer::swapchain::MySwapchainManager;
4+
use crate::enable_debug_layer;
45
use ash::util::read_spv;
56
use mygraphics_shaders::ShaderConstants;
67
use raw_window_handle::HasDisplayHandle as _;
@@ -16,10 +17,6 @@ pub mod single_command_buffer;
1617
pub mod swapchain;
1718

1819
pub fn main() -> anyhow::Result<()> {
19-
let enable_debug_layer = std::env::var("DEBUG_LAYER")
20-
.map(|e| !(e == "0" || e == "false"))
21-
.unwrap_or(false);
22-
2320
// runtime setup
2421
let event_loop = EventLoop::new()?;
2522
// FIXME(eddyb) incomplete `winit` upgrade, follow the guides in:
@@ -35,7 +32,7 @@ pub fn main() -> anyhow::Result<()> {
3532
)?;
3633

3734
let extensions = ash_window::enumerate_required_extensions(window.display_handle()?.as_raw())?;
38-
let device = MyDevice::new(extensions, enable_debug_layer)?;
35+
let device = MyDevice::new(extensions, enable_debug_layer())?;
3936
let mut swapchain = MySwapchainManager::new(device.clone(), window)?;
4037
let mut renderer = MyRenderer::new(MyRenderPipelineManager::new(
4138
device.clone(),

graphics/mygraphics/src/main.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,9 @@ pub mod ash_renderer;
7575
pub fn main() -> anyhow::Result<()> {
7676
ash_renderer::main()
7777
}
78+
79+
pub fn enable_debug_layer() -> bool {
80+
std::env::var("DEBUG_LAYER")
81+
.map(|e| !(e == "0" || e == "false"))
82+
.unwrap_or(false)
83+
}

0 commit comments

Comments
 (0)