Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename Render* to Gpu* #6968

Closed
wants to merge 2 commits into from
Closed

Rename Render* to Gpu* #6968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d87484f
renamed type names Render{Device, Queue, Adapter, AdapterInfo, Instan…
kurtkuehnert Dec 16, 2022
e2bfa4a
change back to RenderContext and moved it to the render_graph module
kurtkuehnert Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions crates/bevy_core_pipeline/src/bloom/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use bevy_ecs::{
};
use bevy_math::UVec2;
use bevy_reflect::{Reflect, TypeUuid};
use bevy_render::render_graph::RenderContext;
use bevy_render::{
camera::ExtractedCamera,
extract_component::{
Expand All @@ -19,7 +20,7 @@ use bevy_render::{
render_graph::{Node, NodeRunError, RenderGraph, RenderGraphContext, SlotInfo, SlotType},
render_phase::TrackedRenderPass,
render_resource::*,
renderer::{RenderContext, RenderDevice},
renderer::GpuDevice,
texture::{CachedTexture, TextureCache},
view::ViewTarget,
RenderApp, RenderStage,
Expand Down Expand Up @@ -232,7 +233,7 @@ impl Node for BloomNode {
{
let view = &BloomTextures::texture_view(&textures.texture_a, 0);
let mut prefilter_pass =
TrackedRenderPass::new(render_context.command_encoder.begin_render_pass(
TrackedRenderPass::new(render_context.gpu_command_encoder.begin_render_pass(
&RenderPassDescriptor {
label: Some("bloom_prefilter_pass"),
color_attachments: &[Some(RenderPassColorAttachment {
Expand All @@ -258,7 +259,7 @@ impl Node for BloomNode {
for mip in 1..textures.mip_count {
let view = &BloomTextures::texture_view(&textures.texture_a, mip);
let mut downsampling_pass =
TrackedRenderPass::new(render_context.command_encoder.begin_render_pass(
TrackedRenderPass::new(render_context.gpu_command_encoder.begin_render_pass(
&RenderPassDescriptor {
label: Some("bloom_downsampling_pass"),
color_attachments: &[Some(RenderPassColorAttachment {
Expand All @@ -284,7 +285,7 @@ impl Node for BloomNode {
for mip in (1..textures.mip_count).rev() {
let view = &BloomTextures::texture_view(&textures.texture_b, mip - 1);
let mut upsampling_pass =
TrackedRenderPass::new(render_context.command_encoder.begin_render_pass(
TrackedRenderPass::new(render_context.gpu_command_encoder.begin_render_pass(
&RenderPassDescriptor {
label: Some("bloom_upsampling_pass"),
color_attachments: &[Some(RenderPassColorAttachment {
Expand All @@ -309,7 +310,7 @@ impl Node for BloomNode {

{
let mut upsampling_final_pass =
TrackedRenderPass::new(render_context.command_encoder.begin_render_pass(
TrackedRenderPass::new(render_context.gpu_command_encoder.begin_render_pass(
&RenderPassDescriptor {
label: Some("bloom_upsampling_final_pass"),
color_attachments: &[Some(view_target.get_unsampled_color_attachment(
Expand Down Expand Up @@ -350,9 +351,9 @@ struct BloomPipelines {

impl FromWorld for BloomPipelines {
fn from_world(world: &mut World) -> Self {
let render_device = world.resource::<RenderDevice>();
let gpu_device = world.resource::<GpuDevice>();

let sampler = render_device.create_sampler(&SamplerDescriptor {
let sampler = gpu_device.create_sampler(&SamplerDescriptor {
min_filter: FilterMode::Linear,
mag_filter: FilterMode::Linear,
address_mode_u: AddressMode::ClampToEdge,
Expand All @@ -361,7 +362,7 @@ impl FromWorld for BloomPipelines {
});

let downsampling_bind_group_layout =
render_device.create_bind_group_layout(&BindGroupLayoutDescriptor {
gpu_device.create_bind_group_layout(&BindGroupLayoutDescriptor {
label: Some("bloom_downsampling_bind_group_layout"),
entries: &[
// Upsampled input texture (downsampled for final upsample)
Expand Down Expand Up @@ -397,7 +398,7 @@ impl FromWorld for BloomPipelines {
});

let upsampling_bind_group_layout =
render_device.create_bind_group_layout(&BindGroupLayoutDescriptor {
gpu_device.create_bind_group_layout(&BindGroupLayoutDescriptor {
label: Some("bloom_upsampling_bind_group_layout"),
entries: &[
// Downsampled input texture
Expand Down Expand Up @@ -563,7 +564,7 @@ impl BloomTextures {
fn prepare_bloom_textures(
mut commands: Commands,
mut texture_cache: ResMut<TextureCache>,
render_device: Res<RenderDevice>,
gpu_device: Res<GpuDevice>,
views: Query<(Entity, &ExtractedCamera), With<BloomUniform>>,
) {
let mut texture_as = HashMap::default();
Expand Down Expand Up @@ -594,13 +595,13 @@ fn prepare_bloom_textures(
texture_descriptor.label = Some("bloom_texture_a");
let texture_a = texture_as
.entry(camera.target.clone())
.or_insert_with(|| texture_cache.get(&render_device, texture_descriptor.clone()))
.or_insert_with(|| texture_cache.get(&gpu_device, texture_descriptor.clone()))
.clone();

texture_descriptor.label = Some("bloom_texture_b");
let texture_b = texture_bs
.entry(camera.target.clone())
.or_insert_with(|| texture_cache.get(&render_device, texture_descriptor))
.or_insert_with(|| texture_cache.get(&gpu_device, texture_descriptor))
.clone();

commands.entity(entity).insert(BloomTextures {
Expand Down Expand Up @@ -633,14 +634,14 @@ struct BloomBindGroups {

fn queue_bloom_bind_groups(
mut commands: Commands,
render_device: Res<RenderDevice>,
gpu_device: Res<GpuDevice>,
pipelines: Res<BloomPipelines>,
uniforms: Res<ComponentUniforms<BloomUniform>>,
views: Query<(Entity, &ViewTarget, &BloomTextures)>,
) {
if let Some(uniforms) = uniforms.binding() {
for (entity, view_target, textures) in &views {
let prefilter_bind_group = render_device.create_bind_group(&BindGroupDescriptor {
let prefilter_bind_group = gpu_device.create_bind_group(&BindGroupDescriptor {
label: Some("bloom_prefilter_bind_group"),
layout: &pipelines.downsampling_bind_group_layout,
entries: &[
Expand All @@ -663,7 +664,7 @@ fn queue_bloom_bind_groups(

let mut downsampling_bind_groups = Vec::with_capacity(bind_group_count);
for mip in 1..textures.mip_count {
let bind_group = render_device.create_bind_group(&BindGroupDescriptor {
let bind_group = gpu_device.create_bind_group(&BindGroupDescriptor {
label: Some("bloom_downsampling_bind_group"),
layout: &pipelines.downsampling_bind_group_layout,
entries: &[
Expand Down Expand Up @@ -700,7 +701,7 @@ fn queue_bloom_bind_groups(
mip,
);

let bind_group = render_device.create_bind_group(&BindGroupDescriptor {
let bind_group = gpu_device.create_bind_group(&BindGroupDescriptor {
label: Some("bloom_upsampling_bind_group"),
layout: &pipelines.upsampling_bind_group_layout,
entries: &[
Expand All @@ -726,28 +727,27 @@ fn queue_bloom_bind_groups(
upsampling_bind_groups.push(bind_group);
}

let upsampling_final_bind_group =
render_device.create_bind_group(&BindGroupDescriptor {
label: Some("bloom_upsampling_final_bind_group"),
layout: &pipelines.downsampling_bind_group_layout,
entries: &[
BindGroupEntry {
binding: 0,
resource: BindingResource::TextureView(&BloomTextures::texture_view(
&textures.texture_b,
0,
)),
},
BindGroupEntry {
binding: 1,
resource: BindingResource::Sampler(&pipelines.sampler),
},
BindGroupEntry {
binding: 2,
resource: uniforms.clone(),
},
],
});
let upsampling_final_bind_group = gpu_device.create_bind_group(&BindGroupDescriptor {
label: Some("bloom_upsampling_final_bind_group"),
layout: &pipelines.downsampling_bind_group_layout,
entries: &[
BindGroupEntry {
binding: 0,
resource: BindingResource::TextureView(&BloomTextures::texture_view(
&textures.texture_b,
0,
)),
},
BindGroupEntry {
binding: 1,
resource: BindingResource::Sampler(&pipelines.sampler),
},
BindGroupEntry {
binding: 2,
resource: uniforms.clone(),
},
],
});

commands.entity(entity).insert(BloomBindGroups {
prefilter_bind_group,
Expand Down
10 changes: 4 additions & 6 deletions crates/bevy_core_pipeline/src/core_2d/main_pass_2d_node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ use crate::{
core_2d::{camera_2d::Camera2d, Transparent2d},
};
use bevy_ecs::prelude::*;
use bevy_render::render_phase::TrackedRenderPass;
use bevy_render::{
camera::ExtractedCamera,
render_graph::{Node, NodeRunError, RenderGraphContext, SlotInfo, SlotType},
render_phase::RenderPhase,
render_graph::{Node, NodeRunError, RenderContext, RenderGraphContext, SlotInfo, SlotType},
render_phase::{RenderPhase, TrackedRenderPass},
render_resource::{LoadOp, Operations, RenderPassDescriptor},
renderer::RenderContext,
view::{ExtractedView, ViewTarget},
};
#[cfg(feature = "trace")]
Expand Down Expand Up @@ -79,7 +77,7 @@ impl Node for MainPass2dNode {
};

let render_pass = render_context
.command_encoder
.gpu_command_encoder
.begin_render_pass(&pass_descriptor);
let mut render_pass = TrackedRenderPass::new(render_pass);

Expand All @@ -106,7 +104,7 @@ impl Node for MainPass2dNode {
};

render_context
.command_encoder
.gpu_command_encoder
.begin_render_pass(&pass_descriptor);
}

Expand Down
14 changes: 6 additions & 8 deletions crates/bevy_core_pipeline/src/core_3d/main_pass_3d_node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ use crate::{
core_3d::{AlphaMask3d, Camera3d, Opaque3d, Transparent3d},
};
use bevy_ecs::prelude::*;
use bevy_render::render_phase::TrackedRenderPass;
use bevy_render::{
camera::ExtractedCamera,
render_graph::{Node, NodeRunError, RenderGraphContext, SlotInfo, SlotType},
render_phase::RenderPhase,
render_graph::{Node, NodeRunError, RenderContext, RenderGraphContext, SlotInfo, SlotType},
render_phase::{RenderPhase, TrackedRenderPass},
render_resource::{LoadOp, Operations, RenderPassDepthStencilAttachment, RenderPassDescriptor},
renderer::RenderContext,
view::{ExtractedView, ViewDepthTexture, ViewTarget},
};
#[cfg(feature = "trace")]
Expand Down Expand Up @@ -97,7 +95,7 @@ impl Node for MainPass3dNode {
};

let render_pass = render_context
.command_encoder
.gpu_command_encoder
.begin_render_pass(&pass_descriptor);
let mut render_pass = TrackedRenderPass::new(render_pass);

Expand Down Expand Up @@ -132,7 +130,7 @@ impl Node for MainPass3dNode {
};

let render_pass = render_context
.command_encoder
.gpu_command_encoder
.begin_render_pass(&pass_descriptor);
let mut render_pass = TrackedRenderPass::new(render_pass);

Expand Down Expand Up @@ -172,7 +170,7 @@ impl Node for MainPass3dNode {
};

let render_pass = render_context
.command_encoder
.gpu_command_encoder
.begin_render_pass(&pass_descriptor);
let mut render_pass = TrackedRenderPass::new(render_pass);

Expand All @@ -199,7 +197,7 @@ impl Node for MainPass3dNode {
};

render_context
.command_encoder
.gpu_command_encoder
.begin_render_pass(&pass_descriptor);
}

Expand Down
6 changes: 3 additions & 3 deletions crates/bevy_core_pipeline/src/core_3d/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ use bevy_render::{
CachedRenderPipelineId, Extent3d, TextureDescriptor, TextureDimension, TextureFormat,
TextureUsages,
},
renderer::RenderDevice,
renderer::GpuDevice,
texture::TextureCache,
view::ViewDepthTexture,
Extract, RenderApp, RenderStage,
Expand Down Expand Up @@ -251,7 +251,7 @@ pub fn prepare_core_3d_depth_textures(
mut commands: Commands,
mut texture_cache: ResMut<TextureCache>,
msaa: Res<Msaa>,
render_device: Res<RenderDevice>,
gpu_device: Res<GpuDevice>,
views_3d: Query<
(Entity, &ExtractedCamera),
(
Expand All @@ -268,7 +268,7 @@ pub fn prepare_core_3d_depth_textures(
.entry(camera.target.clone())
.or_insert_with(|| {
texture_cache.get(
&render_device,
&gpu_device,
TextureDescriptor {
label: Some("view_depth_texture"),
size: Extent3d {
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_core_pipeline/src/fxaa/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use bevy_render::{
prelude::Camera,
render_graph::RenderGraph,
render_resource::*,
renderer::RenderDevice,
renderer::GpuDevice,
texture::BevyDefault,
view::{ExtractedView, ViewTarget},
RenderApp, RenderStage,
Expand Down Expand Up @@ -153,7 +153,7 @@ pub struct FxaaPipeline {
impl FromWorld for FxaaPipeline {
fn from_world(render_world: &mut World) -> Self {
let texture_bind_group = render_world
.resource::<RenderDevice>()
.resource::<GpuDevice>()
.create_bind_group_layout(&BindGroupLayoutDescriptor {
label: Some("fxaa_texture_bind_group_layout"),
entries: &[
Expand Down
9 changes: 4 additions & 5 deletions crates/bevy_core_pipeline/src/fxaa/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ use crate::fxaa::{CameraFxaaPipeline, Fxaa, FxaaPipeline};
use bevy_ecs::prelude::*;
use bevy_ecs::query::QueryState;
use bevy_render::{
render_graph::{Node, NodeRunError, RenderGraphContext, SlotInfo, SlotType},
render_graph::{Node, NodeRunError, RenderContext, RenderGraphContext, SlotInfo, SlotType},
render_resource::{
BindGroup, BindGroupDescriptor, BindGroupEntry, BindingResource, FilterMode, Operations,
PipelineCache, RenderPassColorAttachment, RenderPassDescriptor, SamplerDescriptor,
TextureViewId,
},
renderer::RenderContext,
view::{ExtractedView, ViewTarget},
};
use bevy_utils::default;
Expand Down Expand Up @@ -78,7 +77,7 @@ impl Node for FxaaNode {
Some((id, bind_group)) if source.id() == *id => bind_group,
cached_bind_group => {
let sampler = render_context
.render_device
.gpu_device
.create_sampler(&SamplerDescriptor {
mipmap_filter: FilterMode::Linear,
mag_filter: FilterMode::Linear,
Expand All @@ -88,7 +87,7 @@ impl Node for FxaaNode {

let bind_group =
render_context
.render_device
.gpu_device
.create_bind_group(&BindGroupDescriptor {
label: None,
layout: &fxaa_pipeline.texture_bind_group,
Expand Down Expand Up @@ -120,7 +119,7 @@ impl Node for FxaaNode {
};

let mut render_pass = render_context
.command_encoder
.gpu_command_encoder
.begin_render_pass(&pass_descriptor);

render_pass.set_pipeline(pipeline);
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_core_pipeline/src/tonemapping/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use bevy_ecs::query::QueryItem;
use bevy_reflect::{Reflect, TypeUuid};
use bevy_render::camera::Camera;
use bevy_render::extract_component::{ExtractComponent, ExtractComponentPlugin};
use bevy_render::renderer::RenderDevice;
use bevy_render::renderer::GpuDevice;
use bevy_render::view::ViewTarget;
use bevy_render::{render_resource::*, RenderApp, RenderStage};

Expand Down Expand Up @@ -92,7 +92,7 @@ impl SpecializedRenderPipeline for TonemappingPipeline {
impl FromWorld for TonemappingPipeline {
fn from_world(render_world: &mut World) -> Self {
let tonemap_texture_bind_group = render_world
.resource::<RenderDevice>()
.resource::<GpuDevice>()
.create_bind_group_layout(&BindGroupLayoutDescriptor {
label: Some("tonemapping_hdr_texture_bind_group_layout"),
entries: &[
Expand Down
Loading