move batch to its own module

crates/bevy_render/src/draw_target/draw_targets/assigned_batches_draw_target.rs

@@ -2,9 +2,9 @@ use crate::{
     draw_target::DrawTarget,
     pass::RenderPass,
     pipeline::PipelineDescriptor,
-    render_resource::{resource_name, AssetBatchers, RenderResourceAssignments},
+    render_resource::{resource_name, RenderResourceAssignments},
     renderer::RenderContext,
-    Renderable,
+    Renderable, batch::AssetBatchers,
 };
 use bevy_asset::Handle;
 use legion::prelude::*;

crates/bevy_render/src/lib.rs

@@ -1,4 +1,5 @@
 #![feature(min_specialization)]
+pub mod batch;
 mod camera;
 pub mod entity;
 pub mod mesh;
@@ -30,13 +31,14 @@ use self::{
         PipelineAssignments, PipelineCompiler, PipelineDescriptor, VertexBufferDescriptors,
     },
     render_resource::{
-        entity_render_resource_assignments_system, AssetBatchers, EntityRenderResourceAssignments,
+        entity_render_resource_assignments_system, EntityRenderResourceAssignments,
         RenderResourceAssignments,
     },
     shader::Shader,
     texture::Texture,
 };
 
+use batch::AssetBatchers;
 use bevy_app::{stage, AppBuilder, AppPlugin};
 use bevy_asset::AssetStorage;
 use mesh::mesh_resource_provider_system;

crates/bevy_render/src/mesh.rs

@@ -3,10 +3,10 @@ use crate::{
         state_descriptors::{IndexFormat, PrimitiveTopology},
         VertexBufferDescriptor, VertexBufferDescriptors, VertexFormat,
     },
-    render_resource::{AssetBatchers, BufferInfo, BufferUsage, RenderResourceAssignments},
+    render_resource::{BufferInfo, BufferUsage, RenderResourceAssignments},
     renderer::{GlobalRenderResourceContext, RenderResourceContext},
     shader::AsUniforms,
-    Renderable, Vertex,
+    Renderable, Vertex, batch::AssetBatchers,
 };
 use bevy_asset::{AssetStorage, Handle};
 use glam::*;

crates/bevy_render/src/render_resource/mod.rs

@@ -1,4 +1,3 @@
-mod batching;
 mod buffer;
 mod entity_render_resource_assignments;
 mod render_resource;
@@ -6,7 +5,6 @@ mod render_resource_assignments;
 mod resource_info;
 pub mod resource_name;
 
-pub use batching::*;
 pub use buffer::*;
 pub use entity_render_resource_assignments::*;
 pub use render_resource::*;

crates/bevy_render/src/shader/uniform.rs

@@ -1,9 +1,8 @@
 use crate::{
     color::ColorSource,
     pipeline::{BindType, VertexBufferDescriptor},
-    render_resource::AssetBatchers,
     texture::Texture,
-    Renderable,
+    Renderable, batch::AssetBatchers,
 };
 
 use bevy_asset::{AssetStorage, Handle};

src/prelude.rs

@@ -24,7 +24,8 @@ pub use crate::render::{
         },
         RenderGraph,
     },
-    render_resource::{resource_name, AssetBatchers},
+    render_resource::resource_name,
+    batch::AssetBatchers,
     shader::{Shader, ShaderDefSuffixProvider, ShaderStage, ShaderStages},
     texture::{Texture, TextureType},
     ActiveCamera, ActiveCamera2d, Camera, CameraType, Color, ColorSource, Renderable,