Update bevy and wgpu

This commit is contained in:
Sludge
2022-08-04 00:03:16 +02:00
parent 680c719f67
commit c4f078daf3
7 changed files with 40 additions and 34 deletions

View File

@@ -1,6 +1,6 @@
pub mod r3d {
use bevy::{
core_pipeline::Opaque3d,
core_pipeline::core_3d::Opaque3d,
pbr::{
DrawMesh, MeshPipeline, MeshPipelineKey, MeshUniform, SetMeshBindGroup,
SetMeshViewBindGroup,
@@ -89,11 +89,11 @@ pub mod r3d {
shader: self.shader.clone_weak(),
shader_defs,
entry_point: "fragment".into(),
targets: vec![ColorTargetState {
targets: vec![Some(ColorTargetState {
format: TextureFormat::bevy_default(),
blend,
write_mask: ColorWrites::ALL,
}],
})],
}),
layout: Some(vec![self.mesh_pipeline.view_layout.clone()]),
primitive: PrimitiveState {
@@ -182,8 +182,7 @@ pub mod r3d {
pub mod r2d {
use bevy::{
asset::Handle,
core::FloatOrd,
core_pipeline::Transparent2d,
core_pipeline::core_2d::Transparent2d,
prelude::*,
render::{
mesh::MeshVertexBufferLayout,
@@ -204,6 +203,7 @@ pub mod r2d {
DrawMesh2d, Mesh2dHandle, Mesh2dPipeline, Mesh2dPipelineKey, Mesh2dUniform,
SetMesh2dBindGroup, SetMesh2dViewBindGroup,
},
utils::FloatOrd,
};
use crate::lines::{RenderDebugLinesMesh, DEBUG_LINES_SHADER_HANDLE};
@@ -256,11 +256,11 @@ pub mod r2d {
shader: self.shader.clone_weak(),
shader_defs: vec![],
entry_point: "fragment".into(),
targets: vec![ColorTargetState {
targets: vec![Some(ColorTargetState {
format: TextureFormat::bevy_default(),
blend: Some(BlendState::ALPHA_BLENDING),
write_mask: ColorWrites::ALL,
}],
})],
}),
layout: Some(vec![self.mesh_pipeline.view_layout.clone()]),
primitive: PrimitiveState {