Skip to content

Commit 19898e1

Browse files
authored
Temporarily disable color on logs due to tracing regression (#129)
Disable color due to bevyengine/bevy#21164 Ultimately caused by tokio-rs/tracing#3378
1 parent 6a28e7f commit 19898e1

3 files changed

Lines changed: 41 additions & 6 deletions

File tree

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "naga_oil"
3-
version = "0.19.0"
3+
version = "0.19.1"
44
edition = "2021"
55
license = "MIT OR Apache-2.0"
66
description = "a crate for combining and manipulating shaders using naga IR"

atomics.txt

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
var<workgroup> atomX_naga_oil_mod_XORSXG5C7NVXWI5LMMUX: atomic<u32>;
2+
3+
fn entry_pointX_naga_oil_mod_XORSXG5C7NVXWI5LMMUX() -> f32 {
4+
var y: u32;
5+
6+
atomicStore((&atomX_naga_oil_mod_XORSXG5C7NVXWI5LMMUX), 1u);
7+
let _e3: u32 = atomicLoad((&atomX_naga_oil_mod_XORSXG5C7NVXWI5LMMUX));
8+
y = _e3;
9+
let _e7: u32 = atomicAdd((&atomX_naga_oil_mod_XORSXG5C7NVXWI5LMMUX), 2u);
10+
let _e8: u32 = y;
11+
y = (_e8 + _e7);
12+
let _e12: u32 = atomicSub((&atomX_naga_oil_mod_XORSXG5C7NVXWI5LMMUX), 1u);
13+
let _e13: u32 = y;
14+
y = (_e13 + _e12);
15+
let _e17: u32 = atomicMax((&atomX_naga_oil_mod_XORSXG5C7NVXWI5LMMUX), 5u);
16+
let _e18: u32 = y;
17+
y = (_e18 + _e17);
18+
let _e22: u32 = atomicMin((&atomX_naga_oil_mod_XORSXG5C7NVXWI5LMMUX), 4u);
19+
let _e23: u32 = y;
20+
y = (_e23 + _e22);
21+
let _e25: u32 = y;
22+
let _e27: u32 = atomicExchange((&atomX_naga_oil_mod_XORSXG5C7NVXWI5LMMUX), _e25);
23+
let _e28: u32 = y;
24+
y = (_e28 + _e27);
25+
let _e33: _atomic_compare_exchange_resultUint4_ = atomicCompareExchangeWeak((&atomX_naga_oil_mod_XORSXG5C7NVXWI5LMMUX), 12u, 0u);
26+
if _e33.exchanged {
27+
let _e36: u32 = y;
28+
y = (_e36 + _e33.old_value);
29+
}
30+
let _e38: u32 = y;
31+
return f32(_e38);
32+
}
33+
34+
fn main() -> f32 {
35+
let _e0: f32 = entry_pointX_naga_oil_mod_XORSXG5C7NVXWI5LMMUX();
36+
return _e0;
37+
}
38+

src/compose/error.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,6 @@ fn supports_color() -> bool {
306306
// termcolor doesn't expose this logic when using custom buffers
307307
#[cfg(not(any(test, target_arch = "wasm32")))]
308308
fn supports_color() -> bool {
309-
match std::env::var_os("TERM") {
310-
None if cfg!(unix) => false,
311-
Some(term) if term == "dumb" => false,
312-
_ => std::env::var_os("NO_COLOR").is_none(),
313-
}
309+
// TODO: https://github.com/tokio-rs/tracing/issues/3378
310+
false
314311
}

0 commit comments

Comments
 (0)