From 1c5dc1d68f9f49900bb8d85ea294177785112770 Mon Sep 17 00:00:00 2001 From: Mr Robot Date: Fri, 2 Oct 2026 17:24:25 +0200 Subject: [PATCH 1/6] Restore unknown texture and framebuffer bindings after invalidation --- .../java/com/jme3/renderer/RenderContext.java | 42 +- .../com/jme3/renderer/opengl/GLRenderer.java | 40 +- .../renderer/RenderContextBindingTest.java | 108 ++++ .../GlRendererBindingInvalidationTest.java | 480 ++++++++++++++++++ 4 files changed, 660 insertions(+), 10 deletions(-) create mode 100644 jme3-core/src/test/java/com/jme3/renderer/RenderContextBindingTest.java create mode 100644 jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererBindingInvalidationTest.java diff --git a/jme3-core/src/main/java/com/jme3/renderer/RenderContext.java b/jme3-core/src/main/java/com/jme3/renderer/RenderContext.java index 15a202a6a5..8c04b83be0 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/RenderContext.java +++ b/jme3-core/src/main/java/com/jme3/renderer/RenderContext.java @@ -207,12 +207,15 @@ private static WeakReference[] newWeakReferenceArray(int size) { public Shader boundShader; /** - * ID of the bound FrameBuffer. + * ID of the bound FrameBuffer. This value is untrusted while + * {@link #isFrameBufferBindingValid()} is false. * * @see Renderer#setFrameBuffer(com.jme3.texture.FrameBuffer) */ public int boundFBO; + private boolean frameBufferBindingValid = true; + /** * Currently bound FrameBuffer. * @@ -289,7 +292,7 @@ private static WeakReference[] newWeakReferenceArray(int size) { public final IDList textureIndexList = new IDList(); /** - * Currently bound texture unit. + * Currently bound texture unit, or -1 when the active unit is unknown. * * @see Renderer#setTexture(int, com.jme3.texture.Texture) */ @@ -374,6 +377,40 @@ public RenderContext() { init(); } + /** + * Tests whether the cached framebuffer binding can suppress a GL bind. + * + * @return true if the binding is known + */ + public boolean isFrameBufferBindingValid() { + return frameBufferBindingValid; + } + + /** + * Updates the validity of the cached framebuffer binding after applying + * native state or restoring a previously saved cache. + * + * @param valid true if the cached framebuffer binding is known + */ + public void setFrameBufferBindingValid(boolean valid) { + frameBufferBindingValid = valid; + } + + /** + * Invalidates texture and framebuffer bindings after external GL changes. + * This does not modify native state. Unlike reset(), it does not assume + * that texture unit zero or the default framebuffer is bound. + */ + public void invalidateBindings() { + boundTextureUnit = -1; + frameBufferBindingValid = false; + boundFB = null; + for (int i = 0; i < boundTextures.length; i++) { + boundTextures[i] = null; + } + textureIndexList.reset(); + } + private void init() { cullMode = RenderState.FaceCullMode.Off; @@ -399,6 +436,7 @@ private void init() { boundShader = null; boundFBO = 0; boundFB = null; + frameBufferBindingValid = true; boundRB = 0; boundElementArrayVBO = 0; diff --git a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java index be54cb3092..b0cf187e0a 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java +++ b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java @@ -903,6 +903,7 @@ public void initialize() { @Override public void invalidateState() { context.reset(); + context.invalidateBindings(); if (gl2 != null) { context.initialDrawBuf = getInteger(GL2.GL_DRAW_BUFFER); context.initialReadBuf = getInteger(GL2.GL_READ_BUFFER); @@ -2004,6 +2005,13 @@ public void copyFrameBuffer(FrameBuffer src, FrameBuffer dst, boolean copyColor, int prevFBO = context.boundFBO; FrameBuffer prevFB = context.boundFB; + boolean prevBindingValid = context.isFrameBufferBindingValid(); + // Attachment updates below can bind another framebuffer. An unknown + // binding may also have different native read and draw targets. + final int prevReadFramebuffer = prevBindingValid ? prevFBO + : getInteger(GLFbo.GL_READ_FRAMEBUFFER_BINDING_EXT); + final int prevDrawFramebuffer = prevBindingValid ? prevFBO + : getInteger(GLFbo.GL_DRAW_FRAMEBUFFER_BINDING_EXT); if (mainFbOverride != null) { if (src == null) { @@ -2062,10 +2070,18 @@ public void copyFrameBuffer(FrameBuffer src, FrameBuffer dst, boolean copyColor, GL.GL_NEAREST); - glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, prevFBO); + if (prevBindingValid) { + glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, prevFBO); + } else { + glfbo.glBindFramebufferEXT(GLFbo.GL_READ_FRAMEBUFFER_EXT, prevReadFramebuffer); + glfbo.glBindFramebufferEXT(GLFbo.GL_DRAW_FRAMEBUFFER_EXT, prevDrawFramebuffer); + } context.boundFBO = prevFBO; context.boundFB = prevFB; - toggleFramebufferSrgb(prevFB); + context.setFrameBufferBindingValid(prevBindingValid); + if (prevBindingValid) { + toggleFramebufferSrgb(prevFB); + } } else { throw new RendererException("Framebuffer blitting not supported by the video hardware"); } @@ -2220,18 +2236,20 @@ public void updateFrameBufferAttachment(FrameBuffer fb, RenderBuffer rb) { private void bindFrameBuffer(FrameBuffer fb) { if (fb == null) { - if (context.boundFBO != defaultFBO) { + if (!context.isFrameBufferBindingValid() || context.boundFBO != defaultFBO) { glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, defaultFBO); statistics.onFrameBufferUse(null, true); context.boundFBO = defaultFBO; context.boundFB = null; + context.setFrameBufferBindingValid(true); } } else { assert fb.getId() != -1 && fb.getId() != 0; - if (context.boundFBO != fb.getId()) { + if (!context.isFrameBufferBindingValid() || context.boundFBO != fb.getId()) { glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, fb.getId()); context.boundFBO = fb.getId(); context.boundFB = fb; + context.setFrameBufferBindingValid(true); statistics.onFrameBufferUse(fb, true); } else { statistics.onFrameBufferUse(fb, false); @@ -2311,7 +2329,7 @@ public Vector2f[] getFrameBufferSamplePositions(FrameBuffer fb) { @Override public void setMainFrameBufferOverride(FrameBuffer fb) { mainFbOverride = null; - if (context.boundFBO == 0) { + if (context.isFrameBufferBindingValid() && context.boundFBO == 0) { // Main FB is now set to fb, make sure its bound setFrameBuffer(fb); } @@ -2385,7 +2403,13 @@ public void setFrameBuffer(FrameBuffer fb) { fb = mainFbOverride; } - if (context.boundFB == fb) { + if (fb == null && !caps.contains(Caps.FrameBuffer)) { + // Selecting the screen does not require framebuffer-object support. + toggleFramebufferSrgb(null); + return; + } + + if (context.isFrameBufferBindingValid() && context.boundFB == fb) { if (fb == null || !fb.isUpdateNeeded()) { toggleFramebufferSrgb(fb); return; @@ -2488,7 +2512,7 @@ private void deleteRenderBuffer(FrameBuffer fb, RenderBuffer rb) { @Override public void deleteFrameBuffer(FrameBuffer fb) { if (fb.getId() != -1) { - if (context.boundFBO == fb.getId()) { + if (context.isFrameBufferBindingValid() && context.boundFBO == fb.getId()) { glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, 0); context.boundFBO = 0; } @@ -3838,7 +3862,7 @@ public void setMainFrameBufferSrgb(boolean enableSrgb) { } mainFrameBufferSrgb = enableSrgb; - if (context.boundFB == null) { + if (context.isFrameBufferBindingValid() && context.boundFB == null) { toggleFramebufferSrgb(null); } } diff --git a/jme3-core/src/test/java/com/jme3/renderer/RenderContextBindingTest.java b/jme3-core/src/test/java/com/jme3/renderer/RenderContextBindingTest.java new file mode 100644 index 0000000000..c1d6b635a9 --- /dev/null +++ b/jme3-core/src/test/java/com/jme3/renderer/RenderContextBindingTest.java @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2009-2026 jMonkeyEngine + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'jMonkeyEngine' nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package com.jme3.renderer; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import com.jme3.texture.FrameBuffer; +import com.jme3.texture.Image; +import org.junit.jupiter.api.Test; + +/** + * Verifies the distinction between fresh defaults and externally changed bindings. + */ +public class RenderContextBindingTest { + + @Test + public void freshContextHasKnownDefaultBindings() { + RenderContext context = new RenderContext(); + assertDefaults(context); + } + + @Test + public void bindingInvalidationClearsTextureReferencesWithoutAssumingNativeDefaults() { + RenderContext context = new RenderContext(); + Image image = new Image(); + context.boundTextures[0] = image.getWeakRef(); + context.boundTextures[3] = image.getWeakRef(); + context.textureIndexList.moveToNew(3); + context.textureIndexList.copyNewToOld(); + context.boundTextureUnit = 3; + context.boundFBO = 12; + context.boundFB = new FrameBuffer(4, 4, 1); + + context.invalidateBindings(); + + assertEquals(-1, context.boundTextureUnit); + assertEquals(12, context.boundFBO); + assertNull(context.boundFB); + assertFalse(context.isFrameBufferBindingValid()); + for (int unit = 0; unit < context.boundTextures.length; unit++) { + assertNull(context.boundTextures[unit]); + } + assertEquals(0, context.textureIndexList.oldLen); + assertEquals(0, context.textureIndexList.newLen); + } + + @Test + public void resetReturnsBindingsToKnownFreshDefaults() { + RenderContext context = new RenderContext(); + context.boundFBO = 12; + context.boundTextureUnit = 3; + context.invalidateBindings(); + context.reset(); + assertDefaults(context); + } + + @Test + public void framebufferValidationDoesNotValidateTheActiveTextureUnit() { + RenderContext context = new RenderContext(); + context.invalidateBindings(); + context.boundFBO = 12; + context.setFrameBufferBindingValid(true); + assertTrue(context.isFrameBufferBindingValid()); + assertEquals(-1, context.boundTextureUnit); + context.setFrameBufferBindingValid(false); + assertFalse(context.isFrameBufferBindingValid()); + assertEquals(12, context.boundFBO); + } + + private static void assertDefaults(RenderContext context) { + assertEquals(0, context.boundTextureUnit); + assertEquals(0, context.boundFBO); + assertNull(context.boundFB); + assertTrue(context.isFrameBufferBindingValid()); + } +} diff --git a/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererBindingInvalidationTest.java b/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererBindingInvalidationTest.java new file mode 100644 index 0000000000..445f982ed8 --- /dev/null +++ b/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererBindingInvalidationTest.java @@ -0,0 +1,480 @@ +/* + * Copyright (c) 2009-2026 jMonkeyEngine + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'jMonkeyEngine' nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package com.jme3.renderer.opengl; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import com.jme3.renderer.Caps; +import com.jme3.renderer.Limits; +import com.jme3.renderer.RenderContext; +import com.jme3.renderer.RendererException; +import com.jme3.texture.FrameBuffer; +import com.jme3.texture.Image; +import com.jme3.texture.Texture; +import com.jme3.texture.Texture2D; +import com.jme3.texture.image.ColorSpace; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.nio.ByteBuffer; +import java.nio.IntBuffer; +import java.util.ArrayList; +import java.util.List; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; +import org.junit.jupiter.params.provider.ValueSource; + +/** Test-only model of native bindings; intentionally separate from RenderContext. */ +public class GlRendererBindingInvalidationTest { + + @ParameterizedTest + @ValueSource(booleans = {false, true}) + public void textureZeroAfterExternalActiveUnit(boolean desktop) throws Exception { + Recording driver = new Recording(desktop); + driver.activeUnit = 3; + driver.textureBindings[0] = 16; + driver.renderer.invalidateState(); + driver.renderer.setTexture(0, texture(17)); + assertEquals(17, driver.textureBindings[0]); + assertEquals(0, driver.activeUnit); + } + + @ParameterizedTest + @ValueSource(booleans = {false, true}) + public void repeatedTextureZeroAfterInvalidation(boolean desktop) throws Exception { + Recording driver = new Recording(desktop); + Texture2D texture = texture(17); + driver.renderer.setTexture(0, texture); + driver.activeUnit = 3; + driver.textureBindings[0] = 16; + driver.renderer.invalidateState(); + driver.renderer.setTexture(0, texture); + assertEquals(17, driver.textureBindings[0]); + driver.calls.clear(); + driver.renderer.setTexture(0, texture); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); + } + + @ParameterizedTest + @ValueSource(booleans = {false, true}) + public void nonzeroTextureUnitControl(boolean desktop) throws Exception { + Recording driver = new Recording(desktop); + driver.activeUnit = 3; + driver.renderer.invalidateState(); + driver.renderer.setTexture(1, texture(17)); + assertEquals(17, driver.textureBindings[1]); + assertEquals(1, driver.activeUnit); + } + + @ParameterizedTest + @ValueSource(booleans = {false, true}) + public void freshTextureAndRepeatControl(boolean desktop) throws Exception { + Recording driver = new Recording(desktop); + Texture2D texture = texture(17); + driver.renderer.setTexture(0, texture); + assertEquals(17, driver.textureBindings[0]); + assertFalse(driver.calls.contains("glActiveTexture")); + driver.calls.clear(); + driver.renderer.setTexture(0, texture); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); + } + + @ParameterizedTest + @ValueSource(ints = {0, 7}) + public void defaultFramebufferAfterExternalBinding(int defaultId) throws Exception { + Recording driver = new Recording(false); + driver.setDefaultFramebuffer(defaultId); + driver.setNativeFramebuffer(9); + driver.renderer.invalidateState(); + driver.calls.clear(); + driver.renderer.setFrameBuffer(null); + assertEquals(defaultId, driver.drawFramebuffer); + assertEquals(1, driver.calls.stream().filter("glBindFramebufferEXT"::equals).count()); + driver.calls.clear(); + driver.renderer.setFrameBuffer(null); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); + } + + @ParameterizedTest + @ValueSource(ints = {0, 7}) + public void explicitFramebufferControl(int defaultId) throws Exception { + Recording driver = new Recording(false); + driver.setDefaultFramebuffer(defaultId); + driver.setNativeFramebuffer(9); + FrameBuffer target = new FrameBuffer(4, 4, 1); + target.setId(12); + target.clearUpdateNeeded(); + driver.renderer.invalidateState(); + driver.renderer.setFrameBuffer(target); + assertEquals(12, driver.drawFramebuffer); + driver.calls.clear(); + driver.renderer.setFrameBuffer(target); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); + } + + @ParameterizedTest + @ValueSource(booleans = {false, true}) + public void invalidationDoesNotMutateBindings(boolean desktop) throws Exception { + Recording driver = new Recording(desktop); + driver.activeUnit = 3; + driver.setNativeFramebuffer(9); + driver.renderer.invalidateState(); + assertEquals(3, driver.activeUnit); + assertEquals(9, driver.drawFramebuffer); + assertFalse(driver.calls.contains("glActiveTexture")); + assertFalse(driver.calls.contains("glBindFramebufferEXT")); + } + + @ParameterizedTest + @ValueSource(booleans = {false, true}) + public void freshDefaultFramebufferElidesBinding(boolean desktop) throws Exception { + Recording driver = new Recording(desktop); + driver.renderer.setFrameBuffer(null); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); + } + + @ParameterizedTest + @ValueSource(booleans = {false, true}) + public void nullFramebufferDoesNotRequireFramebufferSupport(boolean desktop) throws Exception { + Recording driver = new Recording(desktop); + driver.renderer.getCaps().remove(Caps.FrameBuffer); + driver.renderer.setFrameBuffer(null); + driver.renderer.invalidateState(); + driver.calls.clear(); + driver.renderer.setFrameBuffer(null); + driver.renderer.setFrameBuffer(null); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); + assertThrows(RendererException.class, () -> driver.renderer.setFrameBuffer(framebuffer(12))); + } + + @ParameterizedTest + @ValueSource(booleans = {false, true}) + public void uploadAfterInvalidationUsesRequestedUnit(boolean desktop) throws Exception { + Recording driver = new Recording(desktop); + Texture2D texture = texture(17); + texture.getImage().setUpdateNeeded(); + driver.activeUnit = 3; + driver.renderer.invalidateState(); + driver.renderer.setTexture(0, texture); + assertEquals(0, driver.activeUnit); + assertEquals(17, driver.textureBindings[0]); + assertEquals(17, driver.lastUploadedTexture); + } + + @ParameterizedTest + @ValueSource(booleans = {false, true}) + public void parameterChangeAfterRepeatedInvalidationUsesRequestedUnit(boolean desktop) throws Exception { + Recording driver = new Recording(desktop); + Texture2D texture = texture(17); + driver.renderer.setTexture(0, texture); + driver.activeUnit = 3; + driver.textureBindings[3] = 19; + driver.renderer.invalidateState(); + driver.renderer.invalidateState(); + texture.setMagFilter(Texture.MagFilter.Bilinear); + driver.renderer.setTexture(0, texture); + assertEquals(0, driver.activeUnit); + assertEquals(17, driver.lastParameterTexture); + assertEquals(19, driver.textureBindings[3]); + driver.calls.clear(); + driver.renderer.setTexture(0, texture); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); + } + + @ParameterizedTest + @CsvSource({"0, 9, 9", "0, 9, 10", "7, 9, 9", "7, 9, 10"}) + public void unknownCopyRestoresNativeBindingsWithoutValidatingCache( + int defaultId, int readId, int drawId) throws Exception { + Recording driver = new Recording(false); + driver.setDefaultFramebuffer(defaultId); + driver.readFramebuffer = readId; + driver.drawFramebuffer = drawId; + driver.renderer.invalidateState(); + driver.calls.clear(); + driver.renderer.copyFrameBuffer(framebuffer(12), framebuffer(13), true, false); + assertEquals(readId, driver.readFramebuffer); + assertEquals(drawId, driver.drawFramebuffer); + assertFalse(driver.context.isFrameBufferBindingValid()); + assertEquals(2, driver.countCalls("glGetInteger")); + assertEquals(List.of("glGetInteger", "glGetInteger"), driver.calls.subList(0, 2)); + driver.calls.clear(); + driver.renderer.setFrameBuffer(null); + assertEquals(defaultId, driver.readFramebuffer); + assertEquals(defaultId, driver.drawFramebuffer); + assertEquals(1, driver.countCalls("glBindFramebufferEXT")); + driver.calls.clear(); + driver.renderer.setFrameBuffer(null); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); + } + + @ParameterizedTest + @ValueSource(booleans = {false, true}) + public void unknownCopySnapshotsBindingsBeforeAttachmentUpdates(boolean desktop) throws Exception { + Recording driver = new Recording(desktop); + driver.readFramebuffer = 9; + driver.drawFramebuffer = 10; + driver.renderer.invalidateState(); + FrameBuffer source = new FrameBuffer(4, 4, 1); + source.addColorTarget(FrameBuffer.FrameBufferTarget.newTarget(Image.Format.RGBA8)); + FrameBuffer destination = new FrameBuffer(4, 4, 1); + destination.addColorTarget(FrameBuffer.FrameBufferTarget.newTarget(Image.Format.RGBA8)); + driver.calls.clear(); + driver.renderer.copyFrameBuffer(source, destination, true, false); + assertTrue(source.getId() > 0); + assertTrue(destination.getId() > 0); + assertEquals(9, driver.readFramebuffer); + assertEquals(10, driver.drawFramebuffer); + assertFalse(driver.context.isFrameBufferBindingValid()); + assertEquals(List.of("glGetInteger", "glGetInteger"), driver.calls.subList(0, 2)); + driver.renderer.setFrameBuffer(null); + assertEquals(0, driver.drawFramebuffer); + } + + @ParameterizedTest + @ValueSource(booleans = {false, true}) + public void knownCopyUsesCachedBindingAndPreservesElision(boolean desktop) throws Exception { + Recording driver = new Recording(desktop); + FrameBuffer previous = framebuffer(14); + driver.renderer.setFrameBuffer(previous); + driver.calls.clear(); + driver.renderer.copyFrameBuffer(framebuffer(12), framebuffer(13), true, false); + assertEquals(14, driver.readFramebuffer); + assertEquals(14, driver.drawFramebuffer); + assertTrue(driver.context.isFrameBufferBindingValid()); + assertSame(previous, driver.renderer.getCurrentFrameBuffer()); + assertEquals(0, driver.countCalls("glGetInteger")); + assertEquals(3, driver.countCalls("glBindFramebufferEXT")); + driver.calls.clear(); + driver.renderer.setFrameBuffer(previous); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); + } + + @ParameterizedTest + @ValueSource(ints = {0, 7}) + public void unknownOverrideDefersBindingUntilNullSelection(int defaultId) throws Exception { + Recording driver = new Recording(false); + driver.setDefaultFramebuffer(defaultId); + driver.setNativeFramebuffer(9); + driver.renderer.invalidateState(); + driver.calls.clear(); + FrameBuffer override = framebuffer(12); + driver.renderer.setMainFrameBufferOverride(override); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); + assertEquals(9, driver.drawFramebuffer); + driver.renderer.setFrameBuffer(null); + assertEquals(12, driver.drawFramebuffer); + assertTrue(driver.context.isFrameBufferBindingValid()); + driver.calls.clear(); + driver.renderer.setFrameBuffer(null); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); + } + + @Test + public void knownMainOverrideRetainsImmediateBinding() throws Exception { + Recording driver = new Recording(false); + driver.renderer.setMainFrameBufferOverride(framebuffer(12)); + assertEquals(12, driver.drawFramebuffer); + assertTrue(driver.context.isFrameBufferBindingValid()); + } + + @ParameterizedTest + @CsvSource({"0, 9", "0, 10", "7, 9", "7, 10"}) + public void deletingWhileUnknownDoesNotValidateOrEagerlyRebind( + int defaultId, int deletedId) throws Exception { + Recording driver = new Recording(false); + driver.setDefaultFramebuffer(defaultId); + driver.setNativeFramebuffer(9); + driver.renderer.invalidateState(); + driver.calls.clear(); + driver.renderer.deleteFrameBuffer(framebuffer(deletedId)); + assertEquals(deletedId == 9 ? 0 : 9, driver.drawFramebuffer); + assertEquals(0, driver.countCalls("glBindFramebufferEXT")); + assertFalse(driver.context.isFrameBufferBindingValid()); + driver.renderer.setFrameBuffer(null); + assertEquals(defaultId, driver.drawFramebuffer); + assertTrue(driver.context.isFrameBufferBindingValid()); + } + + @Test + public void unknownCopyRestorationDoesNotAssumeMainSrgbTarget() throws Exception { + Recording driver = new Recording(false); + driver.renderer.getCaps().add(Caps.Srgb); + driver.renderer.getCaps().add(Caps.SrgbWriteControl); + driver.setNativeFramebuffer(9); + driver.renderer.invalidateState(); + driver.renderer.setMainFrameBufferSrgb(true); + driver.calls.clear(); + driver.renderer.copyFrameBuffer(framebuffer(12), framebuffer(13), true, false); + assertEquals(9, driver.drawFramebuffer); + assertEquals(0, driver.countCalls("glEnable")); + assertFalse(driver.context.isFrameBufferBindingValid()); + driver.renderer.setFrameBuffer(null); + assertEquals(1, driver.countCalls("glEnable")); + } + + @Test + public void mainSrgbConfigurationDoesNotToggleAnUnknownTarget() throws Exception { + Recording driver = new Recording(false); + driver.renderer.getCaps().add(Caps.Srgb); + driver.renderer.getCaps().add(Caps.SrgbWriteControl); + driver.setNativeFramebuffer(9); + driver.renderer.invalidateState(); + driver.calls.clear(); + driver.renderer.setMainFrameBufferSrgb(true); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); + driver.renderer.setFrameBuffer(null); + assertEquals(1, driver.countCalls("glEnable")); + driver.calls.clear(); + driver.renderer.setMainFrameBufferSrgb(false); + assertEquals(1, driver.countCalls("glDisable")); + } + + private static Texture2D texture(int id) { + Image image = new Image(Image.Format.RGBA8, 1, 1, (ByteBuffer) null, ColorSpace.Linear); + image.setId(id); + Texture2D texture = new Texture2D(image); + texture.setMinFilter(Texture.MinFilter.NearestNoMipMaps); + texture.setMagFilter(Texture.MagFilter.Nearest); + image.clearUpdateNeeded(); + return texture; + } + + private static FrameBuffer framebuffer(int id) { + FrameBuffer framebuffer = new FrameBuffer(4, 4, 1); + framebuffer.setId(id); + framebuffer.clearUpdateNeeded(); + return framebuffer; + } + + private static final class Recording implements InvocationHandler { + private int activeUnit; + private int readFramebuffer; + private int drawFramebuffer; + private int nextObject = 100; + private int lastUploadedTexture; + private int lastParameterTexture; + private final int[] textureBindings = new int[16]; + private final List calls = new ArrayList<>(); + private final GLRenderer renderer; + private final RenderContext context; + + private Recording(boolean desktop) throws ReflectiveOperationException { + Class[] types = {desktop ? GL2.class : GL.class, GLExt.class, GLFbo.class}; + Object api = Proxy.newProxyInstance(GL.class.getClassLoader(), types, this); + renderer = new GLRenderer((GL) api, (GLExt) api, (GLFbo) api); + renderer.getCaps().add(Caps.FrameBuffer); + renderer.getCaps().add(Caps.FrameBufferBlit); + renderer.getCaps().add(desktop ? Caps.OpenGL20 : Caps.OpenGLES20); + renderer.getLimits().put(Limits.RenderBufferSize, 1024); + renderer.getLimits().put(Limits.FrameBufferAttachments, 16); + renderer.getLimits().put(Limits.TextureSize, 1024); + Field contextField = GLRenderer.class.getDeclaredField("context"); + contextField.setAccessible(true); + context = (RenderContext) contextField.get(renderer); + Field textureUtilField = GLRenderer.class.getDeclaredField("texUtil"); + textureUtilField.setAccessible(true); + TextureUtil textureUtil = (TextureUtil) textureUtilField.get(renderer); + textureUtil.initialize(renderer.getCaps()); + } + + private void setDefaultFramebuffer(int value) throws ReflectiveOperationException { + Field field = GLRenderer.class.getDeclaredField("defaultFBO"); + field.setAccessible(true); + field.setInt(renderer, value); + } + + private void setNativeFramebuffer(int value) { + readFramebuffer = value; + drawFramebuffer = value; + } + + private long countCalls(String name) { + return calls.stream().filter(name::equals).count(); + } + + @Override + public Object invoke(Object proxy, Method method, Object[] args) { + String name = method.getName(); + calls.add(name); + if (name.equals("glActiveTexture")) { + activeUnit = (Integer) args[0] - GL.GL_TEXTURE0; + } else if (name.equals("glBindTexture")) { + textureBindings[activeUnit] = (Integer) args[1]; + } else if (name.equals("glTexImage2D")) { + lastUploadedTexture = textureBindings[activeUnit]; + } else if (name.equals("glTexParameteri")) { + lastParameterTexture = textureBindings[activeUnit]; + } else if (name.equals("glBindFramebufferEXT")) { + int target = (Integer) args[0]; + int framebuffer = (Integer) args[1]; + assertTrue(framebuffer >= 0, "Unknown framebuffer ID passed to GL"); + if (target != GLFbo.GL_DRAW_FRAMEBUFFER_EXT) { + readFramebuffer = framebuffer; + } + if (target != GLFbo.GL_READ_FRAMEBUFFER_EXT) { + drawFramebuffer = framebuffer; + } + } else if (name.equals("glGetInteger")) { + int parameter = (Integer) args[0]; + int result = parameter == GLFbo.GL_READ_FRAMEBUFFER_BINDING_EXT ? readFramebuffer + : parameter == GLFbo.GL_DRAW_FRAMEBUFFER_BINDING_EXT ? drawFramebuffer : 0; + ((IntBuffer) args[1]).put(0, result); + } else if (name.equals("glGenFramebuffersEXT") || name.equals("glGenRenderbuffersEXT") + || name.equals("glGenTextures")) { + ((IntBuffer) args[0]).put(0, nextObject++); + } else if (name.equals("glDeleteFramebuffersEXT")) { + int framebuffer = ((IntBuffer) args[0]).get(0); + if (readFramebuffer == framebuffer) { + readFramebuffer = 0; + } + if (drawFramebuffer == framebuffer) { + drawFramebuffer = 0; + } + } else if (name.equals("glCheckFramebufferStatusEXT")) { + return GLFbo.GL_FRAMEBUFFER_COMPLETE_EXT; + } + if (method.getReturnType() == Integer.TYPE) { + return 0; + } + if (method.getReturnType() == Boolean.TYPE) { + return false; + } + return null; + } + } +} From 809b98829044eb698364dc1fb88242a97b7a6dbe Mon Sep 17 00:00:00 2001 From: Mr Robot Date: Fri, 2 Oct 2026 18:15:58 +0200 Subject: [PATCH 2/6] Record framebuffer bindings together and verify native target identity --- .../java/com/jme3/renderer/RenderContext.java | 31 ++++++--- .../com/jme3/renderer/opengl/GLRenderer.java | 30 ++++---- .../renderer/RenderContextBindingTest.java | 46 +++++++++++-- .../GlRendererBindingInvalidationTest.java | 69 ++++++++++++++++++- 4 files changed, 147 insertions(+), 29 deletions(-) diff --git a/jme3-core/src/main/java/com/jme3/renderer/RenderContext.java b/jme3-core/src/main/java/com/jme3/renderer/RenderContext.java index 8c04b83be0..1d8391101e 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/RenderContext.java +++ b/jme3-core/src/main/java/com/jme3/renderer/RenderContext.java @@ -217,7 +217,10 @@ private static WeakReference[] newWeakReferenceArray(int size) { private boolean frameBufferBindingValid = true; /** - * Currently bound FrameBuffer. + * Java object associated with the known framebuffer binding, or null when + * there is no associated object or the binding is unknown. A null value + * does not imply a native framebuffer name of zero; presentation and + * externally managed framebuffers can have nonzero names. * * @see Renderer#setFrameBuffer(com.jme3.texture.FrameBuffer) */ @@ -387,13 +390,26 @@ public boolean isFrameBufferBindingValid() { } /** - * Updates the validity of the cached framebuffer binding after applying - * native state or restoring a previously saved cache. + * Records the object and native name of a known framebuffer binding. + * Call after establishing native state or restoring a known binding. * - * @param valid true if the cached framebuffer binding is known + * @param fb the associated Java framebuffer, or null if there is none + * @param fbo the known native framebuffer name */ - public void setFrameBufferBindingValid(boolean valid) { - frameBufferBindingValid = valid; + public void setFrameBufferBinding(FrameBuffer fb, int fbo) { + boundFB = fb; + boundFBO = fbo; + frameBufferBindingValid = true; + } + + /** + * Invalidates only the framebuffer binding, leaving texture bindings alone. + * The numeric name is retained as an untrusted value, and the associated + * Java object is cleared. This does not modify native state. + */ + public void invalidateFrameBufferBinding() { + frameBufferBindingValid = false; + boundFB = null; } /** @@ -403,8 +419,7 @@ public void setFrameBufferBindingValid(boolean valid) { */ public void invalidateBindings() { boundTextureUnit = -1; - frameBufferBindingValid = false; - boundFB = null; + invalidateFrameBufferBinding(); for (int i = 0; i < boundTextures.length; i++) { boundTextures[i] = null; } diff --git a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java index b0cf187e0a..9f558b0bde 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java +++ b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java @@ -2072,15 +2072,15 @@ public void copyFrameBuffer(FrameBuffer src, FrameBuffer dst, boolean copyColor, if (prevBindingValid) { glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, prevFBO); + context.setFrameBufferBinding(prevFB, prevFBO); + if (prevFB != null || prevFBO == defaultFBO) { + toggleFramebufferSrgb(prevFB); + } } else { glfbo.glBindFramebufferEXT(GLFbo.GL_READ_FRAMEBUFFER_EXT, prevReadFramebuffer); glfbo.glBindFramebufferEXT(GLFbo.GL_DRAW_FRAMEBUFFER_EXT, prevDrawFramebuffer); - } - context.boundFBO = prevFBO; - context.boundFB = prevFB; - context.setFrameBufferBindingValid(prevBindingValid); - if (prevBindingValid) { - toggleFramebufferSrgb(prevFB); + context.invalidateFrameBufferBinding(); + context.boundFBO = prevFBO; } } else { throw new RendererException("Framebuffer blitting not supported by the video hardware"); @@ -2239,17 +2239,13 @@ private void bindFrameBuffer(FrameBuffer fb) { if (!context.isFrameBufferBindingValid() || context.boundFBO != defaultFBO) { glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, defaultFBO); statistics.onFrameBufferUse(null, true); - context.boundFBO = defaultFBO; - context.boundFB = null; - context.setFrameBufferBindingValid(true); + context.setFrameBufferBinding(null, defaultFBO); } } else { assert fb.getId() != -1 && fb.getId() != 0; if (!context.isFrameBufferBindingValid() || context.boundFBO != fb.getId()) { glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, fb.getId()); - context.boundFBO = fb.getId(); - context.boundFB = fb; - context.setFrameBufferBindingValid(true); + context.setFrameBufferBinding(fb, fb.getId()); statistics.onFrameBufferUse(fb, true); } else { statistics.onFrameBufferUse(fb, false); @@ -2409,7 +2405,8 @@ public void setFrameBuffer(FrameBuffer fb) { return; } - if (context.isFrameBufferBindingValid() && context.boundFB == fb) { + if (context.isFrameBufferBindingValid() && context.boundFB == fb + && context.boundFBO == (fb == null ? defaultFBO : fb.getId())) { if (fb == null || !fb.isUpdateNeeded()) { toggleFramebufferSrgb(fb); return; @@ -2467,7 +2464,7 @@ && isMipmapGenerationSupported(tex.getImage().getFormat(), assert fb.getId() > 0; assert context.boundFBO == fb.getId(); - context.boundFB = fb; + context.setFrameBufferBinding(fb, fb.getId()); if (debug && caps.contains(Caps.GLDebug)) { if (fb.getName() != null) glext.glObjectLabel(GL3.GL_FRAMEBUFFER, fb.getId(), fb.getName()); } @@ -2514,7 +2511,7 @@ public void deleteFrameBuffer(FrameBuffer fb) { if (fb.getId() != -1) { if (context.isFrameBufferBindingValid() && context.boundFBO == fb.getId()) { glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, 0); - context.boundFBO = 0; + context.setFrameBufferBinding(null, 0); } if (fb.getDepthTarget() != null) { @@ -3862,7 +3859,8 @@ public void setMainFrameBufferSrgb(boolean enableSrgb) { } mainFrameBufferSrgb = enableSrgb; - if (context.isFrameBufferBindingValid() && context.boundFB == null) { + if (context.isFrameBufferBindingValid() && context.boundFB == null + && context.boundFBO == defaultFBO) { toggleFramebufferSrgb(null); } } diff --git a/jme3-core/src/test/java/com/jme3/renderer/RenderContextBindingTest.java b/jme3-core/src/test/java/com/jme3/renderer/RenderContextBindingTest.java index c1d6b635a9..b8cb586143 100644 --- a/jme3-core/src/test/java/com/jme3/renderer/RenderContextBindingTest.java +++ b/jme3-core/src/test/java/com/jme3/renderer/RenderContextBindingTest.java @@ -34,6 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; import com.jme3.texture.FrameBuffer; @@ -87,16 +88,53 @@ public void resetReturnsBindingsToKnownFreshDefaults() { } @Test - public void framebufferValidationDoesNotValidateTheActiveTextureUnit() { + public void knownFramebufferRecordingUpdatesTheObjectNameAndValidityTogether() { RenderContext context = new RenderContext(); context.invalidateBindings(); - context.boundFBO = 12; - context.setFrameBufferBindingValid(true); + FrameBuffer framebuffer = new FrameBuffer(4, 4, 1); + framebuffer.setId(12); + + context.setFrameBufferBinding(framebuffer, framebuffer.getId()); + + assertSame(framebuffer, context.boundFB); + assertEquals(12, context.boundFBO); assertTrue(context.isFrameBufferBindingValid()); assertEquals(-1, context.boundTextureUnit); - context.setFrameBufferBindingValid(false); + } + + @Test + public void knownNativeFramebufferDoesNotRequireAJavaObject() { + RenderContext context = new RenderContext(); + context.invalidateBindings(); + + context.setFrameBufferBinding(null, 7); + + assertNull(context.boundFB); + assertEquals(7, context.boundFBO); + assertTrue(context.isFrameBufferBindingValid()); + } + + @Test + public void framebufferOnlyInvalidationPreservesTextureKnowledgeAndUntrustedName() { + RenderContext context = new RenderContext(); + FrameBuffer framebuffer = new FrameBuffer(4, 4, 1); + context.setFrameBufferBinding(framebuffer, 12); + Image image = new Image(); + context.boundTextures[3] = image.getWeakRef(); + context.boundTextureUnit = 3; + context.textureIndexList.moveToNew(3); + context.textureIndexList.copyNewToOld(); + context.textureIndexList.moveToNew(0); + + context.invalidateFrameBufferBinding(); + + assertNull(context.boundFB); assertFalse(context.isFrameBufferBindingValid()); assertEquals(12, context.boundFBO); + assertEquals(3, context.boundTextureUnit); + assertSame(image.getWeakRef(), context.boundTextures[3]); + assertEquals(1, context.textureIndexList.oldLen); + assertEquals(1, context.textureIndexList.newLen); } private static void assertDefaults(RenderContext context) { diff --git a/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererBindingInvalidationTest.java b/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererBindingInvalidationTest.java index 445f982ed8..6b17676f59 100644 --- a/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererBindingInvalidationTest.java +++ b/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererBindingInvalidationTest.java @@ -33,6 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -265,6 +266,30 @@ public void unknownCopySnapshotsBindingsBeforeAttachmentUpdates(boolean desktop) assertEquals(0, driver.drawFramebuffer); } + @Test + public void unknownCopyPreservesTheUntrustedNameAndKnownTextures() throws Exception { + Recording driver = new Recording(false); + Texture2D texture = texture(17); + driver.renderer.setTexture(3, texture); + driver.context.setFrameBufferBinding(framebuffer(27), 27); + driver.context.invalidateFrameBufferBinding(); + driver.setNativeFramebuffer(9); + + driver.renderer.copyFrameBuffer(framebuffer(12), framebuffer(13), true, false); + + assertEquals(9, driver.readFramebuffer); + assertEquals(9, driver.drawFramebuffer); + assertEquals(27, driver.context.boundFBO); + assertFalse(driver.context.isFrameBufferBindingValid()); + assertEquals(3, driver.context.boundTextureUnit); + assertSame(texture.getImage().getWeakRef(), driver.context.boundTextures[3]); + driver.calls.clear(); + driver.renderer.setTexture(3, texture); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); + driver.renderer.setFrameBuffer(null); + assertEquals(0, driver.drawFramebuffer); + } + @ParameterizedTest @ValueSource(booleans = {false, true}) public void knownCopyUsesCachedBindingAndPreservesElision(boolean desktop) throws Exception { @@ -330,6 +355,46 @@ public void deletingWhileUnknownDoesNotValidateOrEagerlyRebind( assertTrue(driver.context.isFrameBufferBindingValid()); } + @ParameterizedTest + @ValueSource(ints = {0, 77}) + public void deletingKnownFramebufferKeepsCacheConsistentAndRestoresMain(int defaultId) throws Exception { + Recording driver = new Recording(false); + driver.setDefaultFramebuffer(defaultId); + FrameBuffer framebuffer = framebuffer(12); + driver.renderer.setFrameBuffer(framebuffer); + + driver.renderer.deleteFrameBuffer(framebuffer); + + assertEquals(driver.drawFramebuffer, driver.context.boundFBO); + assertNull(driver.context.boundFB); + assertTrue(driver.context.isFrameBufferBindingValid()); + driver.renderer.setFrameBuffer(null); + assertEquals(defaultId, driver.drawFramebuffer); + driver.calls.clear(); + driver.renderer.setFrameBuffer(null); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); + } + + @Test + public void knownUntrackedFramebufferDoesNotReceiveMainSrgbConfiguration() throws Exception { + Recording driver = new Recording(false); + driver.setDefaultFramebuffer(77); + driver.renderer.getCaps().add(Caps.Srgb); + driver.renderer.getCaps().add(Caps.SrgbWriteControl); + driver.context.setFrameBufferBinding(null, 0); + driver.calls.clear(); + + driver.renderer.setMainFrameBufferSrgb(true); + driver.renderer.copyFrameBuffer(framebuffer(12), framebuffer(13), true, false); + + assertEquals(0, driver.drawFramebuffer); + assertEquals(0, driver.countCalls("glEnable")); + assertEquals(0, driver.countCalls("glGetInteger")); + driver.renderer.setFrameBuffer(null); + assertEquals(77, driver.drawFramebuffer); + assertEquals(1, driver.countCalls("glEnable")); + } + @Test public void unknownCopyRestorationDoesNotAssumeMainSrgbTarget() throws Exception { Recording driver = new Recording(false); @@ -432,7 +497,9 @@ public Object invoke(Object proxy, Method method, Object[] args) { String name = method.getName(); calls.add(name); if (name.equals("glActiveTexture")) { - activeUnit = (Integer) args[0] - GL.GL_TEXTURE0; + int unit = (Integer) args[0] - GL.GL_TEXTURE0; + assertTrue(unit >= 0, "Unknown texture unit passed to GL"); + activeUnit = unit; } else if (name.equals("glBindTexture")) { textureBindings[activeUnit] = (Integer) args[1]; } else if (name.equals("glTexImage2D")) { From dd85c0e839fec28f208edbfea8e5b392cae2c600 Mon Sep 17 00:00:00 2001 From: Mr Robot Date: Sat, 3 Oct 2026 00:07:00 +0200 Subject: [PATCH 3/6] Remove redundant binding bookkeeping tests --- .../renderer/RenderContextBindingTest.java | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/jme3-core/src/test/java/com/jme3/renderer/RenderContextBindingTest.java b/jme3-core/src/test/java/com/jme3/renderer/RenderContextBindingTest.java index b8cb586143..e7c897a1cb 100644 --- a/jme3-core/src/test/java/com/jme3/renderer/RenderContextBindingTest.java +++ b/jme3-core/src/test/java/com/jme3/renderer/RenderContextBindingTest.java @@ -46,12 +46,6 @@ */ public class RenderContextBindingTest { - @Test - public void freshContextHasKnownDefaultBindings() { - RenderContext context = new RenderContext(); - assertDefaults(context); - } - @Test public void bindingInvalidationClearsTextureReferencesWithoutAssumingNativeDefaults() { RenderContext context = new RenderContext(); @@ -87,33 +81,6 @@ public void resetReturnsBindingsToKnownFreshDefaults() { assertDefaults(context); } - @Test - public void knownFramebufferRecordingUpdatesTheObjectNameAndValidityTogether() { - RenderContext context = new RenderContext(); - context.invalidateBindings(); - FrameBuffer framebuffer = new FrameBuffer(4, 4, 1); - framebuffer.setId(12); - - context.setFrameBufferBinding(framebuffer, framebuffer.getId()); - - assertSame(framebuffer, context.boundFB); - assertEquals(12, context.boundFBO); - assertTrue(context.isFrameBufferBindingValid()); - assertEquals(-1, context.boundTextureUnit); - } - - @Test - public void knownNativeFramebufferDoesNotRequireAJavaObject() { - RenderContext context = new RenderContext(); - context.invalidateBindings(); - - context.setFrameBufferBinding(null, 7); - - assertNull(context.boundFB); - assertEquals(7, context.boundFBO); - assertTrue(context.isFrameBufferBindingValid()); - } - @Test public void framebufferOnlyInvalidationPreservesTextureKnowledgeAndUntrustedName() { RenderContext context = new RenderContext(); From 3bb59ce5cd634a6da729a385d9ccb79418351a10 Mon Sep 17 00:00:00 2001 From: Mr Robot Date: Fri, 30 Oct 2026 11:57:07 +0100 Subject: [PATCH 4/6] Wait for complete renderer shutdown between MSAA test scenarios Application.destroy() runs before native context teardown and SDL subsystem shutdown. Join the render thread in finally so subsequent scenarios and screenshot tests cannot initialize SDL while the previous context is being released. Keep the existing rendering and MSAA assertions intact. --- .../post/TestPresentationMsaa.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/jme3-screenshot-tests/jme3-screenshot-tests-desktop/src/test/java/org/jmonkeyengine/screenshottests/post/TestPresentationMsaa.java b/jme3-screenshot-tests/jme3-screenshot-tests-desktop/src/test/java/org/jmonkeyengine/screenshottests/post/TestPresentationMsaa.java index 89a365ede1..50bcb2e645 100644 --- a/jme3-screenshot-tests/jme3-screenshot-tests-desktop/src/test/java/org/jmonkeyengine/screenshottests/post/TestPresentationMsaa.java +++ b/jme3-screenshot-tests/jme3-screenshot-tests-desktop/src/test/java/org/jmonkeyengine/screenshottests/post/TestPresentationMsaa.java @@ -37,7 +37,6 @@ void rendersWithAndWithoutPostProcessingMsaa() throws Exception { private void runScenario(int samples, int filterSamples) throws Exception { CompletableFuture result = new CompletableFuture<>(); CountDownLatch finished = new CountDownLatch(1); - CountDownLatch destroyed = new CountDownLatch(1); TestContainingApp app = new TestContainingApp() { private int frames; @@ -127,14 +126,6 @@ public void handleError(String message, Throwable failure) { finished.countDown(); } - @Override - public void destroy() { - try { - super.destroy(); - } finally { - destroyed.countDown(); - } - } }; AppSettings settings = new AppSettings(true); settings.setResolution(96, 96); @@ -152,8 +143,16 @@ public void destroy() { result.get(1, TimeUnit.SECONDS); } finally { app.stop(false); + // Application.destroy() runs before the window/context and SDL + // subsystem are released. Wait for the entire render thread so the + // next scenario cannot initialize SDL during the previous teardown. + Field threadField = LwjglWindow.class.getDeclaredField("mainThread"); + threadField.setAccessible(true); + Thread renderThread = (Thread) threadField.get(app.getContext()); + assertNotNull(renderThread, "render thread was not created"); + renderThread.join(TimeUnit.SECONDS.toMillis(10)); + assertFalse(renderThread.isAlive(), "render thread did not shut down"); } - assertTrue(destroyed.await(10, TimeUnit.SECONDS), "context did not shut down"); } private static FrameBuffer framebuffer(LwjglWindow window, String name) throws Exception { @@ -161,4 +160,4 @@ private static FrameBuffer framebuffer(LwjglWindow window, String name) throws E field.setAccessible(true); return (FrameBuffer) field.get(window); } -} \ No newline at end of file +} From db744371d0b75dcc4ae52a86f962c3d2bd707c5e Mon Sep 17 00:00:00 2001 From: toaster0123 <261194501+toaster0123@users.noreply.github.com> Date: Fri, 30 Oct 2026 12:07:24 +0000 Subject: [PATCH 5/6] Reset texture and framebuffer bindings immediately on invalidation Follow the eager-reset approach of #2993: select texture unit zero and the platform framebuffer, force its configured sRGB write state, and synchronize the ordinary cache. Remove unknown-binding flags, sentinel handling and restoration queries. Preserve main overrides without allocating them during cleanup or context reset. Update regression tests and document the new reset contract. --- .../java/com/jme3/renderer/RenderContext.java | 59 +-- .../main/java/com/jme3/renderer/Renderer.java | 13 +- .../com/jme3/renderer/opengl/GLRenderer.java | 96 ++--- .../renderer/RenderContextBindingTest.java | 113 ------ .../opengl/FrameBufferTestSupport.java | 2 - .../GlRendererAttachmentUpdateStateTest.java | 10 +- .../GlRendererBindingInvalidationTest.java | 378 ++++++++++-------- .../GlRendererDefaultFrameBufferTest.java | 11 +- 8 files changed, 269 insertions(+), 413 deletions(-) delete mode 100644 jme3-core/src/test/java/com/jme3/renderer/RenderContextBindingTest.java diff --git a/jme3-core/src/main/java/com/jme3/renderer/RenderContext.java b/jme3-core/src/main/java/com/jme3/renderer/RenderContext.java index 395b676996..7f347ce1f5 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/RenderContext.java +++ b/jme3-core/src/main/java/com/jme3/renderer/RenderContext.java @@ -207,20 +207,14 @@ private static WeakReference[] newWeakReferenceArray(int size) { public Shader boundShader; /** - * ID of the bound FrameBuffer. This value is untrusted while - * {@link #isFrameBufferBindingValid()} is false. + * ID of the bound FrameBuffer. * * @see Renderer#setFrameBuffer(com.jme3.texture.FrameBuffer) */ public int boundFBO; - private boolean frameBufferBindingValid = true; - /** - * Java object associated with the known framebuffer binding, or null when - * there is no associated object or the binding is unknown. A null value - * does not imply a native framebuffer name of zero; presentation and - * externally managed framebuffers can have nonzero names. + * Currently bound FrameBuffer. * * @see Renderer#setFrameBuffer(com.jme3.texture.FrameBuffer) */ @@ -295,7 +289,7 @@ private static WeakReference[] newWeakReferenceArray(int size) { public final IDList textureIndexList = new IDList(); /** - * Currently bound texture unit, or -1 when the active unit is unknown. + * Currently bound texture unit. * * @see Renderer#setTexture(int, com.jme3.texture.Texture) */ @@ -402,52 +396,6 @@ public RenderContext() { init(); } - /** - * Tests whether the cached framebuffer binding can suppress a GL bind. - * - * @return true if the binding is known - */ - public boolean isFrameBufferBindingValid() { - return frameBufferBindingValid; - } - - /** - * Records the object and native name of a known framebuffer binding. - * Call after establishing native state or restoring a known binding. - * - * @param fb the associated Java framebuffer, or null if there is none - * @param fbo the known native framebuffer name - */ - public void setFrameBufferBinding(FrameBuffer fb, int fbo) { - boundFB = fb; - boundFBO = fbo; - frameBufferBindingValid = true; - } - - /** - * Invalidates only the framebuffer binding, leaving texture bindings alone. - * The numeric name is retained as an untrusted value, and the associated - * Java object is cleared. This does not modify native state. - */ - public void invalidateFrameBufferBinding() { - frameBufferBindingValid = false; - boundFB = null; - } - - /** - * Invalidates texture and framebuffer bindings after external GL changes. - * This does not modify native state. Unlike reset(), it does not assume - * that texture unit zero or the default framebuffer is bound. - */ - public void invalidateBindings() { - boundTextureUnit = -1; - invalidateFrameBufferBinding(); - for (int i = 0; i < boundTextures.length; i++) { - boundTextures[i] = null; - } - textureIndexList.reset(); - } - private void init() { cullMode = RenderState.FaceCullMode.Off; @@ -473,7 +421,6 @@ private void init() { boundShader = null; boundFBO = 0; boundFB = null; - frameBufferBindingValid = true; boundRB = 0; boundElementArrayVBO = 0; diff --git a/jme3-core/src/main/java/com/jme3/renderer/Renderer.java b/jme3-core/src/main/java/com/jme3/renderer/Renderer.java index 5f267abec5..00c8c8bf78 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/Renderer.java +++ b/jme3-core/src/main/java/com/jme3/renderer/Renderer.java @@ -97,9 +97,16 @@ public interface Renderer { * the GL state was changed manually or through an external library. *

* The OpenGL renderer also immediately restores the states managed by - * {@link RenderState} to OpenGL defaults. Call this method on the rendering - * thread with the renderer's graphics context current, before resuming - * rendering. + * {@link RenderState} to OpenGL defaults, selects texture unit zero, and + * binds the platform's default framebuffer for reading and drawing with + * its configured sRGB write state. Previous external framebuffer bindings + * are not preserved. Texture bindings are forgotten and rebound on use. + * A main-framebuffer override remains configured, but is not selected or + * allocated by this reset; select the intended target with + * {@link #setFrameBuffer(FrameBuffer)} before resuming rendering. + *

+ * Call this method on the rendering thread with the renderer's graphics + * context current. */ public void invalidateState(); diff --git a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java index 4874389dac..829daee129 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java +++ b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java @@ -984,7 +984,8 @@ public void initialize() { // Without FBO support, even querying GL_FRAMEBUFFER_BINDING is invalid. // Otherwise the presentation framebuffer can be nonzero, notably on iOS. defaultFBO = caps.contains(Caps.FrameBuffer) ? getInteger(GL.GL_FRAMEBUFFER_BINDING) : 0; - context.setFrameBufferBinding(null, defaultFBO); + context.boundFBO = defaultFBO; + context.boundFB = null; } @Override @@ -1010,8 +1011,25 @@ public void invalidateState() { gl2.glPolygonMode(GL.GL_FRONT_AND_BACK, GL2.GL_FILL); } + // Establish native binding defaults without trusting the old cache. + gl.glActiveTexture(GL.GL_TEXTURE0); + if (caps.contains(Caps.FrameBuffer)) { + // Reset both read and draw bindings, including nonzero platform defaults. + // Do not select mainFbOverride here: cleanup/resetGLObjects also call + // invalidation, and must not allocate or recreate its resources. + glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, defaultFBO); + } + if (caps.contains(Caps.SrgbWriteControl) && caps.contains(Caps.Srgb)) { + if (mainFrameBufferSrgb) { + gl.glEnable(GLExt.GL_FRAMEBUFFER_SRGB_EXT); + } else { + gl.glDisable(GLExt.GL_FRAMEBUFFER_SRGB_EXT); + } + } + context.reset(); - context.invalidateBindings(); + context.boundFBO = defaultFBO; + context.srgbWriteEnabled = mainFrameBufferSrgb; Arrays.fill(vertexAttribDivisorsInvalid, true); if (caps.contains(Caps.OpenGL20)) { context.initialDrawBuf = getInteger(GL2.GL_DRAW_BUFFER); @@ -2129,15 +2147,8 @@ public void copyFrameBuffer(FrameBuffer src, FrameBuffer dst, boolean copyColor, int dstX1; int dstY1; - int previousFbo = context.boundFBO; + final int previousFramebuffer = context.boundFBO; FrameBuffer prevFB = context.boundFB; - boolean prevBindingValid = context.isFrameBufferBindingValid(); - // Attachment updates below can bind another framebuffer. An unknown - // binding may also have different native read and draw targets. - final int prevReadFramebuffer = prevBindingValid ? previousFbo - : getInteger(GLFbo.GL_READ_FRAMEBUFFER_BINDING_EXT); - final int prevDrawFramebuffer = prevBindingValid ? previousFbo - : getInteger(GLFbo.GL_DRAW_FRAMEBUFFER_BINDING_EXT); if (mainFbOverride != null) { if (src == null) { @@ -2196,18 +2207,10 @@ public void copyFrameBuffer(FrameBuffer src, FrameBuffer dst, boolean copyColor, GL.GL_NEAREST); - if (prevBindingValid) { - glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, previousFbo); - context.setFrameBufferBinding(prevFB, previousFbo); - if (prevFB != null || previousFbo == defaultFBO) { - toggleFramebufferSrgb(prevFB); - } - } else { - glfbo.glBindFramebufferEXT(GLFbo.GL_READ_FRAMEBUFFER_EXT, prevReadFramebuffer); - glfbo.glBindFramebufferEXT(GLFbo.GL_DRAW_FRAMEBUFFER_EXT, prevDrawFramebuffer); - context.invalidateFrameBufferBinding(); - context.boundFBO = previousFbo; - } + glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, previousFramebuffer); + context.boundFBO = previousFramebuffer; + context.boundFB = prevFB; + toggleFramebufferSrgb(prevFB); } else { throw new RendererException("Framebuffer blitting not supported by the video hardware"); } @@ -2383,14 +2386,6 @@ public void updateFrameBufferAttachment(FrameBuffer fb, RenderBuffer rb) { } int previousFbo = context.boundFBO; FrameBuffer previousFb = context.boundFB; - boolean previousBindingValid = context.isFrameBufferBindingValid(); - // External code may leave separate read/draw bindings. Snapshot them - // before prepareFrameBuffer() changes either target. - boolean separateBindings = caps.contains(Caps.FrameBufferBlit); - int previousDrawFbo = previousBindingValid ? previousFbo - : getInteger(GL.GL_FRAMEBUFFER_BINDING); - int previousReadFbo = previousBindingValid || !separateBindings ? previousDrawFbo - : getInteger(GLFbo.GL_READ_FRAMEBUFFER_BINDING_EXT); try { FrameBufferState state = prepareFrameBuffer(fb); final boolean wasDirty = state.attachmentsDirty; @@ -2403,20 +2398,10 @@ public void updateFrameBufferAttachment(FrameBuffer fb, RenderBuffer rb) { updateFrameBufferAttachment(fb, rb, state); state.attachmentsDirty = wasDirty; } finally { - if (previousBindingValid) { - if (context.boundFBO != previousFbo) { - glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, previousFbo); - } - context.setFrameBufferBinding(previousFb, previousFbo); - } else { - if (separateBindings) { - glfbo.glBindFramebufferEXT(GLFbo.GL_READ_FRAMEBUFFER_EXT, previousReadFbo); - glfbo.glBindFramebufferEXT(GLFbo.GL_DRAW_FRAMEBUFFER_EXT, previousDrawFbo); - } else { - glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, previousDrawFbo); - } - context.invalidateFrameBufferBinding(); + if (context.boundFBO != previousFbo) { + glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, previousFbo); context.boundFBO = previousFbo; + context.boundFB = previousFb; } } } @@ -2451,16 +2436,18 @@ private void updateFrameBufferAttachment(FrameBuffer fb, RenderBuffer rb, FrameB private void bindFrameBuffer(FrameBuffer fb) { if (fb == null) { - if (!context.isFrameBufferBindingValid() || context.boundFBO != defaultFBO) { + if (context.boundFBO != defaultFBO) { glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, defaultFBO); statistics.onFrameBufferUse(null, true); - context.setFrameBufferBinding(null, defaultFBO); + context.boundFBO = defaultFBO; + context.boundFB = null; } } else { assert fb.getId() != -1 && fb.getId() != 0; - if (!context.isFrameBufferBindingValid() || context.boundFBO != fb.getId()) { + if (context.boundFBO != fb.getId()) { glfbo.glBindFramebufferEXT(GLFbo.GL_FRAMEBUFFER_EXT, fb.getId()); - context.setFrameBufferBinding(fb, fb.getId()); + context.boundFBO = fb.getId(); + context.boundFB = fb; statistics.onFrameBufferUse(fb, true); } else { statistics.onFrameBufferUse(fb, false); @@ -2613,8 +2600,7 @@ public void setMainFrameBufferOverride(FrameBuffer fb) { throw new RendererException("Framebuffer objects are not supported by the video hardware"); } mainFbOverride = null; - if (context.isFrameBufferBindingValid() && context.boundFB == null - && context.boundFBO == defaultFBO) { + if (context.boundFB == null && context.boundFBO == defaultFBO) { // Main FB is now set to fb, make sure its bound setFrameBuffer(fb); } @@ -2689,7 +2675,7 @@ public void setFrameBuffer(FrameBuffer fb) { } boolean updateNeeded = fb != null && isFrameBufferUpdateNeeded(fb); - if (context.isFrameBufferBindingValid() && context.boundFB == fb + if (context.boundFB == fb && context.boundFBO == (fb == null ? defaultFBO : fb.getId())) { if (!updateNeeded) { toggleFramebufferSrgb(fb); @@ -2704,7 +2690,8 @@ public void setFrameBuffer(FrameBuffer fb) { } // The window-system framebuffer is the only possible destination. // Restore the cache after invalidation without an unsupported GL call. - context.setFrameBufferBinding(null, 0); + context.boundFBO = 0; + context.boundFB = null; toggleFramebufferSrgb(null); return; } @@ -2771,7 +2758,7 @@ && isMipmapGenerationSupported(image.getFormat(), assert fb.getId() > 0; assert context.boundFBO == fb.getId(); - context.setFrameBufferBinding(fb, fb.getId()); + context.boundFB = fb; if (debug && caps.contains(Caps.GLDebug)) { if (fb.getName() != null) glext.glObjectLabel(GL3.GL_FRAMEBUFFER, fb.getId(), fb.getName()); } @@ -2824,7 +2811,7 @@ private void deleteRenderBuffer(RenderBuffer rb) { @Override public void deleteFrameBuffer(FrameBuffer fb) { if (fb.getId() != -1) { - if (context.isFrameBufferBindingValid() && context.boundFBO == fb.getId()) { + if (context.boundFBO == fb.getId()) { bindFrameBuffer(null); toggleFramebufferSrgb(null); } @@ -4204,8 +4191,7 @@ public void setMainFrameBufferSrgb(boolean enableSrgb) { } mainFrameBufferSrgb = enableSrgb; - if (context.isFrameBufferBindingValid() && context.boundFB == null - && context.boundFBO == defaultFBO) { + if (context.boundFB == null && context.boundFBO == defaultFBO) { toggleFramebufferSrgb(null); } } diff --git a/jme3-core/src/test/java/com/jme3/renderer/RenderContextBindingTest.java b/jme3-core/src/test/java/com/jme3/renderer/RenderContextBindingTest.java deleted file mode 100644 index e7c897a1cb..0000000000 --- a/jme3-core/src/test/java/com/jme3/renderer/RenderContextBindingTest.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (c) 2009-2026 jMonkeyEngine - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'jMonkeyEngine' nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package com.jme3.renderer; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import com.jme3.texture.FrameBuffer; -import com.jme3.texture.Image; -import org.junit.jupiter.api.Test; - -/** - * Verifies the distinction between fresh defaults and externally changed bindings. - */ -public class RenderContextBindingTest { - - @Test - public void bindingInvalidationClearsTextureReferencesWithoutAssumingNativeDefaults() { - RenderContext context = new RenderContext(); - Image image = new Image(); - context.boundTextures[0] = image.getWeakRef(); - context.boundTextures[3] = image.getWeakRef(); - context.textureIndexList.moveToNew(3); - context.textureIndexList.copyNewToOld(); - context.boundTextureUnit = 3; - context.boundFBO = 12; - context.boundFB = new FrameBuffer(4, 4, 1); - - context.invalidateBindings(); - - assertEquals(-1, context.boundTextureUnit); - assertEquals(12, context.boundFBO); - assertNull(context.boundFB); - assertFalse(context.isFrameBufferBindingValid()); - for (int unit = 0; unit < context.boundTextures.length; unit++) { - assertNull(context.boundTextures[unit]); - } - assertEquals(0, context.textureIndexList.oldLen); - assertEquals(0, context.textureIndexList.newLen); - } - - @Test - public void resetReturnsBindingsToKnownFreshDefaults() { - RenderContext context = new RenderContext(); - context.boundFBO = 12; - context.boundTextureUnit = 3; - context.invalidateBindings(); - context.reset(); - assertDefaults(context); - } - - @Test - public void framebufferOnlyInvalidationPreservesTextureKnowledgeAndUntrustedName() { - RenderContext context = new RenderContext(); - FrameBuffer framebuffer = new FrameBuffer(4, 4, 1); - context.setFrameBufferBinding(framebuffer, 12); - Image image = new Image(); - context.boundTextures[3] = image.getWeakRef(); - context.boundTextureUnit = 3; - context.textureIndexList.moveToNew(3); - context.textureIndexList.copyNewToOld(); - context.textureIndexList.moveToNew(0); - - context.invalidateFrameBufferBinding(); - - assertNull(context.boundFB); - assertFalse(context.isFrameBufferBindingValid()); - assertEquals(12, context.boundFBO); - assertEquals(3, context.boundTextureUnit); - assertSame(image.getWeakRef(), context.boundTextures[3]); - assertEquals(1, context.textureIndexList.oldLen); - assertEquals(1, context.textureIndexList.newLen); - } - - private static void assertDefaults(RenderContext context) { - assertEquals(0, context.boundTextureUnit); - assertEquals(0, context.boundFBO); - assertNull(context.boundFB); - assertTrue(context.isFrameBufferBindingValid()); - } -} diff --git a/jme3-core/src/test/java/com/jme3/renderer/opengl/FrameBufferTestSupport.java b/jme3-core/src/test/java/com/jme3/renderer/opengl/FrameBufferTestSupport.java index 9884db2364..e14d4e2f44 100644 --- a/jme3-core/src/test/java/com/jme3/renderer/opengl/FrameBufferTestSupport.java +++ b/jme3-core/src/test/java/com/jme3/renderer/opengl/FrameBufferTestSupport.java @@ -365,8 +365,6 @@ private int getInteger(int name) { switch (name) { case GL.GL_FRAMEBUFFER_BINDING: return drawFramebuffer; - case GLFbo.GL_READ_FRAMEBUFFER_BINDING_EXT: - return readFramebuffer; case GL.GL_MAX_TEXTURE_SIZE: case GL.GL_MAX_CUBE_MAP_TEXTURE_SIZE: case GLFbo.GL_MAX_RENDERBUFFER_SIZE_EXT: diff --git a/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererAttachmentUpdateStateTest.java b/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererAttachmentUpdateStateTest.java index 65cb4932e1..eaa4c68ed5 100644 --- a/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererAttachmentUpdateStateTest.java +++ b/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererAttachmentUpdateStateTest.java @@ -232,16 +232,18 @@ void lowLevelUpdateRestoresNonzeroPresentationFramebuffer() { } @Test - void lowLevelUpdateAfterInvalidationRestoresNativeBindingAndUnknownCache() { + void lowLevelUpdateAfterInvalidationRestoresDefaultBinding() { FrameBuffer previous = framebuffer(texture()); final FrameBuffer other = framebuffer(texture()); renderer.setFrameBuffer(previous); renderer.invalidateState(); + assertEquals(0, driver.drawFramebuffer, "Invalidation must immediately select the screen"); + assertEquals(0, driver.readFramebuffer); renderer.updateRenderTexture(other, other.getColorTarget(0)); - assertEquals(previous.getId(), driver.drawFramebuffer); - assertEquals(previous.getId(), driver.readFramebuffer); + assertEquals(0, driver.drawFramebuffer); + assertEquals(0, driver.readFramebuffer); renderer.setFrameBuffer(null); - assertEquals(0, driver.drawFramebuffer, "The invalid cache must still force a real screen bind"); + assertEquals(0, driver.drawFramebuffer); renderer.cleanup(); } } diff --git a/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererBindingInvalidationTest.java b/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererBindingInvalidationTest.java index 79e4e62779..9adade393b 100644 --- a/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererBindingInvalidationTest.java +++ b/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererBindingInvalidationTest.java @@ -122,10 +122,13 @@ public void defaultFramebufferAfterExternalBinding(int defaultId) throws Excepti driver.setDefaultFramebuffer(defaultId); driver.setNativeFramebuffer(9); driver.renderer.invalidateState(); + assertEquals(defaultId, driver.drawFramebuffer); + assertEquals(defaultId, driver.readFramebuffer); + assertEquals(defaultId, driver.context.boundFBO); + assertNull(driver.context.boundFB); driver.calls.clear(); driver.renderer.setFrameBuffer(null); - assertEquals(defaultId, driver.drawFramebuffer); - assertEquals(1, driver.calls.stream().filter("glBindFramebufferEXT"::equals).count()); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); driver.calls.clear(); driver.renderer.setFrameBuffer(null); assertTrue(driver.calls.isEmpty(), driver.calls.toString()); @@ -150,15 +153,28 @@ public void explicitFramebufferControl(int defaultId) throws Exception { @ParameterizedTest @ValueSource(booleans = {false, true}) - public void invalidationDoesNotMutateBindings(boolean desktop) throws Exception { + public void invalidationImmediatelyRestoresBindingsOnEveryCall(boolean desktop) throws Exception { Recording driver = new Recording(desktop); - driver.activeUnit = 3; - driver.setNativeFramebuffer(9); - driver.renderer.invalidateState(); - assertEquals(3, driver.activeUnit); - assertEquals(9, driver.drawFramebuffer); - assertFalse(driver.calls.contains("glActiveTexture")); - assertFalse(driver.calls.contains("glBindFramebufferEXT")); + for (int i = 0; i < 2; i++) { + // The second iteration starts with a cache already claiming defaults. + driver.activeUnit = 3; + driver.readFramebuffer = 9; + driver.drawFramebuffer = 10; + driver.textureBindings[3] = 19; + driver.calls.clear(); + driver.renderer.invalidateState(); + assertEquals(0, driver.activeUnit); + assertEquals(0, driver.context.boundTextureUnit); + assertEquals(0, driver.readFramebuffer); + assertEquals(0, driver.drawFramebuffer); + assertEquals(0, driver.context.boundFBO); + assertNull(driver.context.boundFB); + assertEquals(1, driver.countCalls("glActiveTexture")); + assertEquals(1, driver.countCalls("glBindFramebufferEXT")); + assertEquals(desktop ? 2 : 0, driver.countCalls("glGetInteger")); + assertEquals(19, driver.textureBindings[3]); + assertEquals(0, driver.countCalls("glBindTexture")); + } } @ParameterizedTest @@ -174,6 +190,7 @@ public void freshDefaultFramebufferElidesBinding(boolean desktop) throws Excepti public void nullFramebufferDoesNotRequireFramebufferSupport(boolean desktop) throws Exception { Recording driver = new Recording(desktop); driver.renderer.getCaps().remove(Caps.FrameBuffer); + driver.renderer.getCaps().remove(Caps.FrameBufferBlit); driver.renderer.setFrameBuffer(null); driver.renderer.invalidateState(); driver.calls.clear(); @@ -181,6 +198,9 @@ public void nullFramebufferDoesNotRequireFramebufferSupport(boolean desktop) thr driver.renderer.setFrameBuffer(null); assertTrue(driver.calls.isEmpty(), driver.calls.toString()); assertThrows(RendererException.class, () -> driver.renderer.setFrameBuffer(framebuffer(12))); + assertThrows(RendererException.class, + () -> driver.renderer.setMainFrameBufferOverride(framebuffer(12))); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); } @ParameterizedTest @@ -218,8 +238,23 @@ public void parameterChangeAfterRepeatedInvalidationUsesRequestedUnit(boolean de } @ParameterizedTest - @CsvSource({"0, 9, 9", "0, 9, 10", "7, 9, 9", "7, 9, 10"}) - public void unknownCopyRestoresNativeBindingsWithoutValidatingCache( + @ValueSource(ints = {0, 77}) + public void clearImmediatelyAfterInvalidationUsesPlatformFramebuffer(int defaultId) throws Exception { + Recording driver = new Recording(false); + driver.setDefaultFramebuffer(defaultId); + driver.setNativeFramebuffer(9); + driver.renderer.invalidateState(); + driver.calls.clear(); + + driver.renderer.clearBuffers(true, true, false); + + assertEquals(defaultId, driver.lastClearFramebuffer); + assertEquals(0, driver.countCalls("glBindFramebufferEXT")); + } + + @ParameterizedTest + @CsvSource({"0, 9, 9", "0, 9, 10", "77, 9, 9", "77, 9, 10"}) + public void copyAfterInvalidationRestoresDefaultWithoutQueries( int defaultId, int readId, int drawId) throws Exception { Recording driver = new Recording(false); driver.setDefaultFramebuffer(defaultId); @@ -227,17 +262,14 @@ public void unknownCopyRestoresNativeBindingsWithoutValidatingCache( driver.drawFramebuffer = drawId; driver.renderer.invalidateState(); driver.calls.clear(); + driver.renderer.copyFrameBuffer(framebuffer(12), framebuffer(13), true, false); - assertEquals(readId, driver.readFramebuffer); - assertEquals(drawId, driver.drawFramebuffer); - assertFalse(driver.context.isFrameBufferBindingValid()); - assertEquals(2, driver.countCalls("glGetInteger")); - assertEquals(List.of("glGetInteger", "glGetInteger"), driver.calls.subList(0, 2)); - driver.calls.clear(); - driver.renderer.setFrameBuffer(null); + assertEquals(defaultId, driver.readFramebuffer); assertEquals(defaultId, driver.drawFramebuffer); - assertEquals(1, driver.countCalls("glBindFramebufferEXT")); + assertEquals(defaultId, driver.context.boundFBO); + assertNull(driver.context.boundFB); + assertEquals(0, driver.countCalls("glGetInteger")); driver.calls.clear(); driver.renderer.setFrameBuffer(null); assertTrue(driver.calls.isEmpty(), driver.calls.toString()); @@ -245,8 +277,9 @@ public void unknownCopyRestoresNativeBindingsWithoutValidatingCache( @ParameterizedTest @ValueSource(booleans = {false, true}) - public void unknownCopySnapshotsBindingsBeforeAttachmentUpdates(boolean desktop) throws Exception { + public void copyCanUpdateAttachmentsAfterInvalidationWithoutQueries(boolean desktop) throws Exception { Recording driver = new Recording(desktop); + driver.setDefaultFramebuffer(77); driver.readFramebuffer = 9; driver.drawFramebuffer = 10; driver.renderer.invalidateState(); @@ -255,75 +288,55 @@ public void unknownCopySnapshotsBindingsBeforeAttachmentUpdates(boolean desktop) FrameBuffer destination = new FrameBuffer(4, 4, 1); destination.addColorTarget(FrameBuffer.FrameBufferTarget.newTarget(Image.Format.RGBA8)); driver.calls.clear(); + driver.renderer.copyFrameBuffer(source, destination, true, false); + assertTrue(source.getId() > 0); assertTrue(destination.getId() > 0); - assertEquals(9, driver.readFramebuffer); - assertEquals(10, driver.drawFramebuffer); - assertFalse(driver.context.isFrameBufferBindingValid()); - assertEquals(List.of("glGetInteger", "glGetInteger"), driver.calls.subList(0, 2)); - driver.renderer.setFrameBuffer(null); - assertEquals(0, driver.drawFramebuffer); - } - - @Test - public void unknownCopyPreservesTheUntrustedNameAndKnownTextures() throws Exception { - Recording driver = new Recording(false); - Texture2D texture = texture(17); - driver.renderer.setTexture(3, texture); - driver.context.setFrameBufferBinding(framebuffer(27), 27); - driver.context.invalidateFrameBufferBinding(); - driver.setNativeFramebuffer(9); - - driver.renderer.copyFrameBuffer(framebuffer(12), framebuffer(13), true, false); - - assertEquals(9, driver.readFramebuffer); - assertEquals(9, driver.drawFramebuffer); - assertEquals(27, driver.context.boundFBO); - assertFalse(driver.context.isFrameBufferBindingValid()); - assertEquals(3, driver.context.boundTextureUnit); - assertSame(texture.getImage().getWeakRef(), driver.context.boundTextures[3]); - driver.calls.clear(); - driver.renderer.setTexture(3, texture); - assertTrue(driver.calls.isEmpty(), driver.calls.toString()); - driver.renderer.setFrameBuffer(null); - assertEquals(0, driver.drawFramebuffer); + assertEquals(77, driver.readFramebuffer); + assertEquals(77, driver.drawFramebuffer); + assertEquals(77, driver.context.boundFBO); + assertNull(driver.context.boundFB); + assertEquals(0, driver.countCalls("glGetInteger")); } @ParameterizedTest @ValueSource(booleans = {false, true}) - public void knownCopyUsesCachedBindingAndPreservesElision(boolean desktop) throws Exception { + public void copyPreservesKnownFramebufferAndTextureCache(boolean desktop) throws Exception { Recording driver = new Recording(desktop); FrameBuffer previous = framebuffer(14); + Texture2D texture = texture(17); driver.renderer.setFrameBuffer(previous); + driver.renderer.setTexture(3, texture); driver.calls.clear(); + driver.renderer.copyFrameBuffer(framebuffer(12), framebuffer(13), true, false); + assertEquals(14, driver.readFramebuffer); assertEquals(14, driver.drawFramebuffer); - assertTrue(driver.context.isFrameBufferBindingValid()); assertSame(previous, driver.renderer.getCurrentFrameBuffer()); assertEquals(0, driver.countCalls("glGetInteger")); assertEquals(3, driver.countCalls("glBindFramebufferEXT")); + assertEquals(3, driver.context.boundTextureUnit); + assertSame(texture.getImage().getWeakRef(), driver.context.boundTextures[3]); driver.calls.clear(); driver.renderer.setFrameBuffer(previous); + driver.renderer.setTexture(3, texture); assertTrue(driver.calls.isEmpty(), driver.calls.toString()); } @ParameterizedTest - @ValueSource(ints = {0, 7}) - public void unknownOverrideDefersBindingUntilNullSelection(int defaultId) throws Exception { + @ValueSource(ints = {0, 77}) + public void overrideInstalledAfterInvalidationBindsImmediately(int defaultId) throws Exception { Recording driver = new Recording(false); driver.setDefaultFramebuffer(defaultId); driver.setNativeFramebuffer(9); driver.renderer.invalidateState(); - driver.calls.clear(); FrameBuffer override = framebuffer(12); driver.renderer.setMainFrameBufferOverride(override); - assertTrue(driver.calls.isEmpty(), driver.calls.toString()); - assertEquals(9, driver.drawFramebuffer); - driver.renderer.setFrameBuffer(null); assertEquals(12, driver.drawFramebuffer); - assertTrue(driver.context.isFrameBufferBindingValid()); + assertEquals(12, driver.readFramebuffer); + assertSame(override, driver.context.boundFB); driver.calls.clear(); driver.renderer.setFrameBuffer(null); assertTrue(driver.calls.isEmpty(), driver.calls.toString()); @@ -331,20 +344,65 @@ public void unknownOverrideDefersBindingUntilNullSelection(int defaultId) throws @ParameterizedTest @ValueSource(ints = {0, 77}) - public void knownMainOverrideRetainsImmediateBinding(int defaultId) throws Exception { + public void invalidationRetainsOverrideWithoutAllocatingIt(int defaultId) throws Exception { Recording driver = new Recording(false); driver.setDefaultFramebuffer(defaultId); + driver.renderer.setFrameBuffer(framebuffer(14)); + FrameBuffer override = new FrameBuffer(4, 4, 1); + override.addColorTarget(FrameBuffer.FrameBufferTarget.newTarget(Image.Format.RGBA8)); + driver.renderer.setMainFrameBufferOverride(override); + driver.calls.clear(); + + driver.renderer.invalidateState(); + + assertEquals(defaultId, driver.drawFramebuffer); + assertEquals(defaultId, driver.readFramebuffer); + assertEquals(defaultId, driver.context.boundFBO); + assertNull(driver.context.boundFB); + assertSame(override, driver.renderer.getCurrentFrameBuffer()); + assertEquals(-1, override.getId()); + assertEquals(0, driver.countCalls("glGenFramebuffersEXT")); + assertEquals(0, driver.countCalls("glGenRenderbuffersEXT")); driver.renderer.setFrameBuffer(null); - driver.renderer.setMainFrameBufferOverride(framebuffer(12)); - assertEquals(12, driver.drawFramebuffer); - assertTrue(driver.context.isFrameBufferBindingValid()); + assertTrue(override.getId() > 0); + assertEquals(override.getId(), driver.drawFramebuffer); + assertSame(override, driver.context.boundFB); } @ParameterizedTest @ValueSource(booleans = {false, true}) - public void unknownAttachmentUpdateRestoresSplitBindingsAndKeepsUploadedTexture( - boolean textureHelper) throws Exception { + public void lifecycleResetDoesNotRecreateMainOverride(boolean cleanup) throws Exception { + Recording driver = new Recording(false); + driver.setDefaultFramebuffer(77); + driver.renderer.setFrameBuffer(null); + FrameBuffer override = new FrameBuffer(4, 4, 1); + override.addColorTarget(FrameBuffer.FrameBufferTarget.newTarget(Image.Format.RGBA8)); + driver.renderer.setMainFrameBufferOverride(override); + assertTrue(override.getId() > 0); + driver.calls.clear(); + + if (cleanup) { + driver.renderer.cleanup(); + } else { + driver.renderer.resetGLObjects(); + } + + assertEquals(-1, override.getId()); + assertEquals(77, driver.drawFramebuffer); + assertEquals(77, driver.readFramebuffer); + assertEquals(77, driver.context.boundFBO); + assertNull(driver.context.boundFB); + assertSame(override, driver.renderer.getCurrentFrameBuffer()); + assertEquals(0, driver.countCalls("glGenFramebuffersEXT")); + assertEquals(0, driver.countCalls("glGenRenderbuffersEXT")); + } + + @ParameterizedTest + @CsvSource({"false, 0", "true, 0", "false, 77", "true, 77"}) + public void attachmentUpdateRestoresDefaultAndKeepsUploadedTexture( + boolean textureHelper, int defaultId) throws Exception { Recording driver = new Recording(false); + driver.setDefaultFramebuffer(defaultId); Texture2D texture = new Texture2D(4, 4, Image.Format.RGBA8); texture.setMinFilter(Texture.MinFilter.NearestNoMipMaps); FrameBuffer target = new FrameBuffer(4, 4, 1); @@ -353,30 +411,30 @@ public void unknownAttachmentUpdateRestoresSplitBindingsAndKeepsUploadedTexture( driver.readFramebuffer = 9; driver.drawFramebuffer = 10; driver.renderer.invalidateState(); + driver.calls.clear(); updateAttachment(driver, target, textureHelper); - assertTrue(target.getId() > 0); assertEquals(target.getId(), driver.lastAttachmentFramebuffer); - assertEquals(9, driver.readFramebuffer); - assertEquals(10, driver.drawFramebuffer); - assertFalse(driver.context.isFrameBufferBindingValid()); + assertEquals(defaultId, driver.readFramebuffer); + assertEquals(defaultId, driver.drawFramebuffer); + assertEquals(defaultId, driver.context.boundFBO); assertNull(driver.context.boundFB); assertEquals(texture.getImage().getId(), driver.lastUploadedTexture); assertEquals(0, driver.activeUnit); + assertEquals(0, driver.countCalls("glGetInteger")); assertSame(texture.getImage().getWeakRef(), driver.context.boundTextures[0]); driver.calls.clear(); driver.renderer.setTexture(0, texture); - assertTrue(driver.calls.isEmpty(), driver.calls.toString()); driver.renderer.setFrameBuffer(null); - assertEquals(0, driver.readFramebuffer); - assertEquals(0, driver.drawFramebuffer); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); } @ParameterizedTest - @ValueSource(booleans = {false, true}) - public void failedAttachmentUpdateRestoresUnknownSplitBindings(boolean textureHelper) throws Exception { + @CsvSource({"false, 0", "true, 0", "false, 77", "true, 77"}) + public void failedAttachmentUpdateRestoresDefault(boolean textureHelper, int defaultId) throws Exception { Recording driver = new Recording(false); + driver.setDefaultFramebuffer(defaultId); FrameBuffer target = new FrameBuffer(4, 4, 1); target.addColorTarget(FrameBuffer.FrameBufferTarget.newTarget(texture(17))); driver.readFramebuffer = 9; @@ -384,48 +442,24 @@ public void failedAttachmentUpdateRestoresUnknownSplitBindings(boolean textureHe driver.renderer.invalidateState(); IllegalStateException failure = new IllegalStateException("Attachment failure"); driver.attachmentFailure = failure; + driver.calls.clear(); assertSame(failure, assertThrows(IllegalStateException.class, () -> updateAttachment(driver, target, textureHelper))); assertEquals(target.getId(), driver.lastAttachmentFramebuffer); - assertEquals(9, driver.readFramebuffer); - assertEquals(10, driver.drawFramebuffer); - assertFalse(driver.context.isFrameBufferBindingValid()); + assertEquals(defaultId, driver.readFramebuffer); + assertEquals(defaultId, driver.drawFramebuffer); + assertEquals(defaultId, driver.context.boundFBO); assertNull(driver.context.boundFB); + assertEquals(0, driver.countCalls("glGetInteger")); driver.attachmentFailure = null; driver.renderer.setFrameBuffer(target); assertEquals(target.getId(), driver.drawFramebuffer); - assertTrue(driver.context.isFrameBufferBindingValid()); - } - - @ParameterizedTest - @ValueSource(booleans = {false, true}) - public void attachmentUpdateDoesNotTrustAnInvalidNameMatchingItsTarget( - boolean textureHelper) throws Exception { - Recording driver = new Recording(false); - FrameBuffer target = new FrameBuffer(4, 4, 1); - target.addColorTarget(FrameBuffer.FrameBufferTarget.newTarget(texture(17))); - driver.renderer.setFrameBuffer(target); - // Framebuffer-only invalidation deliberately retains the old native name. - driver.context.invalidateFrameBufferBinding(); - driver.readFramebuffer = 9; - driver.drawFramebuffer = 10; - - updateAttachment(driver, target, textureHelper); - - assertEquals(target.getId(), driver.lastAttachmentFramebuffer); - assertEquals(9, driver.readFramebuffer); - assertEquals(10, driver.drawFramebuffer); - assertEquals(target.getId(), driver.context.boundFBO); - assertFalse(driver.context.isFrameBufferBindingValid()); - driver.renderer.setFrameBuffer(target); - assertEquals(target.getId(), driver.readFramebuffer); - assertEquals(target.getId(), driver.drawFramebuffer); } @Test - public void unknownAttachmentUpdateSupportsCombinedBindingsWithoutBlit() throws Exception { + public void attachmentUpdateDoesNotRequireBlitSupport() throws Exception { Recording driver = new Recording(false); driver.renderer.getCaps().remove(Caps.FrameBufferBlit); driver.setNativeFramebuffer(9); @@ -437,16 +471,15 @@ public void unknownAttachmentUpdateSupportsCombinedBindingsWithoutBlit() throws driver.renderer.updateFrameBufferAttachment(target, target.getColorTarget()); assertEquals(target.getId(), driver.lastAttachmentFramebuffer); - assertEquals(9, driver.readFramebuffer); - assertEquals(9, driver.drawFramebuffer); - assertFalse(driver.context.isFrameBufferBindingValid()); - assertEquals(1, driver.countCalls("glGetInteger")); + assertEquals(0, driver.readFramebuffer); + assertEquals(0, driver.drawFramebuffer); + assertEquals(0, driver.context.boundFBO); + assertEquals(0, driver.countCalls("glGetInteger")); } @ParameterizedTest @ValueSource(booleans = {false, true}) - public void attachmentUpdateWithoutFramebufferSupportMakesNoNativeCalls( - boolean textureHelper) throws Exception { + public void attachmentUpdateWithoutFramebufferSupportMakesNoNativeCalls(boolean textureHelper) throws Exception { Recording driver = new Recording(false); driver.renderer.getCaps().remove(Caps.FrameBuffer); driver.renderer.getCaps().remove(Caps.FrameBufferBlit); @@ -458,12 +491,12 @@ public void attachmentUpdateWithoutFramebufferSupportMakesNoNativeCalls( assertThrows(RendererException.class, () -> updateAttachment(driver, target, textureHelper)); assertTrue(driver.calls.isEmpty(), driver.calls.toString()); - assertFalse(driver.context.isFrameBufferBindingValid()); + assertEquals(0, driver.context.boundFBO); } @ParameterizedTest @ValueSource(booleans = {false, true}) - public void knownAttachmentUpdateRetainsQueryFreeBindingRestoration(boolean sameTarget) throws Exception { + public void knownAttachmentUpdateRetainsQueryFreeRestoration(boolean sameTarget) throws Exception { Recording driver = new Recording(false); FrameBuffer previous = new FrameBuffer(4, 4, 1); previous.addColorTarget(FrameBuffer.FrameBufferTarget.newTarget(Image.Format.RGBA8)); @@ -481,101 +514,85 @@ public void knownAttachmentUpdateRetainsQueryFreeBindingRestoration(boolean same assertEquals(previous.getId(), driver.readFramebuffer); assertEquals(previous.getId(), driver.drawFramebuffer); assertSame(previous, driver.context.boundFB); - assertTrue(driver.context.isFrameBufferBindingValid()); assertEquals(0, driver.countCalls("glGetInteger")); assertEquals(sameTarget ? 0 : 2, driver.countCalls("glBindFramebufferEXT")); } @ParameterizedTest - @CsvSource({"0, 9", "0, 10", "7, 9", "7, 10"}) - public void deletingWhileUnknownDoesNotValidateOrEagerlyRebind( - int defaultId, int deletedId) throws Exception { + @CsvSource({"0, 9", "0, 10", "77, 9", "77, 10"}) + public void deletingAfterInvalidationKeepsDefaultBound(int defaultId, int deletedId) throws Exception { Recording driver = new Recording(false); driver.setDefaultFramebuffer(defaultId); driver.setNativeFramebuffer(9); driver.renderer.invalidateState(); driver.calls.clear(); driver.renderer.deleteFrameBuffer(framebuffer(deletedId)); - assertEquals(deletedId == 9 ? 0 : 9, driver.drawFramebuffer); - assertEquals(0, driver.countCalls("glBindFramebufferEXT")); - assertFalse(driver.context.isFrameBufferBindingValid()); - driver.renderer.setFrameBuffer(null); assertEquals(defaultId, driver.drawFramebuffer); - assertTrue(driver.context.isFrameBufferBindingValid()); + assertEquals(defaultId, driver.context.boundFBO); + assertEquals(0, driver.countCalls("glBindFramebufferEXT")); } @ParameterizedTest @ValueSource(ints = {0, 77}) - public void deletingKnownFramebufferKeepsCacheConsistentAndRestoresMain(int defaultId) throws Exception { + public void deletingBoundFramebufferRestoresDefault(int defaultId) throws Exception { Recording driver = new Recording(false); driver.setDefaultFramebuffer(defaultId); FrameBuffer framebuffer = framebuffer(12); driver.renderer.setFrameBuffer(framebuffer); - driver.renderer.deleteFrameBuffer(framebuffer); - - assertEquals(driver.drawFramebuffer, driver.context.boundFBO); - assertNull(driver.context.boundFB); - assertTrue(driver.context.isFrameBufferBindingValid()); - driver.renderer.setFrameBuffer(null); assertEquals(defaultId, driver.drawFramebuffer); + assertEquals(defaultId, driver.context.boundFBO); + assertNull(driver.context.boundFB); driver.calls.clear(); driver.renderer.setFrameBuffer(null); assertTrue(driver.calls.isEmpty(), driver.calls.toString()); } - @Test - public void knownUntrackedFramebufferDoesNotReceiveMainSrgbConfiguration() throws Exception { - Recording driver = new Recording(false); - driver.setDefaultFramebuffer(77); + @ParameterizedTest + @CsvSource({"false, false", "false, true", "true, false", "true, true"}) + public void invalidationImmediatelyRestoresMainSrgb(boolean desktop, boolean mainSrgb) throws Exception { + Recording driver = new Recording(desktop); driver.renderer.getCaps().add(Caps.Srgb); driver.renderer.getCaps().add(Caps.SrgbWriteControl); - driver.context.setFrameBufferBinding(null, 0); - driver.calls.clear(); - - driver.renderer.setMainFrameBufferSrgb(true); + driver.setDefaultFramebuffer(77); + driver.renderer.setMainFrameBufferSrgb(mainSrgb); + for (int i = 0; i < 2; i++) { + driver.srgbEnabled = !mainSrgb; + driver.readFramebuffer = 9; + driver.drawFramebuffer = 10; + driver.calls.clear(); + driver.renderer.invalidateState(); + assertEquals(mainSrgb, driver.srgbEnabled); + assertEquals(mainSrgb, driver.context.srgbWriteEnabled); + assertEquals(77, driver.drawFramebuffer); + driver.calls.clear(); + driver.renderer.setFrameBuffer(null); + assertTrue(driver.calls.isEmpty(), driver.calls.toString()); + } driver.renderer.copyFrameBuffer(framebuffer(12), framebuffer(13), true, false); - - assertEquals(0, driver.drawFramebuffer); - assertEquals(0, driver.countCalls("glEnable")); - assertEquals(0, driver.countCalls("glGetInteger")); - driver.renderer.setFrameBuffer(null); - assertEquals(77, driver.drawFramebuffer); - assertEquals(1, driver.countCalls("glEnable")); + assertEquals(mainSrgb, driver.srgbEnabled); + assertEquals(mainSrgb, driver.context.srgbWriteEnabled); } - @Test - public void unknownCopyRestorationDoesNotAssumeMainSrgbTarget() throws Exception { + @ParameterizedTest + @ValueSource(booleans = {false, true}) + public void resetDoesNotToggleSrgbWithoutBothCapabilities(boolean writeControl) throws Exception { Recording driver = new Recording(false); - driver.renderer.getCaps().add(Caps.Srgb); - driver.renderer.getCaps().add(Caps.SrgbWriteControl); - driver.setNativeFramebuffer(9); + driver.renderer.getCaps().add(writeControl ? Caps.SrgbWriteControl : Caps.Srgb); driver.renderer.invalidateState(); - driver.renderer.setMainFrameBufferSrgb(true); - driver.calls.clear(); - driver.renderer.copyFrameBuffer(framebuffer(12), framebuffer(13), true, false); - assertEquals(9, driver.drawFramebuffer); - assertEquals(0, driver.countCalls("glEnable")); - assertFalse(driver.context.isFrameBufferBindingValid()); - driver.renderer.setFrameBuffer(null); - assertEquals(1, driver.countCalls("glEnable")); + assertFalse(driver.srgbEnabled); } - @Test - public void mainSrgbConfigurationDoesNotToggleAnUnknownTarget() throws Exception { - Recording driver = new Recording(false); - driver.renderer.getCaps().add(Caps.Srgb); - driver.renderer.getCaps().add(Caps.SrgbWriteControl); - driver.setNativeFramebuffer(9); + @ParameterizedTest + @ValueSource(ints = {0, 77}) + public void desktopBufferSelectionQueriesFollowTheDefaultBind(int defaultId) throws Exception { + Recording driver = new Recording(true); + driver.setDefaultFramebuffer(defaultId); + driver.readFramebuffer = 9; + driver.drawFramebuffer = 10; driver.renderer.invalidateState(); - driver.calls.clear(); - driver.renderer.setMainFrameBufferSrgb(true); - assertTrue(driver.calls.isEmpty(), driver.calls.toString()); - driver.renderer.setFrameBuffer(null); - assertEquals(1, driver.countCalls("glEnable")); - driver.calls.clear(); - driver.renderer.setMainFrameBufferSrgb(false); - assertEquals(1, driver.countCalls("glDisable")); + assertEquals(defaultId, driver.lastDrawBufferQueryFramebuffer); + assertEquals(defaultId, driver.lastReadBufferQueryFramebuffer); } private static void updateAttachment(Recording driver, FrameBuffer target, boolean textureHelper) { @@ -611,6 +628,10 @@ private static final class Recording implements InvocationHandler { private int lastUploadedTexture; private int lastParameterTexture; private int lastAttachmentFramebuffer; + private int lastClearFramebuffer = -1; + private int lastDrawBufferQueryFramebuffer = -1; + private int lastReadBufferQueryFramebuffer = -1; + private boolean srgbEnabled; private IllegalStateException attachmentFailure; private final int[] textureBindings = new int[16]; private final List calls = new ArrayList<>(); @@ -659,6 +680,13 @@ public Object invoke(Object proxy, Method method, Object[] args) { int unit = (Integer) args[0] - GL.GL_TEXTURE0; assertTrue(unit >= 0, "Unknown texture unit passed to GL"); activeUnit = unit; + } else if (name.equals("glClear")) { + lastClearFramebuffer = drawFramebuffer; + } else if ((name.equals("glEnable") || name.equals("glDisable")) + && (Integer) args[0] == GLExt.GL_FRAMEBUFFER_SRGB_EXT) { + assertTrue(renderer.getCaps().contains(Caps.Srgb) + && renderer.getCaps().contains(Caps.SrgbWriteControl), "Unsupported sRGB toggle"); + srgbEnabled = name.equals("glEnable"); } else if (name.equals("glBindTexture")) { textureBindings[activeUnit] = (Integer) args[1]; } else if (name.equals("glTexImage2D")) { @@ -681,6 +709,14 @@ public Object invoke(Object proxy, Method method, Object[] args) { } } else if (name.equals("glGetInteger")) { int parameter = (Integer) args[0]; + if (parameter == GL2.GL_DRAW_BUFFER || parameter == GL2.GL_READ_BUFFER) { + assertTrue(renderer.getCaps().contains(Caps.OpenGL20), "Desktop-only query on GLES"); + if (parameter == GL2.GL_DRAW_BUFFER) { + lastDrawBufferQueryFramebuffer = drawFramebuffer; + } else { + lastReadBufferQueryFramebuffer = readFramebuffer; + } + } if (parameter == GL.GL_FRAMEBUFFER_BINDING || parameter == GLFbo.GL_READ_FRAMEBUFFER_BINDING_EXT) { assertTrue(renderer.getCaps().contains(Caps.FrameBuffer), diff --git a/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererDefaultFrameBufferTest.java b/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererDefaultFrameBufferTest.java index f09967a643..817b405294 100644 --- a/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererDefaultFrameBufferTest.java +++ b/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererDefaultFrameBufferTest.java @@ -107,15 +107,11 @@ void mainOverrideIsBoundWhenDiscoveredDefaultIsCurrent() { } @Test - void overrideAfterInvalidationWaitsForExplicitMainSelection() { + void overrideAfterInvalidationBindsNonzeroDefaultReplacement() { initializeRenderer(77); renderer.invalidateState(); FrameBuffer override = framebuffer(texture()); renderer.setMainFrameBufferOverride(override); - // An unknown binding must not be assumed to be the main framebuffer. - assertEquals(77, driver.drawFramebuffer); - assertEquals(77, driver.readFramebuffer); - renderer.setFrameBuffer(null); assertEquals(override.getId(), driver.drawFramebuffer); assertEquals(override.getId(), driver.readFramebuffer); } @@ -131,16 +127,13 @@ void screenBindAfterInvalidationRestoresDiscoveredDefault() { } @Test - void copyAfterInvalidationUsesDiscoveredDefaultAndRestoresNativeBinding() { + void copyAfterInvalidationRestoresDiscoveredDefault() { initializeRenderer(77); FrameBuffer fb = framebuffer(texture()); renderer.setFrameBuffer(fb); renderer.invalidateState(); renderer.copyFrameBuffer(fb, null, true, false); assertEquals(77, driver.blitDrawFramebuffer); - assertEquals(fb.getId(), driver.drawFramebuffer); - assertEquals(fb.getId(), driver.readFramebuffer); - renderer.setFrameBuffer(null); assertEquals(77, driver.drawFramebuffer); assertEquals(77, driver.readFramebuffer); } From e436c07e8be6112966829e877d0a49eb7b2644a7 Mon Sep 17 00:00:00 2001 From: toaster0123 <261194501+toaster0123@users.noreply.github.com> Date: Fri, 30 Oct 2026 12:09:58 +0000 Subject: [PATCH 6/6] Wrap binding regression test signature for Checkstyle --- .../renderer/opengl/GlRendererBindingInvalidationTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererBindingInvalidationTest.java b/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererBindingInvalidationTest.java index 9adade393b..9e7ecf7843 100644 --- a/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererBindingInvalidationTest.java +++ b/jme3-core/src/test/java/com/jme3/renderer/opengl/GlRendererBindingInvalidationTest.java @@ -479,7 +479,8 @@ public void attachmentUpdateDoesNotRequireBlitSupport() throws Exception { @ParameterizedTest @ValueSource(booleans = {false, true}) - public void attachmentUpdateWithoutFramebufferSupportMakesNoNativeCalls(boolean textureHelper) throws Exception { + public void attachmentUpdateWithoutFramebufferSupportMakesNoNativeCalls( + boolean textureHelper) throws Exception { Recording driver = new Recording(false); driver.renderer.getCaps().remove(Caps.FrameBuffer); driver.renderer.getCaps().remove(Caps.FrameBufferBlit);