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

render: rename ResourceType to RenderResourceType

Browse Source
This commit is contained in:
Carter Anderson 2020-06-14 15:24:33 -07:00
parent 3786224b28
commit 97edaa7343
11 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/bevy_derive/src/render_resource.rs
View File

@ -14,8 +14,8 @@ pub fn derive_render_resource(input: TokenStream) -> TokenStream {
TokenStream::from(quote! { TokenStream::from(quote! {
impl #bevy_render_path::render_resource::RenderResource for #struct_name { impl #bevy_render_path::render_resource::RenderResource for #struct_name {
fn resource_type(&self) -> Option<#bevy_render_path::render_resource::ResourceType> { fn resource_type(&self) -> Option<#bevy_render_path::render_resource::RenderResourceType> {
Some(#bevy_render_path::render_resource::ResourceType::Buffer) Some(#bevy_render_path::render_resource::RenderResourceType::Buffer)
} }
fn write_buffer_bytes(&self, buffer: &mut [u8]) { fn write_buffer_bytes(&self, buffer: &mut [u8]) {
use #bevy_core_path::bytes::Bytes; use #bevy_core_path::bytes::Bytes;

2
crates/bevy_render/src/color.rs
View File

@ -1,5 +1,5 @@
use super::texture::Texture; 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_asset::Handle;
use bevy_core::bytes::{Byteable, Bytes}; use bevy_core::bytes::{Byteable, Bytes};
use bevy_property::Property; use bevy_property::Property;

6
crates/bevy_render/src/render_graph/graph.rs
View File

@ -309,7 +309,7 @@ mod tests {
use super::RenderGraph; use super::RenderGraph;
use crate::{ use crate::{
render_graph::{Edge, Node, NodeId, RenderGraphError, ResourceSlotInfo, ResourceSlots}, render_graph::{Edge, Node, NodeId, RenderGraphError, ResourceSlotInfo, ResourceSlots},
renderer::RenderContext, render_resource::ResourceType, renderer::RenderContext, render_resource::RenderResourceType,
}; };
use legion::prelude::{Resources, World}; use legion::prelude::{Resources, World};
use std::{collections::HashSet, iter::FromIterator}; use std::{collections::HashSet, iter::FromIterator};
@ -326,13 +326,13 @@ mod tests {
inputs: (0..inputs) inputs: (0..inputs)
.map(|i| ResourceSlotInfo { .map(|i| ResourceSlotInfo {
name: format!("in_{}", i).into(), name: format!("in_{}", i).into(),
resource_type: ResourceType::Texture, resource_type: RenderResourceType::Texture,
}) })
.collect(), .collect(),
outputs: (0..outputs) outputs: (0..outputs)
.map(|i| ResourceSlotInfo { .map(|i| ResourceSlotInfo {
name: format!("out_{}", i).into(), name: format!("out_{}", i).into(),
resource_type: ResourceType::Texture, resource_type: RenderResourceType::Texture,
}) })
.collect(), .collect(),
} }

6
crates/bevy_render/src/render_graph/node_slot.rs
View File

@ -1,5 +1,5 @@
use super::RenderGraphError; use super::RenderGraphError;
use crate::render_resource::{RenderResourceId, ResourceType}; use crate::render_resource::{RenderResourceId, RenderResourceType};
use std::borrow::Cow; use std::borrow::Cow;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@ -122,11 +122,11 @@ impl From<&[ResourceSlotInfo]> for ResourceSlots {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct ResourceSlotInfo { pub struct ResourceSlotInfo {
pub name: Cow<'static, str>, pub name: Cow<'static, str>,
pub resource_type: ResourceType, pub resource_type: RenderResourceType,
} }
impl ResourceSlotInfo { impl ResourceSlotInfo {
pub fn new(name: impl Into<Cow<'static, str>>, resource_type: ResourceType) -> Self { pub fn new(name: impl Into<Cow<'static, str>>, resource_type: RenderResourceType) -> Self {
ResourceSlotInfo { ResourceSlotInfo {
name: name.into(), name: name.into(),
resource_type, resource_type,

6
crates/bevy_render/src/render_graph/nodes/pass_node.rs
View File

@ -3,7 +3,7 @@ use crate::{
pass::{PassDescriptor, TextureAttachment}, pass::{PassDescriptor, TextureAttachment},
pipeline::PipelineDescriptor, pipeline::PipelineDescriptor,
render_graph::{Node, ResourceSlotInfo, ResourceSlots}, render_graph::{Node, ResourceSlotInfo, ResourceSlots},
render_resource::{BufferId, RenderResourceBindings, BindGroupId, ResourceType}, render_resource::{BufferId, RenderResourceBindings, BindGroupId, RenderResourceType},
renderer::RenderContext, renderer::RenderContext,
}; };
use bevy_asset::{Assets, Handle}; use bevy_asset::{Assets, Handle};
@ -24,7 +24,7 @@ impl MainPassNode {
if let TextureAttachment::Input(ref name) = color_attachment.attachment { if let TextureAttachment::Input(ref name) = color_attachment.attachment {
inputs.push(ResourceSlotInfo::new( inputs.push(ResourceSlotInfo::new(
name.to_string(), name.to_string(),
ResourceType::Texture, RenderResourceType::Texture,
)); ));
color_attachment_input_indices.push(Some(inputs.len() - 1)); color_attachment_input_indices.push(Some(inputs.len() - 1));
} else { } else {
@ -37,7 +37,7 @@ impl MainPassNode {
if let TextureAttachment::Input(ref name) = depth_stencil_attachment.attachment { if let TextureAttachment::Input(ref name) = depth_stencil_attachment.attachment {
inputs.push(ResourceSlotInfo::new( inputs.push(ResourceSlotInfo::new(
name.to_string(), name.to_string(),
ResourceType::Texture, RenderResourceType::Texture,
)); ));
depth_stencil_attachment_input_index = Some(inputs.len() - 1); depth_stencil_attachment_input_index = Some(inputs.len() - 1);
} }

12
crates/bevy_render/src/render_graph/nodes/render_resources_node.rs
View File

@ -11,7 +11,7 @@ use crate::{
use bevy_asset::{Assets, Handle}; use bevy_asset::{Assets, Handle};
use legion::prelude::*; use legion::prelude::*;
use render_resource::{BufferId, ResourceType}; use render_resource::{BufferId, RenderResourceType};
use std::{collections::HashMap, marker::PhantomData}; use std::{collections::HashMap, marker::PhantomData};
pub const BIND_BUFFER_ALIGNMENT: usize = 256; pub const BIND_BUFFER_ALIGNMENT: usize = 256;
@ -97,7 +97,7 @@ where
.resize_with(uniforms.render_resources_len(), || None); .resize_with(uniforms.render_resources_len(), || None);
} }
for (i, render_resource) in uniforms.iter_render_resources().enumerate() { 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 render_resource_name = uniforms.get_render_resource_name(i).unwrap();
let size = render_resource.buffer_byte_len().unwrap(); let size = render_resource.buffer_byte_len().unwrap();
if let Some((ref _name, ref mut buffer_array_status)) = self.uniform_arrays[i] { 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() { for (i, render_resource) in uniforms.iter_render_resources().enumerate() {
match render_resource.resource_type() { match render_resource.resource_type() {
Some(ResourceType::Buffer) => { Some(RenderResourceType::Buffer) => {
let size = render_resource.buffer_byte_len().unwrap(); let size = render_resource.buffer_byte_len().unwrap();
let render_resource_name = uniforms.get_render_resource_name(i).unwrap(); let render_resource_name = uniforms.get_render_resource_name(i).unwrap();
let (_name, uniform_buffer_status) = self.uniform_arrays[i].as_mut().unwrap(); let (_name, uniform_buffer_status) = self.uniform_arrays[i].as_mut().unwrap();
@ -293,8 +293,8 @@ where
}); });
uniform_buffer_status.current_offset += size; uniform_buffer_status.current_offset += size;
} }
Some(ResourceType::Texture) => { /* ignore textures */ } Some(RenderResourceType::Texture) => { /* ignore textures */ }
Some(ResourceType::Sampler) => { /* ignore samplers */ } Some(RenderResourceType::Sampler) => { /* ignore samplers */ }
None => { /* ignore None */ } None => { /* ignore None */ }
} }
} }
@ -616,7 +616,7 @@ fn setup_uniform_texture_resources<T>(
T: render_resource::RenderResources, T: render_resource::RenderResources,
{ {
for (i, render_resource) in uniforms.iter_render_resources().enumerate() { 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 render_resource_name = uniforms.get_render_resource_name(i).unwrap();
let sampler_name = format!("{}_sampler", render_resource_name); let sampler_name = format!("{}_sampler", render_resource_name);
if let Some(texture_handle) = render_resource.texture() { if let Some(texture_handle) = render_resource.texture() {

4
crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs
View File

@ -1,6 +1,6 @@
use crate::{ use crate::{
render_graph::{Node, ResourceSlotInfo, ResourceSlots}, render_graph::{Node, ResourceSlotInfo, ResourceSlots},
render_resource::{RenderResourceId, ResourceType}, render_resource::{RenderResourceId, RenderResourceType},
renderer::RenderContext, renderer::RenderContext,
}; };
use bevy_app::{EventReader, Events}; use bevy_app::{EventReader, Events};
@ -29,7 +29,7 @@ impl Node for WindowSwapChainNode {
fn output(&self) -> &[ResourceSlotInfo] { fn output(&self) -> &[ResourceSlotInfo] {
static OUTPUT: &[ResourceSlotInfo] = &[ResourceSlotInfo { static OUTPUT: &[ResourceSlotInfo] = &[ResourceSlotInfo {
name: Cow::Borrowed(WindowSwapChainNode::OUT_TEXTURE), name: Cow::Borrowed(WindowSwapChainNode::OUT_TEXTURE),
resource_type: ResourceType::Texture, resource_type: RenderResourceType::Texture,
}]; }];
OUTPUT OUTPUT
} }

4
crates/bevy_render/src/render_graph/nodes/window_texture_node.rs
View File

@ -1,6 +1,6 @@
use crate::{ use crate::{
render_graph::{Node, ResourceSlotInfo, ResourceSlots}, render_graph::{Node, ResourceSlotInfo, ResourceSlots},
render_resource::{RenderResourceId, ResourceType}, render_resource::{RenderResourceId, RenderResourceType},
renderer::RenderContext, renderer::RenderContext,
texture::TextureDescriptor, texture::TextureDescriptor,
}; };
@ -32,7 +32,7 @@ impl Node for WindowTextureNode {
fn output(&self) -> &[ResourceSlotInfo] { fn output(&self) -> &[ResourceSlotInfo] {
static OUTPUT: &[ResourceSlotInfo] = &[ResourceSlotInfo { static OUTPUT: &[ResourceSlotInfo] = &[ResourceSlotInfo {
name: Cow::Borrowed(WindowTextureNode::OUT_TEXTURE), name: Cow::Borrowed(WindowTextureNode::OUT_TEXTURE),
resource_type: ResourceType::Texture, resource_type: RenderResourceType::Texture,
}]; }];
OUTPUT OUTPUT
} }

6
crates/bevy_render/src/render_graph/schedule.rs
View File

@ -264,7 +264,7 @@ mod tests {
use super::{DependentNodeStager, OrderedJob, RenderGraphStager, Stage}; use super::{DependentNodeStager, OrderedJob, RenderGraphStager, Stage};
use crate::{ use crate::{
render_graph::{Node, NodeId, RenderGraph, ResourceSlotInfo, ResourceSlots}, render_graph::{Node, NodeId, RenderGraph, ResourceSlotInfo, ResourceSlots},
renderer::RenderContext, render_resource::ResourceType, renderer::RenderContext, render_resource::RenderResourceType,
}; };
use legion::prelude::{Resources, World}; use legion::prelude::{Resources, World};
@ -279,13 +279,13 @@ mod tests {
inputs: (0..inputs) inputs: (0..inputs)
.map(|i| ResourceSlotInfo { .map(|i| ResourceSlotInfo {
name: format!("in_{}", i).into(), name: format!("in_{}", i).into(),
resource_type: ResourceType::Texture, resource_type: RenderResourceType::Texture,
}) })
.collect(), .collect(),
outputs: (0..outputs) outputs: (0..outputs)
.map(|i| ResourceSlotInfo { .map(|i| ResourceSlotInfo {
name: format!("out_{}", i).into(), name: format!("out_{}", i).into(),
resource_type: ResourceType::Texture, resource_type: RenderResourceType::Texture,
}) })
.collect(), .collect(),
} }

12
crates/bevy_render/src/render_resource/render_resource.rs
View File

@ -8,7 +8,7 @@ use glam::{Mat4, Vec2, Vec3, Vec4};
#[derive(Debug, Clone, Eq, PartialEq)] #[derive(Debug, Clone, Eq, PartialEq)]
pub enum ResourceType { pub enum RenderResourceType {
Buffer, Buffer,
Texture, Texture,
Sampler, Sampler,
@ -73,7 +73,7 @@ bitflags::bitflags! {
} }
pub trait RenderResource { pub trait RenderResource {
fn resource_type(&self) -> Option<ResourceType>; fn resource_type(&self) -> Option<RenderResourceType>;
fn write_buffer_bytes(&self, buffer: &mut [u8]); fn write_buffer_bytes(&self, buffer: &mut [u8]);
fn buffer_byte_len(&self) -> Option<usize>; fn buffer_byte_len(&self) -> Option<usize>;
// TODO: consider making these panic by default, but return non-options // 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 { macro_rules! impl_render_resource_bytes {
($ty:ident) => { ($ty:ident) => {
impl RenderResource for $ty { impl RenderResource for $ty {
fn resource_type(&self) -> Option<ResourceType> { fn resource_type(&self) -> Option<RenderResourceType> {
Some(ResourceType::Buffer) Some(RenderResourceType::Buffer)
} }
fn write_buffer_bytes(&self, buffer: &mut [u8]) { fn write_buffer_bytes(&self, buffer: &mut [u8]) {
self.write_bytes(buffer); self.write_bytes(buffer);
@ -159,8 +159,8 @@ impl<T> RenderResource for Vec<T>
where where
T: Sized + Byteable, T: Sized + Byteable,
{ {
fn resource_type(&self) -> Option<ResourceType> { fn resource_type(&self) -> Option<RenderResourceType> {
Some(ResourceType::Buffer) Some(RenderResourceType::Buffer)
} }
fn write_buffer_bytes(&self, buffer: &mut [u8]) { fn write_buffer_bytes(&self, buffer: &mut [u8]) {
self.write_bytes(buffer); self.write_bytes(buffer);

10
crates/bevy_render/src/texture/texture.rs
View File

@ -1,6 +1,6 @@
use super::{SamplerDescriptor, TextureDescriptor}; use super::{SamplerDescriptor, TextureDescriptor};
use crate::{ use crate::{
render_resource::{RenderResource, RenderResourceId, ResourceType}, render_resource::{RenderResource, RenderResourceId, RenderResourceType},
renderer::RenderResourceContext, renderer::RenderResourceContext,
}; };
use bevy_app::{EventReader, Events}; use bevy_app::{EventReader, Events};
@ -118,8 +118,8 @@ pub struct TextureResourceSystemState {
} }
impl RenderResource for Option<Handle<Texture>> { impl RenderResource for Option<Handle<Texture>> {
fn resource_type(&self) -> Option<ResourceType> { fn resource_type(&self) -> Option<RenderResourceType> {
self.map(|_texture| ResourceType::Texture) self.map(|_texture| RenderResourceType::Texture)
} }
fn write_buffer_bytes(&self, _buffer: &mut [u8]) {} fn write_buffer_bytes(&self, _buffer: &mut [u8]) {}
fn buffer_byte_len(&self) -> Option<usize> { fn buffer_byte_len(&self) -> Option<usize> {
@ -131,8 +131,8 @@ impl RenderResource for Option<Handle<Texture>> {
} }
impl RenderResource for Handle<Texture> { impl RenderResource for Handle<Texture> {
fn resource_type(&self) -> Option<ResourceType> { fn resource_type(&self) -> Option<RenderResourceType> {
Some(ResourceType::Texture) Some(RenderResourceType::Texture)
} }
fn write_buffer_bytes(&self, _buffer: &mut [u8]) {} fn write_buffer_bytes(&self, _buffer: &mut [u8]) {}
fn buffer_byte_len(&self) -> Option<usize> { fn buffer_byte_len(&self) -> Option<usize> {