From 2289affc3c7f28b2ce751ba26441ae8b432ba968 Mon Sep 17 00:00:00 2001 From: djefrey Date: Tue, 3 Nov 2026 19:51:33 +0100 Subject: [PATCH] Fix LevelUniforms buffer overflow LevelUniforms SIZE was one scalar short, causing a buffer overflow FrameUniforms SIZE was two scalar shorts, but align16 prevented the overflow --- .../flywheel/backend/engine/uniform/FrameUniforms.java | 2 +- .../flywheel/backend/engine/uniform/LevelUniforms.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/FrameUniforms.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/FrameUniforms.java index 5a521b4c6d..c8b4a134dc 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/FrameUniforms.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/FrameUniforms.java @@ -20,7 +20,7 @@ import net.minecraft.world.phys.Vec3; public final class FrameUniforms extends UniformWriter { - private static final int SIZE = 96 + 64 * 9 + 16 * 5 + 8 * 2 + 8 + 4 * 19; + private static final int SIZE = 96 + 64 * 9 + 16 * 5 + 8 * 2 + 8 + 4 * 21; static final UniformBuffer BUFFER = new UniformBuffer(Uniforms.FRAME_INDEX, SIZE); private static final Matrix4f VIEW = new Matrix4f(); diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/LevelUniforms.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/LevelUniforms.java index 126f08a2a3..d80777b2d4 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/LevelUniforms.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/LevelUniforms.java @@ -9,7 +9,7 @@ import net.minecraft.world.phys.Vec3; public final class LevelUniforms extends UniformWriter { - private static final int SIZE = 16 * 4 + 4 * 12; + private static final int SIZE = 16 * 4 + 4 * 13; static final UniformBuffer BUFFER = new UniformBuffer(Uniforms.LEVEL_INDEX, SIZE); public static final Vector3f LIGHT0_DIRECTION = new Vector3f();