Skip to content

Commit 7ba4584

Browse files
authored
Add default for texture format (#675)
1 parent fccfa12 commit 7ba4584

File tree

8 files changed

+19
-8
lines changed

8 files changed

+19
-8
lines changed

crates/bevy_pbr/src/render_graph/forward_pipeline/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pub(crate) fn build_forward_pipeline(shaders: &mut Assets<Shader>) -> PipelineDe
3434
},
3535
}),
3636
color_states: vec![ColorStateDescriptor {
37-
format: TextureFormat::Bgra8UnormSrgb,
37+
format: TextureFormat::default(),
3838
color_blend: BlendDescriptor {
3939
src_factor: BlendFactor::SrcAlpha,
4040
dst_factor: BlendFactor::OneMinusSrcAlpha,

crates/bevy_render/src/pipeline/pipeline.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ impl PipelineDescriptor {
9191
},
9292
}),
9393
color_states: vec![ColorStateDescriptor {
94-
format: TextureFormat::Bgra8UnormSrgb,
94+
format: TextureFormat::default(),
9595
color_blend: BlendDescriptor {
9696
src_factor: BlendFactor::SrcAlpha,
9797
dst_factor: BlendFactor::OneMinusSrcAlpha,

crates/bevy_render/src/render_graph/base.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ impl BaseRenderGraphBuilder for RenderGraph {
209209
mip_level_count: 1,
210210
sample_count: msaa.samples,
211211
dimension: TextureDimension::D2,
212-
format: TextureFormat::Bgra8UnormSrgb,
212+
format: TextureFormat::default(),
213213
usage: TextureUsage::OUTPUT_ATTACHMENT,
214214
},
215215
),

crates/bevy_render/src/texture/texture_dimension.rs

+11
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,17 @@ impl TextureFormat {
206206
}
207207
}
208208

209+
impl Default for TextureFormat {
210+
fn default() -> Self {
211+
if cfg!(target_os = "android") {
212+
// Bgra8UnormSrgb texture missing on some Android devices
213+
TextureFormat::Rgba8UnormSrgb
214+
} else {
215+
TextureFormat::Bgra8UnormSrgb
216+
}
217+
}
218+
}
219+
209220
bitflags::bitflags! {
210221
#[repr(transparent)]
211222
pub struct TextureUsage: u32 {

crates/bevy_sprite/src/render/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub fn build_sprite_sheet_pipeline(shaders: &mut Assets<Shader>) -> PipelineDesc
4040
},
4141
}),
4242
color_states: vec![ColorStateDescriptor {
43-
format: TextureFormat::Bgra8UnormSrgb,
43+
format: TextureFormat::default(),
4444
color_blend: BlendDescriptor {
4545
src_factor: BlendFactor::SrcAlpha,
4646
dst_factor: BlendFactor::OneMinusSrcAlpha,
@@ -88,7 +88,7 @@ pub fn build_sprite_pipeline(shaders: &mut Assets<Shader>) -> PipelineDescriptor
8888
},
8989
}),
9090
color_states: vec![ColorStateDescriptor {
91-
format: TextureFormat::Bgra8UnormSrgb,
91+
format: TextureFormat::default(),
9292
color_blend: BlendDescriptor {
9393
src_factor: BlendFactor::SrcAlpha,
9494
dst_factor: BlendFactor::OneMinusSrcAlpha,

crates/bevy_ui/src/render/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pub fn build_ui_pipeline(shaders: &mut Assets<Shader>) -> PipelineDescriptor {
4242
},
4343
}),
4444
color_states: vec![ColorStateDescriptor {
45-
format: TextureFormat::Bgra8UnormSrgb,
45+
format: TextureFormat::default(),
4646
color_blend: BlendDescriptor {
4747
src_factor: BlendFactor::SrcAlpha,
4848
dst_factor: BlendFactor::OneMinusSrcAlpha,

crates/bevy_wgpu/src/wgpu_type_converter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ impl WgpuFrom<&Window> for wgpu::SwapChainDescriptor {
562562
fn from(window: &Window) -> Self {
563563
wgpu::SwapChainDescriptor {
564564
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
565-
format: wgpu::TextureFormat::Bgra8UnormSrgb,
565+
format: TextureFormat::default().wgpu_into(),
566566
width: window.width(),
567567
height: window.height(),
568568
present_mode: if window.vsync() {

examples/window/multiple_windows.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ fn setup(
134134
mip_level_count: 1,
135135
sample_count: msaa.samples,
136136
dimension: TextureDimension::D2,
137-
format: TextureFormat::Bgra8UnormSrgb,
137+
format: TextureFormat::default(),
138138
usage: TextureUsage::OUTPUT_ATTACHMENT,
139139
},
140140
),

0 commit comments

Comments
 (0)