From 1d572e44dac656e8efd9b7cb18107265d91a54b9 Mon Sep 17 00:00:00 2001 From: StarArawn Date: Mon, 22 Nov 2021 10:41:59 -0500 Subject: [PATCH 1/3] Added missing wgpu image render resources. --- pipelined/bevy_render2/src/render_resource/mod.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/pipelined/bevy_render2/src/render_resource/mod.rs b/pipelined/bevy_render2/src/render_resource/mod.rs index 6b2c6ee7101b2..25eee2c9def59 100644 --- a/pipelined/bevy_render2/src/render_resource/mod.rs +++ b/pipelined/bevy_render2/src/render_resource/mod.rs @@ -36,5 +36,6 @@ pub use wgpu::{ TextureDescriptor, TextureDimension, TextureFormat, TextureSampleType, TextureUsages, TextureViewDescriptor, TextureViewDimension, VertexAttribute, VertexBufferLayout as RawVertexBufferLayout, VertexFormat, VertexState as RawVertexState, + ImageDataLayout, ImageCopyBuffer, ImageCopyBufferBase, ImageCopyTexture, ImageCopyTextureBase, ImageSubresourceRange, VertexStepMode, }; From 8bb4137d4b2c2989e2782f98002ceb62a43c397d Mon Sep 17 00:00:00 2001 From: StarArawn Date: Mon, 22 Nov 2021 11:00:02 -0500 Subject: [PATCH 2/3] Run format on file. --- pipelined/bevy_render2/src/render_resource/mod.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pipelined/bevy_render2/src/render_resource/mod.rs b/pipelined/bevy_render2/src/render_resource/mod.rs index 25eee2c9def59..fa443b10b716b 100644 --- a/pipelined/bevy_render2/src/render_resource/mod.rs +++ b/pipelined/bevy_render2/src/render_resource/mod.rs @@ -27,15 +27,15 @@ pub use wgpu::{ BlendFactor, BlendOperation, BlendState, BufferAddress, BufferBindingType, BufferSize, BufferUsages, ColorTargetState, ColorWrites, CompareFunction, ComputePassDescriptor, ComputePipelineDescriptor, DepthBiasState, DepthStencilState, Extent3d, Face, FilterMode, - FragmentState as RawFragmentState, FrontFace, IndexFormat, LoadOp, MultisampleState, - Operations, PipelineLayout, PipelineLayoutDescriptor, PolygonMode, PrimitiveState, - PrimitiveTopology, RenderPassColorAttachment, RenderPassDepthStencilAttachment, + FragmentState as RawFragmentState, FrontFace, ImageCopyBuffer, ImageCopyBufferBase, + ImageCopyTexture, ImageCopyTextureBase, ImageDataLayout, ImageSubresourceRange, IndexFormat, + LoadOp, MultisampleState, Operations, PipelineLayout, PipelineLayoutDescriptor, PolygonMode, + PrimitiveState, PrimitiveTopology, RenderPassColorAttachment, RenderPassDepthStencilAttachment, RenderPassDescriptor, RenderPipelineDescriptor as RawRenderPipelineDescriptor, SamplerDescriptor, ShaderModule, ShaderModuleDescriptor, ShaderSource, ShaderStages, StencilFaceState, StencilOperation, StencilState, StorageTextureAccess, TextureAspect, TextureDescriptor, TextureDimension, TextureFormat, TextureSampleType, TextureUsages, TextureViewDescriptor, TextureViewDimension, VertexAttribute, VertexBufferLayout as RawVertexBufferLayout, VertexFormat, VertexState as RawVertexState, - ImageDataLayout, ImageCopyBuffer, ImageCopyBufferBase, ImageCopyTexture, ImageCopyTextureBase, ImageSubresourceRange, VertexStepMode, }; From b26f563b13c267ffe1ee801bd71fd40b98a256e7 Mon Sep 17 00:00:00 2001 From: StarArawn Date: Mon, 22 Nov 2021 11:02:40 -0500 Subject: [PATCH 3/3] Added Origin3D --- .../bevy_render2/src/render_resource/mod.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pipelined/bevy_render2/src/render_resource/mod.rs b/pipelined/bevy_render2/src/render_resource/mod.rs index fa443b10b716b..144fe4917f3a4 100644 --- a/pipelined/bevy_render2/src/render_resource/mod.rs +++ b/pipelined/bevy_render2/src/render_resource/mod.rs @@ -29,13 +29,13 @@ pub use wgpu::{ ComputePipelineDescriptor, DepthBiasState, DepthStencilState, Extent3d, Face, FilterMode, FragmentState as RawFragmentState, FrontFace, ImageCopyBuffer, ImageCopyBufferBase, ImageCopyTexture, ImageCopyTextureBase, ImageDataLayout, ImageSubresourceRange, IndexFormat, - LoadOp, MultisampleState, Operations, PipelineLayout, PipelineLayoutDescriptor, PolygonMode, - PrimitiveState, PrimitiveTopology, RenderPassColorAttachment, RenderPassDepthStencilAttachment, - RenderPassDescriptor, RenderPipelineDescriptor as RawRenderPipelineDescriptor, - SamplerDescriptor, ShaderModule, ShaderModuleDescriptor, ShaderSource, ShaderStages, - StencilFaceState, StencilOperation, StencilState, StorageTextureAccess, TextureAspect, - TextureDescriptor, TextureDimension, TextureFormat, TextureSampleType, TextureUsages, - TextureViewDescriptor, TextureViewDimension, VertexAttribute, - VertexBufferLayout as RawVertexBufferLayout, VertexFormat, VertexState as RawVertexState, - VertexStepMode, + LoadOp, MultisampleState, Operations, Origin3d, PipelineLayout, PipelineLayoutDescriptor, + PolygonMode, PrimitiveState, PrimitiveTopology, RenderPassColorAttachment, + RenderPassDepthStencilAttachment, RenderPassDescriptor, + RenderPipelineDescriptor as RawRenderPipelineDescriptor, SamplerDescriptor, ShaderModule, + ShaderModuleDescriptor, ShaderSource, ShaderStages, StencilFaceState, StencilOperation, + StencilState, StorageTextureAccess, TextureAspect, TextureDescriptor, TextureDimension, + TextureFormat, TextureSampleType, TextureUsages, TextureViewDescriptor, TextureViewDimension, + VertexAttribute, VertexBufferLayout as RawVertexBufferLayout, VertexFormat, + VertexState as RawVertexState, VertexStepMode, };