Skip to content

make webgl2 padding consistent #22357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
atlv24 wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −17
Open

make webgl2 padding consistent #22357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions crates/bevy_core_pipeline/src/skybox/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@ impl ExtractComponent for Skybox {
brightness: skybox.brightness * exposure,
transform: Transform::from_rotation(skybox.rotation.inverse()).to_matrix(),
#[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
_wasm_padding_8b: 0,
_webgl2_padding_8b: 0,
#[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
_wasm_padding_12b: 0,
_webgl2_padding_12b: 0,
#[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
_wasm_padding_16b: 0,
_webgl2_padding_16b: 0,
},
))
}
Expand All @@ -140,11 +140,11 @@ pub struct SkyboxUniforms {
brightness: f32,
transform: Mat4,
#[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
_wasm_padding_8b: u32,
_webgl2_padding_8b: u32,
#[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
_wasm_padding_12b: u32,
_webgl2_padding_12b: u32,
#[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
_wasm_padding_16b: u32,
_webgl2_padding_16b: u32,
}

#[derive(Resource)]
Expand Down
8 changes: 4 additions & 4 deletions crates/bevy_gizmos_render/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ fn extract_gizmo_data(
joints_resolution,
gap_scale,
line_scale,
#[cfg(feature = "webgl")]
_padding: Default::default(),
#[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
_webgl2_padding: Default::default(),
},
#[cfg(any(feature = "bevy_pbr", feature = "bevy_sprite_render"))]
GizmoMeshConfig {
Expand Down Expand Up @@ -219,8 +219,8 @@ struct LineGizmoUniform {
gap_scale: f32,
line_scale: f32,
/// WebGL2 structs must be 16 byte aligned.
#[cfg(feature = "webgl")]
_padding: bevy_math::Vec3,
#[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
_webgl2_padding: bevy_math::Vec3,
}

#[cfg_attr(
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_gizmos_render/src/pipeline_2d.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ impl SpecializedRenderPipeline for LineGizmoPipeline {
};

let shader_defs = vec![
#[cfg(feature = "webgl")]
#[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
"SIXTEEN_BYTE_ALIGNMENT".into(),
];

Expand Down Expand Up @@ -203,7 +203,7 @@ impl SpecializedRenderPipeline for LineJointGizmoPipeline {
};

let shader_defs = vec![
#[cfg(feature = "webgl")]
#[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
"SIXTEEN_BYTE_ALIGNMENT".into(),
];

Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_gizmos_render/src/pipeline_3d.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ impl Specializer<RenderPipeline> for LineGizmoPipelineSpecializer {

let fragment = descriptor.fragment_mut()?;

#[cfg(feature = "webgl")]
#[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
fragment.shader_defs.push("SIXTEEN_BYTE_ALIGNMENT".into());

if key.perspective {
Expand Down Expand Up @@ -203,7 +203,7 @@ impl SpecializedRenderPipeline for LineJointGizmoPipeline {

fn specialize(&self, key: Self::Key) -> RenderPipelineDescriptor {
let mut shader_defs = vec![
#[cfg(feature = "webgl")]
#[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
"SIXTEEN_BYTE_ALIGNMENT".into(),
];

Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_gizmos_render/src/retained.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ pub(crate) fn extract_linegizmos(
joints_resolution,
gap_scale,
line_scale,
#[cfg(feature = "webgl")]
_padding: Default::default(),
#[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
_webgl2_padding: Default::default(),
},
#[cfg(any(feature = "bevy_pbr", feature = "bevy_sprite_render"))]
bevy_gizmos::config::GizmoMeshConfig {
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_render/src/globals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pub struct GlobalsUniform {
frame_count: u32,
/// WebGL2 structs must be 16 byte aligned.
#[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
_wasm_padding: f32,
_webgl2_padding: f32,
}

/// The buffer containing the [`GlobalsUniform`]
Expand Down