commit 2dbed690bdbee80d9bfb22c800073855eb5d0946 Author: Leszek Koltunski Date: Fri Jun 8 15:03:48 2018 +0100 In an attempt to contain the flashes on Mali GPU, re-structure the post-processing FBOs from 1 FBO with 2 color attachments + combined depth-stencil to 2 separate FBOs sharing a depth-stencil texture. Result: this appears to make the flashes slightly worse. diff --git a/src/main/java/org/distorted/library/effect/PostprocessEffect.java b/src/main/java/org/distorted/library/effect/PostprocessEffect.java index 28ebd7c..4695e0a 100644 --- a/src/main/java/org/distorted/library/effect/PostprocessEffect.java +++ b/src/main/java/org/distorted/library/effect/PostprocessEffect.java @@ -139,7 +139,7 @@ public abstract class PostprocessEffect extends Effect implements DistortedMaste * * @y.exclude */ - public abstract int apply(float[] uniforms, int index, DistortedOutputSurface[] buffers); + public abstract int apply(float[] uniforms, int index, DistortedOutputSurface[][] buffers); /////////////////////////////////////////////////////////////////////////////////////////////////// /** diff --git a/src/main/java/org/distorted/library/effect/PostprocessEffectBlur.java b/src/main/java/org/distorted/library/effect/PostprocessEffectBlur.java index 08cec17..d8d25c7 100644 --- a/src/main/java/org/distorted/library/effect/PostprocessEffectBlur.java +++ b/src/main/java/org/distorted/library/effect/PostprocessEffectBlur.java @@ -140,7 +140,7 @@ public class PostprocessEffectBlur extends PostprocessEffect * * @y.exclude */ - public int apply(float[] uniforms, int index, DistortedOutputSurface[] buffers) + public int apply(float[] uniforms, int index, DistortedOutputSurface[][] buffers) { if( mProgram1 ==null) { @@ -157,16 +157,15 @@ public class PostprocessEffectBlur extends PostprocessEffect DistortedRenderState.useStencilMark(); - DistortedFramebuffer buffer = (DistortedFramebuffer)buffers[mQualityLevel]; + DistortedFramebuffer buffer0 = (DistortedFramebuffer)buffers[mQualityLevel][0]; + DistortedFramebuffer buffer1 = (DistortedFramebuffer)buffers[mQualityLevel][1]; - buffer.setAsOutput(); + float w= buffer0.getWidth(); + float h= buffer0.getHeight(); + float n= 1.0f - buffer0.getNear(); - float w= buffer.getWidth(); - float h= buffer.getHeight(); - float n= 1.0f - buffer.getNear(); - - float corrW = buffer.getWidthCorrection(); - float corrH = buffer.getHeightCorrection(); + float corrW = buffer0.getWidthCorrection(); + float corrH = buffer0.getHeightCorrection(); float offsetCorrW = corrW/w; float offsetCorrH = corrH/h; @@ -182,8 +181,8 @@ public class PostprocessEffectBlur extends PostprocessEffect for(int i=0; i<=radius; i++) mOffsets[i] = offsetsCache[offset+i]*offsetCorrW; mProgram1.useProgram(); - buffer.bindForOutput(1); - buffer.setAsInput(0); + buffer1.setAsOutput(); + buffer0.setAsInput(); GLES31.glColorMask(true,true,true,true); GLES31.glClearColor(1.0f,1.0f,1.0f,0.0f); @@ -203,8 +202,8 @@ public class PostprocessEffectBlur extends PostprocessEffect for(int i=0; i<=radius; i++) mOffsets[i] = offsetsCache[offset+i]*offsetCorrH; mProgram2.useProgram(); - buffer.bindForOutput(0); - buffer.setAsInput(1); + buffer0.setAsOutput(); + buffer1.setAsInput(); GLES31.glClear(GLES31.GL_COLOR_BUFFER_BIT); diff --git a/src/main/java/org/distorted/library/effect/PostprocessEffectGlow.java b/src/main/java/org/distorted/library/effect/PostprocessEffectGlow.java index e0cd858..bc16afb 100644 --- a/src/main/java/org/distorted/library/effect/PostprocessEffectGlow.java +++ b/src/main/java/org/distorted/library/effect/PostprocessEffectGlow.java @@ -144,7 +144,7 @@ public class PostprocessEffectGlow extends PostprocessEffect * * @y.exclude */ - public int apply(float[] uniforms, int index, DistortedOutputSurface[] buffers) + public int apply(float[] uniforms, int index, DistortedOutputSurface[][] buffers) { if( mProgram1 ==null) { @@ -161,12 +161,13 @@ public class PostprocessEffectGlow extends PostprocessEffect DistortedRenderState.useStencilMark(); - DistortedFramebuffer inBuffer = (DistortedFramebuffer)buffers[0]; - DistortedFramebuffer outBuffer = (DistortedFramebuffer)buffers[mQualityLevel]; + DistortedFramebuffer inBuffer = (DistortedFramebuffer)buffers[0][0]; + DistortedFramebuffer outBuffer0 = (DistortedFramebuffer)buffers[mQualityLevel][0]; + DistortedFramebuffer outBuffer1 = (DistortedFramebuffer)buffers[mQualityLevel][1]; - float w= outBuffer.getWidth(); - float h= outBuffer.getHeight(); - float n= 1.0f - outBuffer.getNear(); + float w= outBuffer0.getWidth(); + float h= outBuffer0.getHeight(); + float n= 1.0f - outBuffer0.getNear(); float corrW = inBuffer.getWidthCorrection(); float corrH = inBuffer.getHeightCorrection(); @@ -180,15 +181,14 @@ public class PostprocessEffectGlow extends PostprocessEffect int offset = radius + radius*radius/4; radius = (radius+1)/2; - outBuffer.setAsOutput(); GLES31.glViewport(0, 0, (int)w, (int)h); // horizontal glow for(int i=0; i<=radius; i++) mOffsets[i] = offsetsCache[offset+i]*offsetCorrW; mProgram1.useProgram(); - outBuffer.bindForOutput(1); - inBuffer.setAsInput(0); + outBuffer1.setAsOutput(); + inBuffer.setAsInput(); GLES31.glColorMask(true,true,true,true); GLES31.glClearColor(1.0f,1.0f,1.0f,0.0f); @@ -209,8 +209,8 @@ public class PostprocessEffectGlow extends PostprocessEffect for(int i=0; i<=radius; i++) mOffsets[i] = offsetsCache[offset+i]*offsetCorrH; mProgram2.useProgram(); - outBuffer.bindForOutput(0); - outBuffer.setAsInput(1); + outBuffer0.setAsOutput(); + outBuffer1.setAsInput(); GLES31.glUniform1f ( mProgram2.mUniform[0] , n ); GLES31.glUniform2f ( mProgram2.mUniform[1] , corrW, corrH ); @@ -229,7 +229,7 @@ public class PostprocessEffectGlow extends PostprocessEffect if( mQualityLevel>0 ) { inBuffer.setAsOutput(); - outBuffer.setAsInput(0); + outBuffer0.setAsInput(); GLES31.glEnable(GLES31.GL_BLEND); DistortedEffects.blitPriv(inBuffer); GLES31.glDisable(GLES31.GL_BLEND); diff --git a/src/main/java/org/distorted/library/main/DistortedFramebuffer.java b/src/main/java/org/distorted/library/main/DistortedFramebuffer.java index c7614f1..ccea145 100644 --- a/src/main/java/org/distorted/library/main/DistortedFramebuffer.java +++ b/src/main/java/org/distorted/library/main/DistortedFramebuffer.java @@ -39,8 +39,6 @@ public class DistortedFramebuffer extends DistortedOutputSurface implements Dist if( mColorCreated==NOT_CREATED_YET ) { GLES31.glGenTextures( mNumColors, mColorH, 0); - GLES31.glGenFramebuffers(1, mFBOH, 0); - GLES31.glBindFramebuffer(GLES31.GL_FRAMEBUFFER, mFBOH[0]); for(int i=0; i0 ) + { + mDepthStencilCreated = DONT_CREATE; + mDepthStencilH[0]=0; + } } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -128,6 +135,19 @@ public class DistortedFramebuffer extends DistortedOutputSurface implements Dist return CREATED; } +/////////////////////////////////////////////////////////////////////////////////////////////////// +// the Framebuffer was created without DEPTH or STENCIL but now we want to copy it from some other. +// Framebuffer 'from' MUST be already created!! +// Must be called from a thread holding OpenGL Context +// +// 'Private' , library-only function used only for the postprocessing buffers! + + void copyDepthAndStencil(DistortedFramebuffer from) + { + mDepthStencilCreated = COPIED; + mDepthStencilH[0] = from.mDepthStencilH[0]; + } + /////////////////////////////////////////////////////////////////////////////////////////////////// // Must be called from a thread holding OpenGL Context diff --git a/src/main/java/org/distorted/library/main/DistortedObject.java b/src/main/java/org/distorted/library/main/DistortedObject.java index e147544..b569d4e 100644 --- a/src/main/java/org/distorted/library/main/DistortedObject.java +++ b/src/main/java/org/distorted/library/main/DistortedObject.java @@ -39,6 +39,7 @@ abstract class DistortedObject static final int NOT_CREATED_YET = 2; static final int DONT_CREATE = 3; static final int CREATED = 4; + static final int COPIED = 5; static final int TYPE_USER = 0; static final int TYPE_TREE = 1; diff --git a/src/main/java/org/distorted/library/main/DistortedOutputSurface.java b/src/main/java/org/distorted/library/main/DistortedOutputSurface.java index 0e8f65f..df03a60 100644 --- a/src/main/java/org/distorted/library/main/DistortedOutputSurface.java +++ b/src/main/java/org/distorted/library/main/DistortedOutputSurface.java @@ -69,8 +69,9 @@ public abstract class DistortedOutputSurface extends DistortedSurface implements private ArrayList mJobs = new ArrayList<>(); - // Global buffers used for postprocessing. - private static DistortedOutputSurface[] mBuffer = new DistortedOutputSurface[EffectQuality.LENGTH]; + // Global buffers used for postprocessing. MipmapLevels x PING_PONG of each for postprocessing ping-pong. + private static final int PING_PONG = 2; + private static DistortedOutputSurface[][] mBuffer = null; private long mTime; private float mFOV; @@ -171,20 +172,37 @@ public abstract class DistortedOutputSurface extends DistortedSurface implements private static void createPostprocessingBuffers(int width, int height, float near) { + mBuffer = new DistortedOutputSurface[EffectQuality.LENGTH][PING_PONG]; float mipmap=1.0f; - for (int j=0; j surface.mRealWidth ? surface.mWidth : surface.mRealWidth; - int maxh = surface.mHeight > surface.mRealHeight ? surface.mHeight : surface.mRealHeight; + int maxw = surface.mWidth > surface.mRealWidth ? surface.mWidth : surface.mRealWidth; + int maxh = surface.mHeight > surface.mRealHeight ? surface.mHeight : surface.mRealHeight; - if (maxw > surface.mRealWidth || maxh > surface.mRealHeight) - { - surface.mRealWidth = maxw; - surface.mRealHeight = maxh; + if (maxw > surface.mRealWidth || maxh > surface.mRealHeight) + { + surface.mRealWidth = maxw; + surface.mRealHeight = maxh; - surface.recreate(); - surface.create(); + surface.recreate(); + surface.create(); + } } } } @@ -288,7 +320,7 @@ public abstract class DistortedOutputSurface extends DistortedSurface implements } /////////////////////////////////////////////////////////////////////////////////////////////////// -// two phases: 1. collapse the SSBO 2. blend the ssbo's color +// two phases: 1. collapse the SSBO 2. blend the SSBO's color private int oitRender(long currTime) { @@ -318,7 +350,7 @@ public abstract class DistortedOutputSurface extends DistortedSurface implements /////////////////////////////////////////////////////////////////////////////////////////////////// - private static void clearBuffer(DistortedOutputSurface buffer) + private static void clearPostprocessingBuffer(int quality) { GLES31.glStencilMask(0xff); GLES31.glDepthMask(true); @@ -327,13 +359,12 @@ public abstract class DistortedOutputSurface extends DistortedSurface implements GLES31.glClearDepthf(1.0f); GLES31.glClearStencil(0); - buffer.setAsOutput(); - GLES31.glFramebufferTexture2D(GLES31.GL_FRAMEBUFFER, GLES31.GL_COLOR_ATTACHMENT0, GLES31.GL_TEXTURE_2D, buffer.mColorH[buffer.mNumColors-1], 0); + mBuffer[quality][0].setAsOutput(); GLES31.glClear(GLES31.GL_COLOR_BUFFER_BIT|GLES31.GL_DEPTH_BUFFER_BIT|GLES31.GL_STENCIL_BUFFER_BIT); - for(int i=buffer.mNumColors-2; i>=0; i--) + for(int j=1; j