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

fix things
Some checks failed
Weekly beta compile test / test (macos-latest) (push) Has been cancelled
Details
Weekly beta compile test / test (ubuntu-latest) (push) Has been cancelled
Details
Weekly beta compile test / test (windows-latest) (push) Has been cancelled
Details
Weekly beta compile test / lint (push) Has been cancelled
Details
Weekly beta compile test / check-compiles (push) Has been cancelled
Details
Weekly beta compile test / close-any-open-issues (push) Has been cancelled
Details
Weekly beta compile test / Warn that weekly CI fails (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Arkitu 2025-07-20 11:54:19 +02:00
parent 922b1c9fd1
commit 50ad9ef6bc
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/bevy_mikktspace/src/generated.rs
View File

@ -756,7 +756,7 @@ unsafe fn CompareSubGroups(mut pg1: *const SSubGroup, mut pg2: *const SSubGroup)
return false; return false;
} }
while i < (*pg1).iNrFaces as usize && bStillSame { while i < (*pg1).iNrFaces as usize && bStillSame {
bStillSame = if (*pg1).pTriMembers[i] == (*pg2).pTriMembers[i] { bStillSame = if (&(*pg1).pTriMembers)[i] == (&(*pg2).pTriMembers)[i] {
true true
} else { } else {
false false

11
crates/bevy_pbr/src/pbr_material.rs
View File

@ -1205,8 +1205,7 @@ impl AsBindGroupShaderType<StandardMaterialUniform> for StandardMaterial {
bitflags! { bitflags! {
/// The pipeline key for `StandardMaterial`, packed into 64 bits. /// The pipeline key for `StandardMaterial`, packed into 64 bits.
#[repr(C)] #[derive(Clone, Copy, PartialEq, Eq, Hash)]
#[derive(Clone, Copy, PartialEq, Eq, Hash, bytemuck::Pod, bytemuck::Zeroable)]
pub struct StandardMaterialKey: u64 { pub struct StandardMaterialKey: u64 {
const CULL_FRONT = 0x000001; const CULL_FRONT = 0x000001;
const CULL_BACK = 0x000002; const CULL_BACK = 0x000002;
@ -1373,7 +1372,7 @@ impl From<&StandardMaterial> for StandardMaterialKey {
impl Material for StandardMaterial { impl Material for StandardMaterial {
fn fragment_shader() -> ShaderRef { fn fragment_shader() -> ShaderRef {
shader_ref(bevy_asset::embedded_path!("render/pbr.wgsl")) PBR_SHADER_HANDLE.into()
} }
#[inline] #[inline]
@ -1409,11 +1408,11 @@ impl Material for StandardMaterial {
} }
fn prepass_fragment_shader() -> ShaderRef { fn prepass_fragment_shader() -> ShaderRef {
shader_ref(bevy_asset::embedded_path!("render/pbr_prepass.wgsl")) PBR_PREPASS_SHADER_HANDLE.into()
} }
fn deferred_fragment_shader() -> ShaderRef { fn deferred_fragment_shader() -> ShaderRef {
shader_ref(bevy_asset::embedded_path!("render/pbr.wgsl")) PBR_SHADER_HANDLE.into()
} }
#[cfg(feature = "meshlet")] #[cfg(feature = "meshlet")]
@ -1432,7 +1431,7 @@ impl Material for StandardMaterial {
} }
fn specialize( fn specialize(
_pipeline: &MaterialPipeline, _pipeline: &MaterialPipeline<Self>,
descriptor: &mut RenderPipelineDescriptor, descriptor: &mut RenderPipelineDescriptor,
_layout: &MeshVertexBufferLayoutRef, _layout: &MeshVertexBufferLayoutRef,
key: MaterialPipelineKey<Self>, key: MaterialPipelineKey<Self>,

2
rust-toolchain.toml Normal file
View File

@ -0,0 +1,2 @@
[toolchain]
channel = "nightly"