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

Ci.

Browse Source
This commit is contained in:
Charlotte McElwain 2025-07-11 10:33:12 -07:00
parent a0121e004e
commit e74b5be45d
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crates/bevy_pbr/src/material.rs
View File

@ -459,19 +459,15 @@ impl SpecializedMeshPipeline for MaterialPipelineSpecializer {
.pipeline .pipeline
.mesh_pipeline .mesh_pipeline
.specialize(key.mesh_key, layout)?; .specialize(key.mesh_key, layout)?;
descriptor.vertex.shader_defs.push( descriptor.vertex.shader_defs.push(ShaderDefVal::UInt(
ShaderDefVal::UInt( "MATERIAL_BIND_GROUP".into(),
MATERIAL_BIND_GROUP_INDEX as u32,
));
if let Some(ref mut fragment) = descriptor.fragment {
fragment.shader_defs.push(ShaderDefVal::UInt(
"MATERIAL_BIND_GROUP".into(), "MATERIAL_BIND_GROUP".into(),
MATERIAL_BIND_GROUP_INDEX as u32, MATERIAL_BIND_GROUP_INDEX as u32,
) ));
);
if let Some(ref mut fragment) = descriptor.fragment {
fragment.shader_defs.push(
ShaderDefVal::UInt(
"MATERIAL_BIND_GROUP".into(),
MATERIAL_BIND_GROUP_INDEX as u32,
)
);
}; };
if let Some(vertex_shader) = self.properties.get_shader(MaterialVertexShader) { if let Some(vertex_shader) = self.properties.get_shader(MaterialVertexShader) {
descriptor.vertex.shader = vertex_shader.clone(); descriptor.vertex.shader = vertex_shader.clone();

18
crates/bevy_sprite/src/mesh2d/material.rs
View File

@ -451,19 +451,15 @@ where
layout: &MeshVertexBufferLayoutRef, layout: &MeshVertexBufferLayoutRef,
) -> Result<RenderPipelineDescriptor, SpecializedMeshPipelineError> { ) -> Result<RenderPipelineDescriptor, SpecializedMeshPipelineError> {
let mut descriptor = self.mesh2d_pipeline.specialize(key.mesh_key, layout)?; let mut descriptor = self.mesh2d_pipeline.specialize(key.mesh_key, layout)?;
descriptor.vertex.shader_defs.push( descriptor.vertex.shader_defs.push(ShaderDefVal::UInt(
ShaderDefVal::UInt( "MATERIAL_BIND_GROUP".into(),
MATERIAL_2D_BIND_GROUP_INDEX as u32,
));
if let Some(ref mut fragment) = descriptor.fragment {
fragment.shader_defs.push(ShaderDefVal::UInt(
"MATERIAL_BIND_GROUP".into(), "MATERIAL_BIND_GROUP".into(),
MATERIAL_2D_BIND_GROUP_INDEX as u32, MATERIAL_2D_BIND_GROUP_INDEX as u32,
) ));
);
if let Some(ref mut fragment) = descriptor.fragment {
fragment.shader_defs.push(
ShaderDefVal::UInt(
"MATERIAL_BIND_GROUP".into(),
MATERIAL_2D_BIND_GROUP_INDEX as u32,
)
);
} }
if let Some(vertex_shader) = &self.vertex_shader { if let Some(vertex_shader) = &self.vertex_shader {
descriptor.vertex.shader = vertex_shader.clone(); descriptor.vertex.shader = vertex_shader.clone();