Skip to content

Commit 3f952a0

Browse files
committed
Ci.
1 parent 86dc215 commit 3f952a0

File tree

8 files changed

+25
-20
lines changed

8 files changed

+25
-20
lines changed

crates/bevy_core_pipeline/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ pub mod schedule;
1818
pub mod tonemapping;
1919
pub mod upscaling;
2020

21+
pub use bevy_light::Skybox;
2122
pub use fullscreen_vertex_shader::FullscreenShader;
2223
pub use schedule::{Core2d, Core2dSystems, Core3d, Core3dSystems};
23-
pub use bevy_light::Skybox;
2424

2525
mod fullscreen_vertex_shader;
2626
mod skybox;

crates/bevy_pbr/src/render/gpu_preprocess.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ use bevy_render::{
4646
binding_types::{storage_buffer, storage_buffer_read_only, texture_2d, uniform_buffer},
4747
BindGroup, BindGroupEntries, BindGroupLayoutDescriptor, BindingResource, Buffer,
4848
BufferBinding, CachedComputePipelineId, ComputePassDescriptor, ComputePipelineDescriptor,
49-
DynamicBindGroupLayoutEntries, PipelineCache, RawBufferVec, ShaderStages,
50-
ShaderType, SpecializedComputePipeline, SpecializedComputePipelines,
51-
TextureSampleType, UninitBufferVec,
49+
DynamicBindGroupLayoutEntries, PipelineCache, RawBufferVec, ShaderStages, ShaderType,
50+
SpecializedComputePipeline, SpecializedComputePipelines, TextureSampleType,
51+
UninitBufferVec,
5252
},
5353
renderer::{RenderContext, RenderDevice, RenderQueue, ViewQuery},
5454
settings::WgpuFeatures,

crates/bevy_pbr/src/transmission/node.rs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,15 @@ pub fn main_transmissive_pass_3d(
3333
) {
3434
let view_entity = view.entity();
3535

36-
let (camera, extracted_view, transmission_settings, target, transmission, depth, resolution_override) =
37-
view.into_inner();
36+
let (
37+
camera,
38+
extracted_view,
39+
transmission_settings,
40+
target,
41+
transmission,
42+
depth,
43+
resolution_override,
44+
) = view.into_inner();
3845

3946
let Some(transmissive_phase) = transmissive_phases.get(&extracted_view.retained_view_entity)
4047
else {

crates/bevy_post_process/src/effect_stack/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ use bevy_render::{
3838
binding_types::{sampler, texture_2d, uniform_buffer},
3939
BindGroupEntries, BindGroupLayoutDescriptor, BindGroupLayoutEntries,
4040
CachedRenderPipelineId, ColorTargetState, ColorWrites, DynamicUniformBuffer, Extent3d,
41-
FilterMode, FragmentState, MipmapFilterMode, Operations, PipelineCache, RenderPassColorAttachment,
42-
RenderPassDescriptor, RenderPipelineDescriptor, Sampler, SamplerBindingType,
43-
SamplerDescriptor, ShaderStages, SpecializedRenderPipeline, SpecializedRenderPipelines,
44-
TextureDimension, TextureFormat, TextureSampleType,
41+
FilterMode, FragmentState, MipmapFilterMode, Operations, PipelineCache,
42+
RenderPassColorAttachment, RenderPassDescriptor, RenderPipelineDescriptor, Sampler,
43+
SamplerBindingType, SamplerDescriptor, ShaderStages, SpecializedRenderPipeline,
44+
SpecializedRenderPipelines, TextureDimension, TextureFormat, TextureSampleType,
4545
},
4646
renderer::{RenderContext, RenderDevice, RenderQueue, ViewQuery},
4747
texture::GpuImage,

crates/bevy_render/src/renderer/render_context.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use super::WgpuWrapper;
2-
use bevy_derive::{Deref, DerefMut};
32
use crate::diagnostic::internal::DiagnosticsRecorder;
43
use crate::render_phase::TrackedRenderPass;
54
use crate::render_resource::{CommandEncoder, RenderPassDescriptor};
65
use crate::renderer::RenderDevice;
6+
use bevy_derive::{Deref, DerefMut};
77
use bevy_ecs::change_detection::Tick;
88
use bevy_ecs::component::ComponentId;
99
use bevy_ecs::prelude::*;
@@ -13,8 +13,8 @@ use bevy_ecs::system::{
1313
};
1414
use bevy_ecs::world::unsafe_world_cell::UnsafeWorldCell;
1515
use bevy_ecs::world::DeferredWorld;
16-
use core::marker::PhantomData;
1716
use bevy_log::info_span;
17+
use core::marker::PhantomData;
1818
use wgpu::CommandBuffer;
1919

2020
#[derive(Default)]

crates/bevy_solari/src/pathtracer/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ mod prepare;
55
use crate::SolariPlugins;
66
use bevy_app::{App, Plugin};
77
use bevy_asset::embedded_asset;
8+
use bevy_camera::Hdr;
89
use bevy_core_pipeline::schedule::{Core3d, Core3dSystems};
910
use bevy_ecs::{component::Component, reflect::ReflectComponent, schedule::IntoScheduleConfigs};
1011
use bevy_reflect::{std_traits::ReflectDefault, Reflect};
11-
use bevy_camera::Hdr;
1212
use bevy_render::{
13-
renderer::RenderDevice, ExtractSchedule, Render, RenderApp, RenderStartup,
14-
RenderSystems,
13+
renderer::RenderDevice, ExtractSchedule, Render, RenderApp, RenderStartup, RenderSystems,
1514
};
1615
use extract::extract_pathtracer;
1716
use node::{init_pathtracer_pipelines, pathtracer};

crates/bevy_solari/src/realtime/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ mod prepare;
55
use crate::SolariPlugins;
66
use bevy_app::{App, Plugin};
77
use bevy_asset::embedded_asset;
8+
use bevy_camera::Hdr;
89
use bevy_core_pipeline::{
910
prepass::{
1011
DeferredPrepass, DeferredPrepassDoubleBuffer, DepthPrepass, DepthPrepassDoubleBuffer,
@@ -15,10 +16,8 @@ use bevy_core_pipeline::{
1516
use bevy_ecs::{component::Component, reflect::ReflectComponent, schedule::IntoScheduleConfigs};
1617
use bevy_pbr::DefaultOpaqueRendererMethod;
1718
use bevy_reflect::{std_traits::ReflectDefault, Reflect};
18-
use bevy_camera::Hdr;
1919
use bevy_render::{
20-
renderer::RenderDevice, ExtractSchedule, Render, RenderApp, RenderStartup,
21-
RenderSystems,
20+
renderer::RenderDevice, ExtractSchedule, Render, RenderApp, RenderStartup, RenderSystems,
2221
};
2322
use bevy_shader::load_shader_library;
2423
use extract::extract_solari_lighting;

crates/bevy_solari/src/realtime/node.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ use bevy_render::{
1919
},
2020
BindGroupEntries, BindGroupLayoutDescriptor, BindGroupLayoutEntries,
2121
CachedComputePipelineId, ComputePassDescriptor, ComputePipelineDescriptor, LoadOp,
22-
PipelineCache, RenderPassDescriptor, ShaderStages, StorageTextureAccess,
23-
TextureFormat, TextureSampleType,
22+
PipelineCache, RenderPassDescriptor, ShaderStages, StorageTextureAccess, TextureFormat,
23+
TextureSampleType,
2424
},
2525
renderer::{RenderContext, RenderDevice, ViewQuery},
2626
view::{ViewTarget, ViewUniform, ViewUniformOffset, ViewUniforms},

0 commit comments

Comments
 (0)