From 97edaa73434803495f9c072c8ba748968884c4c8 Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Sun, 14 Jun 2020 15:24:33 -0700 Subject: [PATCH] render: rename ResourceType to RenderResourceType --- crates/bevy_derive/src/render_resource.rs | 4 ++-- crates/bevy_render/src/color.rs | 2 +- crates/bevy_render/src/render_graph/graph.rs | 6 +++--- crates/bevy_render/src/render_graph/node_slot.rs | 6 +++--- .../bevy_render/src/render_graph/nodes/pass_node.rs | 6 +++--- .../src/render_graph/nodes/render_resources_node.rs | 12 ++++++------ .../src/render_graph/nodes/window_swapchain_node.rs | 4 ++-- .../src/render_graph/nodes/window_texture_node.rs | 4 ++-- crates/bevy_render/src/render_graph/schedule.rs | 6 +++--- .../src/render_resource/render_resource.rs | 12 ++++++------ crates/bevy_render/src/texture/texture.rs | 10 +++++----- 11 files changed, 36 insertions(+), 36 deletions(-) diff --git a/crates/bevy_derive/src/render_resource.rs b/crates/bevy_derive/src/render_resource.rs index 398f4cc00a..e0943c9cf0 100644 --- a/crates/bevy_derive/src/render_resource.rs +++ b/crates/bevy_derive/src/render_resource.rs @@ -14,8 +14,8 @@ pub fn derive_render_resource(input: TokenStream) -> TokenStream { TokenStream::from(quote! { impl #bevy_render_path::render_resource::RenderResource for #struct_name { - fn resource_type(&self) -> Option<#bevy_render_path::render_resource::ResourceType> { - Some(#bevy_render_path::render_resource::ResourceType::Buffer) + fn resource_type(&self) -> Option<#bevy_render_path::render_resource::RenderResourceType> { + Some(#bevy_render_path::render_resource::RenderResourceType::Buffer) } fn write_buffer_bytes(&self, buffer: &mut [u8]) { use #bevy_core_path::bytes::Bytes; diff --git a/crates/bevy_render/src/color.rs b/crates/bevy_render/src/color.rs index c6ff7a1b0d..6d2a641ded 100644 --- a/crates/bevy_render/src/color.rs +++ b/crates/bevy_render/src/color.rs @@ -1,5 +1,5 @@ use super::texture::Texture; -use crate::{render_resource::{ResourceType, RenderResource}, impl_render_resource_bytes}; +use crate::{render_resource::{RenderResourceType, RenderResource}, impl_render_resource_bytes}; use bevy_asset::Handle; use bevy_core::bytes::{Byteable, Bytes}; use bevy_property::Property; diff --git a/crates/bevy_render/src/render_graph/graph.rs b/crates/bevy_render/src/render_graph/graph.rs index 16bff3a552..1288fc42f9 100644 --- a/crates/bevy_render/src/render_graph/graph.rs +++ b/crates/bevy_render/src/render_graph/graph.rs @@ -309,7 +309,7 @@ mod tests { use super::RenderGraph; use crate::{ render_graph::{Edge, Node, NodeId, RenderGraphError, ResourceSlotInfo, ResourceSlots}, - renderer::RenderContext, render_resource::ResourceType, + renderer::RenderContext, render_resource::RenderResourceType, }; use legion::prelude::{Resources, World}; use std::{collections::HashSet, iter::FromIterator}; @@ -326,13 +326,13 @@ mod tests { inputs: (0..inputs) .map(|i| ResourceSlotInfo { name: format!("in_{}", i).into(), - resource_type: ResourceType::Texture, + resource_type: RenderResourceType::Texture, }) .collect(), outputs: (0..outputs) .map(|i| ResourceSlotInfo { name: format!("out_{}", i).into(), - resource_type: ResourceType::Texture, + resource_type: RenderResourceType::Texture, }) .collect(), } diff --git a/crates/bevy_render/src/render_graph/node_slot.rs b/crates/bevy_render/src/render_graph/node_slot.rs index 87840c0df2..1b6f6e8c2f 100644 --- a/crates/bevy_render/src/render_graph/node_slot.rs +++ b/crates/bevy_render/src/render_graph/node_slot.rs @@ -1,5 +1,5 @@ use super::RenderGraphError; -use crate::render_resource::{RenderResourceId, ResourceType}; +use crate::render_resource::{RenderResourceId, RenderResourceType}; use std::borrow::Cow; #[derive(Debug, Clone)] @@ -122,11 +122,11 @@ impl From<&[ResourceSlotInfo]> for ResourceSlots { #[derive(Clone, Debug)] pub struct ResourceSlotInfo { pub name: Cow<'static, str>, - pub resource_type: ResourceType, + pub resource_type: RenderResourceType, } impl ResourceSlotInfo { - pub fn new(name: impl Into>, resource_type: ResourceType) -> Self { + pub fn new(name: impl Into>, resource_type: RenderResourceType) -> Self { ResourceSlotInfo { name: name.into(), resource_type, diff --git a/crates/bevy_render/src/render_graph/nodes/pass_node.rs b/crates/bevy_render/src/render_graph/nodes/pass_node.rs index fc03525160..f7af5ef926 100644 --- a/crates/bevy_render/src/render_graph/nodes/pass_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/pass_node.rs @@ -3,7 +3,7 @@ use crate::{ pass::{PassDescriptor, TextureAttachment}, pipeline::PipelineDescriptor, render_graph::{Node, ResourceSlotInfo, ResourceSlots}, - render_resource::{BufferId, RenderResourceBindings, BindGroupId, ResourceType}, + render_resource::{BufferId, RenderResourceBindings, BindGroupId, RenderResourceType}, renderer::RenderContext, }; use bevy_asset::{Assets, Handle}; @@ -24,7 +24,7 @@ impl MainPassNode { if let TextureAttachment::Input(ref name) = color_attachment.attachment { inputs.push(ResourceSlotInfo::new( name.to_string(), - ResourceType::Texture, + RenderResourceType::Texture, )); color_attachment_input_indices.push(Some(inputs.len() - 1)); } else { @@ -37,7 +37,7 @@ impl MainPassNode { if let TextureAttachment::Input(ref name) = depth_stencil_attachment.attachment { inputs.push(ResourceSlotInfo::new( name.to_string(), - ResourceType::Texture, + RenderResourceType::Texture, )); depth_stencil_attachment_input_index = Some(inputs.len() - 1); } diff --git a/crates/bevy_render/src/render_graph/nodes/render_resources_node.rs b/crates/bevy_render/src/render_graph/nodes/render_resources_node.rs index c375c10456..12b646914b 100644 --- a/crates/bevy_render/src/render_graph/nodes/render_resources_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/render_resources_node.rs @@ -11,7 +11,7 @@ use crate::{ use bevy_asset::{Assets, Handle}; use legion::prelude::*; -use render_resource::{BufferId, ResourceType}; +use render_resource::{BufferId, RenderResourceType}; use std::{collections::HashMap, marker::PhantomData}; pub const BIND_BUFFER_ALIGNMENT: usize = 256; @@ -97,7 +97,7 @@ where .resize_with(uniforms.render_resources_len(), || None); } for (i, render_resource) in uniforms.iter_render_resources().enumerate() { - if let Some(ResourceType::Buffer) = render_resource.resource_type() { + if let Some(RenderResourceType::Buffer) = render_resource.resource_type() { let render_resource_name = uniforms.get_render_resource_name(i).unwrap(); let size = render_resource.buffer_byte_len().unwrap(); if let Some((ref _name, ref mut buffer_array_status)) = self.uniform_arrays[i] { @@ -202,7 +202,7 @@ where ) { for (i, render_resource) in uniforms.iter_render_resources().enumerate() { match render_resource.resource_type() { - Some(ResourceType::Buffer) => { + Some(RenderResourceType::Buffer) => { let size = render_resource.buffer_byte_len().unwrap(); let render_resource_name = uniforms.get_render_resource_name(i).unwrap(); let (_name, uniform_buffer_status) = self.uniform_arrays[i].as_mut().unwrap(); @@ -293,8 +293,8 @@ where }); uniform_buffer_status.current_offset += size; } - Some(ResourceType::Texture) => { /* ignore textures */ } - Some(ResourceType::Sampler) => { /* ignore samplers */ } + Some(RenderResourceType::Texture) => { /* ignore textures */ } + Some(RenderResourceType::Sampler) => { /* ignore samplers */ } None => { /* ignore None */ } } } @@ -616,7 +616,7 @@ fn setup_uniform_texture_resources( T: render_resource::RenderResources, { for (i, render_resource) in uniforms.iter_render_resources().enumerate() { - if let Some(ResourceType::Texture) = render_resource.resource_type() { + if let Some(RenderResourceType::Texture) = render_resource.resource_type() { let render_resource_name = uniforms.get_render_resource_name(i).unwrap(); let sampler_name = format!("{}_sampler", render_resource_name); if let Some(texture_handle) = render_resource.texture() { diff --git a/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs b/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs index 808f820f3a..4c7338413c 100644 --- a/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs @@ -1,6 +1,6 @@ use crate::{ render_graph::{Node, ResourceSlotInfo, ResourceSlots}, - render_resource::{RenderResourceId, ResourceType}, + render_resource::{RenderResourceId, RenderResourceType}, renderer::RenderContext, }; use bevy_app::{EventReader, Events}; @@ -29,7 +29,7 @@ impl Node for WindowSwapChainNode { fn output(&self) -> &[ResourceSlotInfo] { static OUTPUT: &[ResourceSlotInfo] = &[ResourceSlotInfo { name: Cow::Borrowed(WindowSwapChainNode::OUT_TEXTURE), - resource_type: ResourceType::Texture, + resource_type: RenderResourceType::Texture, }]; OUTPUT } diff --git a/crates/bevy_render/src/render_graph/nodes/window_texture_node.rs b/crates/bevy_render/src/render_graph/nodes/window_texture_node.rs index 932590502c..e83e0ec920 100644 --- a/crates/bevy_render/src/render_graph/nodes/window_texture_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/window_texture_node.rs @@ -1,6 +1,6 @@ use crate::{ render_graph::{Node, ResourceSlotInfo, ResourceSlots}, - render_resource::{RenderResourceId, ResourceType}, + render_resource::{RenderResourceId, RenderResourceType}, renderer::RenderContext, texture::TextureDescriptor, }; @@ -32,7 +32,7 @@ impl Node for WindowTextureNode { fn output(&self) -> &[ResourceSlotInfo] { static OUTPUT: &[ResourceSlotInfo] = &[ResourceSlotInfo { name: Cow::Borrowed(WindowTextureNode::OUT_TEXTURE), - resource_type: ResourceType::Texture, + resource_type: RenderResourceType::Texture, }]; OUTPUT } diff --git a/crates/bevy_render/src/render_graph/schedule.rs b/crates/bevy_render/src/render_graph/schedule.rs index 77097c9c63..e386487878 100644 --- a/crates/bevy_render/src/render_graph/schedule.rs +++ b/crates/bevy_render/src/render_graph/schedule.rs @@ -264,7 +264,7 @@ mod tests { use super::{DependentNodeStager, OrderedJob, RenderGraphStager, Stage}; use crate::{ render_graph::{Node, NodeId, RenderGraph, ResourceSlotInfo, ResourceSlots}, - renderer::RenderContext, render_resource::ResourceType, + renderer::RenderContext, render_resource::RenderResourceType, }; use legion::prelude::{Resources, World}; @@ -279,13 +279,13 @@ mod tests { inputs: (0..inputs) .map(|i| ResourceSlotInfo { name: format!("in_{}", i).into(), - resource_type: ResourceType::Texture, + resource_type: RenderResourceType::Texture, }) .collect(), outputs: (0..outputs) .map(|i| ResourceSlotInfo { name: format!("out_{}", i).into(), - resource_type: ResourceType::Texture, + resource_type: RenderResourceType::Texture, }) .collect(), } diff --git a/crates/bevy_render/src/render_resource/render_resource.rs b/crates/bevy_render/src/render_resource/render_resource.rs index 400400c44c..9aac9ba25a 100644 --- a/crates/bevy_render/src/render_resource/render_resource.rs +++ b/crates/bevy_render/src/render_resource/render_resource.rs @@ -8,7 +8,7 @@ use glam::{Mat4, Vec2, Vec3, Vec4}; #[derive(Debug, Clone, Eq, PartialEq)] -pub enum ResourceType { +pub enum RenderResourceType { Buffer, Texture, Sampler, @@ -73,7 +73,7 @@ bitflags::bitflags! { } pub trait RenderResource { - fn resource_type(&self) -> Option; + fn resource_type(&self) -> Option; fn write_buffer_bytes(&self, buffer: &mut [u8]); fn buffer_byte_len(&self) -> Option; // TODO: consider making these panic by default, but return non-options @@ -123,8 +123,8 @@ impl<'a> Iterator for RenderResourceIterator<'a> { macro_rules! impl_render_resource_bytes { ($ty:ident) => { impl RenderResource for $ty { - fn resource_type(&self) -> Option { - Some(ResourceType::Buffer) + fn resource_type(&self) -> Option { + Some(RenderResourceType::Buffer) } fn write_buffer_bytes(&self, buffer: &mut [u8]) { self.write_bytes(buffer); @@ -159,8 +159,8 @@ impl RenderResource for Vec where T: Sized + Byteable, { - fn resource_type(&self) -> Option { - Some(ResourceType::Buffer) + fn resource_type(&self) -> Option { + Some(RenderResourceType::Buffer) } fn write_buffer_bytes(&self, buffer: &mut [u8]) { self.write_bytes(buffer); diff --git a/crates/bevy_render/src/texture/texture.rs b/crates/bevy_render/src/texture/texture.rs index 82337ea9cb..0b6097f444 100644 --- a/crates/bevy_render/src/texture/texture.rs +++ b/crates/bevy_render/src/texture/texture.rs @@ -1,6 +1,6 @@ use super::{SamplerDescriptor, TextureDescriptor}; use crate::{ - render_resource::{RenderResource, RenderResourceId, ResourceType}, + render_resource::{RenderResource, RenderResourceId, RenderResourceType}, renderer::RenderResourceContext, }; use bevy_app::{EventReader, Events}; @@ -118,8 +118,8 @@ pub struct TextureResourceSystemState { } impl RenderResource for Option> { - fn resource_type(&self) -> Option { - self.map(|_texture| ResourceType::Texture) + fn resource_type(&self) -> Option { + self.map(|_texture| RenderResourceType::Texture) } fn write_buffer_bytes(&self, _buffer: &mut [u8]) {} fn buffer_byte_len(&self) -> Option { @@ -131,8 +131,8 @@ impl RenderResource for Option> { } impl RenderResource for Handle { - fn resource_type(&self) -> Option { - Some(ResourceType::Texture) + fn resource_type(&self) -> Option { + Some(RenderResourceType::Texture) } fn write_buffer_bytes(&self, _buffer: &mut [u8]) {} fn buffer_byte_len(&self) -> Option {