Skip to content

Commit b00143c

Browse files
committed
Revert "do not promote framebuffer override to global default"
This reverts commit 1603906.
1 parent 3b593bf commit b00143c

3 files changed

Lines changed: 12 additions & 0 deletions

File tree

jme3-android/src/main/java/com/jme3/system/android/OGLESContext.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,10 @@ private boolean renderFrameWithBlitSrgbConversion() {
686686
renderer.setMainFrameBufferOverride(linearFrameBuffer);
687687
try {
688688
listener.update();
689+
FrameBuffer currentMainFramebuffer = renderer.getCurrentFrameBuffer();
690+
if (currentMainFramebuffer != linearFrameBuffer) {
691+
restoreMainFramebuffer = currentMainFramebuffer;
692+
}
689693
} finally {
690694
renderer.setMainFrameBufferOverride(restoreMainFramebuffer);
691695
}

jme3-ios/src/main/java/com/jme3/system/ios/IGLESContext.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,10 @@ private boolean renderFrameWithBlitSrgbConversion() {
480480
renderer.setMainFrameBufferOverride(linearFrameBuffer);
481481
try {
482482
listener.update();
483+
FrameBuffer currentMainFramebuffer = renderer.getCurrentFrameBuffer();
484+
if (currentMainFramebuffer != linearFrameBuffer) {
485+
restoreMainFramebuffer = currentMainFramebuffer;
486+
}
483487
} finally {
484488
renderer.setMainFrameBufferOverride(restoreMainFramebuffer);
485489
}

jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,10 @@ private boolean renderFrameWithAuxFramebuffer() {
865865
glRenderer.setMainFrameBufferOverride(auxFramebuffer);
866866
try {
867867
listener.update();
868+
FrameBuffer currentMainFramebuffer = renderer.getCurrentFrameBuffer();
869+
if (currentMainFramebuffer != auxFramebuffer) {
870+
restoreMainFramebuffer = currentMainFramebuffer;
871+
}
868872
} finally {
869873
glRenderer.setMainFrameBufferOverride(restoreMainFramebuffer);
870874
}

0 commit comments

Comments
 (0)