diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java index 08e299b86..5deb554a8 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java @@ -1991,7 +1991,9 @@ public class GLStateManager { } RENDER_BACKEND.bindTexture(GL11.GL_TEXTURE_2D, id); RENDER_BACKEND.texParameteri(GL11.GL_TEXTURE_2D, GL12.GL_TEXTURE_MAX_LEVEL, 0); + suspendPixelUnpackBuffer(); RENDER_BACKEND.texImage2D(GL11.GL_TEXTURE_2D, 0, GL30.GL_R8, 1, 1, 0, GL11.GL_RED, GL11.GL_UNSIGNED_BYTE, (ByteBuffer) null); + restorePixelUnpackBuffer(); // Restore previous binding on active unit RENDER_BACKEND.bindTexture(GL11.GL_TEXTURE_2D, savedBinding == id ? 0 : savedBinding); @@ -4964,25 +4966,25 @@ public class GLStateManager { RENDER_BACKEND.bindBuffer(target, buffer); } - private static void suspendPixelUnpackBuffer() { + static void suspendPixelUnpackBuffer() { if (boundPixelUnpackBuffer != 0) { RENDER_BACKEND.bindBuffer(GL21.GL_PIXEL_UNPACK_BUFFER, 0); } } - private static void restorePixelUnpackBuffer() { + static void restorePixelUnpackBuffer() { if (boundPixelUnpackBuffer != 0) { RENDER_BACKEND.bindBuffer(GL21.GL_PIXEL_UNPACK_BUFFER, boundPixelUnpackBuffer); } } - private static void suspendPixelPackBuffer() { + static void suspendPixelPackBuffer() { if (boundPixelPackBuffer != 0) { RENDER_BACKEND.bindBuffer(GL21.GL_PIXEL_PACK_BUFFER, 0); } } - private static void restorePixelPackBuffer() { + static void restorePixelPackBuffer() { if (boundPixelPackBuffer != 0) { RENDER_BACKEND.bindBuffer(GL21.GL_PIXEL_PACK_BUFFER, boundPixelPackBuffer); } diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/RenderSystem.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/RenderSystem.java index 687bf77c1..34414ecd9 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/RenderSystem.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/RenderSystem.java @@ -156,7 +156,9 @@ public class RenderSystem { public static void texImage2D(int texture, int target, int level, int internalformat, int width, int height, int border, int format, int type, @Nullable ByteBuffer pixels) { GLStateManager.glBindTexture(target, texture); + GLStateManager.suspendPixelUnpackBuffer(); RENDER_BACKEND.texImage2D(target, level, internalformat, width, height, border, format, type, pixels); + GLStateManager.restorePixelUnpackBuffer(); if (target == GL11.GL_TEXTURE_2D && level == 0) { TextureInfoCache.INSTANCE.onTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); } @@ -225,29 +227,41 @@ public class RenderSystem { } public static void textureImage2D(int texture, int target, int level, int internalformat, int width, int height, int border, int format, int type, ByteBuffer pixels) { + GLStateManager.suspendPixelUnpackBuffer(); dsaState.textureImage2D(texture, target, level, internalformat, width, height, border, format, type, pixels); + GLStateManager.restorePixelUnpackBuffer(); } public static void textureImage2D(int texture, int target, int level, int internalformat, int width, int height, int border, int format, int type, IntBuffer pixels) { + GLStateManager.suspendPixelUnpackBuffer(); dsaState.textureImage2D(texture, target, level, internalformat, width, height, border, format, type, pixels); + GLStateManager.restorePixelUnpackBuffer(); } public static void textureSubImage2D(int texture, int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ByteBuffer pixels) { + GLStateManager.suspendPixelUnpackBuffer(); dsaState.textureSubImage2D(texture, target, level, xoffset, yoffset, width, height, format, type, pixels); + GLStateManager.restorePixelUnpackBuffer(); } public static void textureSubImage2D(int texture, int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, IntBuffer pixels) { + GLStateManager.suspendPixelUnpackBuffer(); dsaState.textureSubImage2D(texture, target, level, xoffset, yoffset, width, height, format, type, pixels); + GLStateManager.restorePixelUnpackBuffer(); } public static void texImage1D(int texture, int target, int level, int internalformat, int width, int border, int format, int type, ByteBuffer pixels) { RENDER_BACKEND.bindTexture(target, texture); + GLStateManager.suspendPixelUnpackBuffer(); RENDER_BACKEND.texImage1D(target, level, internalformat, width, border, format, type, pixels); + GLStateManager.restorePixelUnpackBuffer(); } public static void texImage3D(int texture, int target, int level, int internalformat, int width, int height, int depth, int border, int format, int type, ByteBuffer pixels) { RENDER_BACKEND.bindTexture(target, texture); + GLStateManager.suspendPixelUnpackBuffer(); RENDER_BACKEND.texImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels); + GLStateManager.restorePixelUnpackBuffer(); } public static String getProgramInfoLog(int program) { @@ -271,7 +285,9 @@ public class RenderSystem { } public static void readPixels(int x, int y, int width, int height, int format, int type, FloatBuffer pixels) { + GLStateManager.suspendPixelPackBuffer(); RENDER_BACKEND.readPixels(x, y, width, height, format, type, pixels); + GLStateManager.restorePixelPackBuffer(); } public static void bufferData(int target, FloatBuffer data, int usage) { diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/ffp/Uniforms.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/ffp/Uniforms.java index 3e6f583a1..89a4ac4a8 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/ffp/Uniforms.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/ffp/Uniforms.java @@ -7,6 +7,7 @@ import com.gtnewhorizons.angelica.glsm.states.LightState; import com.gtnewhorizons.angelica.glsm.states.MaterialState; import com.gtnewhorizons.angelica.glsm.states.TexGenState; import com.gtnewhorizons.angelica.glsm.hooks.GLSMConfig; +import org.joml.Math; import org.joml.Matrix3f; import org.joml.Matrix4f; import org.joml.Vector4f; @@ -42,8 +43,8 @@ public class Uniforms { private final org.joml.Vector3f tempVec3 = new org.joml.Vector3f(); // Pre-computed constants for fog params (Mesa STATE_FOG_PARAMS_OPTIMIZED) - private static final double LN2 = Math.log(2.0); - private static final double SQRT_LN2 = Math.sqrt(LN2); + private static final double LN2 = java.lang.Math.log(2.0); + private static final double SQRT_LN2 = java.lang.Math.sqrt(LN2); // Dirty tracking: last-uploaded generation per category + program ID. // Program change forces full re-upload since uniform locations differ. @@ -315,10 +316,10 @@ public class Uniforms { // Upload the current color from GLSM final var color = GLStateManager.getColor(); vec4Buf.clear(); - vec4Buf.put(color.getRed()); - vec4Buf.put(color.getGreen()); - vec4Buf.put(color.getBlue()); - vec4Buf.put(color.getAlpha()); + vec4Buf.put(Math.clamp(0f, 1f, color.getRed())); + vec4Buf.put(Math.clamp(0f, 1f, color.getGreen())); + vec4Buf.put(Math.clamp(0f, 1f, color.getBlue())); + vec4Buf.put(Math.clamp(0f, 1f, color.getAlpha())); vec4Buf.flip(); RENDER_BACKEND.uniform4(program.locCurrentColor, vec4Buf); }