forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Image::default for 1 pixel white texture directly (#7884)

Browse Source 
for place holder image, it should use `default` directly.
This commit is contained in:
shuo 2023-03-04 12:29:10 +00:00
parent 6beca13553
commit 0b794c8f1e
4 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/bevy_pbr/src/render/mesh.rs
View File

@ -484,12 +484,7 @@ impl FromWorld for MeshPipeline {
// A 1x1x1 'all 1.0' texture to use as a dummy texture to use in place of optional StandardMaterial textures // A 1x1x1 'all 1.0' texture to use as a dummy texture to use in place of optional StandardMaterial textures
let dummy_white_gpu_image = { let dummy_white_gpu_image = {
let image = Image::new_fill( let image = Image::default();
Extent3d::default(),
TextureDimension::D2,
&[255u8; 4],
TextureFormat::bevy_default(),
);
let texture = render_device.create_texture(&image.texture_descriptor); let texture = render_device.create_texture(&image.texture_descriptor);
let sampler = match image.sampler_descriptor { let sampler = match image.sampler_descriptor {
ImageSampler::Default => (**default_sampler).clone(), ImageSampler::Default => (**default_sampler).clone(),

1
crates/bevy_render/src/texture/image.rs
View File

@ -172,6 +172,7 @@ impl ImageSampler {
pub struct DefaultImageSampler(pub(crate) Sampler); pub struct DefaultImageSampler(pub(crate) Sampler);
impl Default for Image { impl Default for Image {
/// default is a 1x1x1 all '1.0' texture
fn default() -> Self { fn default() -> Self {
let format = wgpu::TextureFormat::bevy_default(); let format = wgpu::TextureFormat::bevy_default();
let data = vec![255; format.pixel_size()]; let data = vec![255; format.pixel_size()];

7
crates/bevy_sprite/src/mesh2d/mesh.rs
View File

@ -208,12 +208,7 @@ impl FromWorld for Mesh2dPipeline {
}); });
// A 1x1x1 'all 1.0' texture to use as a dummy texture to use in place of optional StandardMaterial textures // A 1x1x1 'all 1.0' texture to use as a dummy texture to use in place of optional StandardMaterial textures
let dummy_white_gpu_image = { let dummy_white_gpu_image = {
let image = Image::new_fill( let image = Image::default();
Extent3d::default(),
TextureDimension::D2,
&[255u8; 4],
TextureFormat::bevy_default(),
);
let texture = render_device.create_texture(&image.texture_descriptor); let texture = render_device.create_texture(&image.texture_descriptor);
let sampler = match image.sampler_descriptor { let sampler = match image.sampler_descriptor {
ImageSampler::Default => (**default_sampler).clone(), ImageSampler::Default => (**default_sampler).clone(),

7
crates/bevy_sprite/src/render/mod.rs
View File

@ -91,12 +91,7 @@ impl FromWorld for SpritePipeline {
label: Some("sprite_material_layout"), label: Some("sprite_material_layout"),
}); });
let dummy_white_gpu_image = { let dummy_white_gpu_image = {
let image = Image::new_fill( let image = Image::default();
Extent3d::default(),
TextureDimension::D2,
&[255u8; 4],
TextureFormat::bevy_default(),
);
let texture = render_device.create_texture(&image.texture_descriptor); let texture = render_device.create_texture(&image.texture_descriptor);
let sampler = match image.sampler_descriptor { let sampler = match image.sampler_descriptor {
ImageSampler::Default => (**default_sampler).clone(), ImageSampler::Default => (**default_sampler).clone(),