Skip to content

Commit

Permalink
chore: update platform-specific configurations in renderer
Browse files Browse the repository at this point in the history 
- update target dependencies in `cargo.toml`
- update platform-specific configurations in `renderer.rs`
  • Loading branch information
@falcucci
falcucci committed Sep 19, 2024
1 parent 79e0005 commit bf10625
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ termcolor = "1.4.1"
wgpu = { workspace = true, features = ["glsl"] }
winit = { workspace = true }

[target.'cfg(not(target_os = "macos"))'.dependencies]
[target.'cfg(not(any(target_os = "linux", target_os = "macos")))'.dependencies]
wgpu-profiler = { version = "0.18.0", features = ["tracy"] }

[dev-dependencies]
Expand Down
32 changes: 16 additions & 16 deletions src/renderer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use glam::*;
use glamour::{AsRaw, Rect};
use wgpu::*;

#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
use wgpu_profiler::{GpuProfiler, GpuProfilerSettings};

use crate::{
Expand All @@ -32,7 +32,7 @@ pub struct Renderer {
pub queue: Queue,
pub shaders: HashMap<String, ShaderModule>,

#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
pub profiler: GpuProfiler,

pub format: TextureFormat,
Expand Down Expand Up @@ -157,7 +157,7 @@ impl Renderer {
);
let shaders = shaders.await;

#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
let mut profiler = GpuProfiler::new_with_tracy_client(
GpuProfilerSettings {
// enable_timer_queries: false,
Expand All @@ -169,7 +169,7 @@ impl Renderer {
)
.expect("Could not create profiler");

#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
profiler
.change_settings(GpuProfilerSettings {
enable_timer_queries: false,
Expand All @@ -183,7 +183,7 @@ impl Renderer {
queue,
shaders,

#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
profiler,

format,
Expand Down Expand Up @@ -248,7 +248,7 @@ impl Renderer {
// | Features::TIMESTAMP_QUERY_INSIDE_ENCODERS
}

#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
{
Features::PUSH_CONSTANTS
| Features::SPIRV_SHADER_PASSTHROUGH
Expand Down Expand Up @@ -375,7 +375,7 @@ impl Renderer {
);
}

#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
{
self.profiler.resolve_queries(&mut encoder);

Expand All @@ -396,7 +396,7 @@ impl Renderer {
constants: ShaderConstants,
resources: &Resources,
) {
#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
let mut mask_scope = self.profiler.scope("mask", encoder, &self.device);

#[cfg(target_os = "macos")]
Expand All @@ -405,7 +405,7 @@ impl Renderer {
if let Some(mask_contents) = mask_contents {
for batch in mask_contents.primitives.iter() {
for drawable in self.drawables.iter_mut() {
#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
let mut render_pass = mask_scope.scoped_render_pass(
"Mask",
&self.device,
Expand Down Expand Up @@ -445,7 +445,7 @@ impl Renderer {

profiling::scope!("drawable", &drawable.name);

#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
let mut drawable_scope = render_pass.scope(&drawable.name, &self.device);

#[cfg(target_os = "macos")]
Expand Down Expand Up @@ -479,7 +479,7 @@ impl Renderer {
}
}
} else {
#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
mask_scope.scoped_render_pass(
"Clear Mask Texture",
&self.device,
Expand Down Expand Up @@ -531,7 +531,7 @@ impl Renderer {
constants: ShaderConstants,
resources: &Resources,
) {
#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
let mut content_scope = self
.profiler
.scope("content", context.encoder, &self.device);
Expand All @@ -540,7 +540,7 @@ impl Renderer {
let content_scope = context.encoder;

if *context.first {
#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
content_scope.scoped_render_pass(
"Clear Offscreen Texture",
&self.device,
Expand Down Expand Up @@ -579,7 +579,7 @@ impl Renderer {
'offscreen_copy: for batch in contents.primitives.iter() {
for drawable in self.drawables.iter() {
if drawable.has_work(batch) && drawable.requires_offscreen_copy() {
#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
let mut copy_scope =
content_scope.scope("Copy Frame to Offscreen", &self.device);

Expand Down Expand Up @@ -630,7 +630,7 @@ impl Renderer {
}
};

#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
let mut render_pass = content_scope.scoped_render_pass(
"Layer Render Pass",
&self.device,
Expand Down Expand Up @@ -660,7 +660,7 @@ impl Renderer {

profiling::scope!("drawable", &drawable.name);

#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
let mut drawable_scope = render_pass.scope(&drawable.name, &self.device);

#[cfg(target_os = "macos")]
Expand Down

0 comments on commit bf10625

Please sign in to comment.