/src/main/java/org/distorted/library/main/DistortedOutputSurface.java - Diff - Distorted Android

« Previous | Next »

Revision 8ebbc730

Added by Leszek Koltunski over 7 years ago

ID 8ebbc730e9eb982469777d9661d41977cbdf8720
Parent baa3989b
Child 586b5fa1

Port a commit from the master branch.

Finally properly fix the flashing on ARM Mali T880 GPU.

The flashing is caused by a 'full pipeline flush' (see DarkPhoton, https://www.opengl.org/discussion_boards/showthread.php/200754-Flashes-on-ARM-Mali?p=1291679&viewfull=1#post1291679 ). In order to combat it, first introduce the possibility that a single DistortedOutputSurface is backed up by more than one FBO. Then make DistortedScreen be derived from DistortedFramebuffer (which itself is derived from DistortedOutputSurface) and make it contain 3 FBOs, render to them in a circular queue fashion, and blit from a given FBO to the system FBO. The 'more than 1 intermediate FBO' queue prevents the pipeline flush.

Still some TODOs in DistortedFramebuffer remain (properly check for Framebuffer completness!)

       // Global buffers used for postprocessing.
       private static DistortedOutputSurface[] mBuffer = new DistortedOutputSurface[EffectQuality.LENGTH];
       private long mTime;
       private float mFOV;
       float mDistance, mNear;
       float[] mProjectionMatrix;
       int mDepthStencilCreated;
       int mDepthStencil;
       int[] mDepthStencilH = new int[1];
       int[] mFBOH          = new int[1];
       int[] mDepthStencilH;
       int[] mFBOH;
       private long[] mTime;
       private float mClearR, mClearG, mClearB, mClearA;
       private float mClearDepth;
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       DistortedOutputSurface(int width, int height, int createColor, int numcolors, int depthStencil, int fbo, int type)
       DistortedOutputSurface(int width, int height, int createColor, int numfbos, int numcolors, int depthStencil, int fbo, int type)
+        {
         super(width,height,createColor,numcolors,type);
         super(width,height,createColor,numfbos,numcolors,type);
         mDepthStencilH = new int[numfbos];
         mFBOH          = new int[numfbos];
         mTime = new long[numfbos];
         for(int i=0; i<mNumFBOs;i++) mTime[i]=0;
         mRealWidth = width;
         mRealHeight= height;
-...
         mFBOH[0]         = fbo;
         mDepthStencilH[0]= 0;
         mTime = 0;
         mClearR = 0.0f;
         mClearG = 0.0f;
         mClearB = 0.0f;
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private int oitBuild(DistortedOutputSurface buffer)
       private int oitBuild(long time, DistortedOutputSurface buffer, int fbo)
+        {
         GLES31.glViewport(0, 0, mWidth, mHeight);
         setAsOutput();
         setAsOutput(time,fbo);
         GLES31.glActiveTexture(GLES31.GL_TEXTURE0);
         GLES31.glBindTexture(GLES31.GL_TEXTURE_2D, buffer.mColorH[0]);
         GLES31.glActiveTexture(GLES31.GL_TEXTURE1);
-...
     // Otherwise, render to a buffer and on each change of Postprocessing Bucket, apply the postprocessing
     // to a whole buffer (lastQueue.postprocess) and merge it (this.oitBuild).
       int renderChildren(long time, int numChildren, ArrayList<DistortedNode> children)
       int renderChildren(long time, int numChildren, ArrayList<DistortedNode> children, int fbo)
+        {
         int quality=0, internalQuality = 0, numRenders = 0, bucketChange = 0;
         DistortedNode child1, child2;
-...
           if( currBucket==0 )
+            {
             GLES31.glBindFramebuffer(GLES31.GL_FRAMEBUFFER, mFBOH[0]);
             numRenders += child1.draw(time, this);
             setAsOutput(time,fbo);
             numRenders += child1.draw(time,this);
+            }
           else
+            {
-...
+                  }
                 numRenders += lastQueue.postprocess(mBuffer);
                 numRenders += oitBuild(mBuffer[quality]);
                 numRenders += oitBuild(time,mBuffer[quality],fbo);
                 GLES31.glMemoryBarrier(GLES31.GL_SHADER_STORAGE_BARRIER_BIT|GLES31.GL_ATOMIC_COUNTER_BARRIER_BIT);
                 clearBuffer(mBuffer[quality]);
+                }
               internalQuality = currQueue.getInternalQuality();
-...
+                }
               numRenders += currQueue.postprocess(mBuffer);
               numRenders += oitBuild(mBuffer[quality]);
               numRenders += oitBuild(time,mBuffer[quality],fbo);
               GLES31.glMemoryBarrier(GLES31.GL_SHADER_STORAGE_BARRIER_BIT|GLES31.GL_ATOMIC_COUNTER_BARRIER_BIT);
               numRenders += oitRender(time);  // merge the OIT linked list
               clearBuffer(mBuffer[quality]);
-...
         return (float)mHeight/mRealHeight;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void setAsOutput(long time, int fbo)
+        {
         if( fbo>=0 && fbo<mNumFBOs )
+          {
           GLES31.glBindFramebuffer(GLES31.GL_FRAMEBUFFER, mFBOH[fbo]);
           if (mTime[fbo] != time)
+            {
             mTime[fbo] = time;
             clear();
+            }
+          }
         else
+          {
           android.util.Log.e("surface", "error in setAsOutput, fbo="+fbo);
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // PUBLIC API
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Draws all the attached children to this OutputSurface.
      * Draws all the attached children to this OutputSurface's 0th FBO.
      * <p>
      * Must be called from a thread holding OpenGL Context.
+     *
-...
      * @return Number of objects rendered.
      */
       public int render(long time)
+        {
         return render(time,0);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Draws all the attached children to this OutputSurface.
      * <p>
      * Must be called from a thread holding OpenGL Context.
+     *
      * @param time Current time, in milliseconds. This will be passed to all the Effects stored in the children Nodes.
      * @param fbo The surface can have many FBOs backing it up - render this to FBO number 'fbo'.
      * @return Number of objects rendered.
      */
       public int render(long time, int fbo)
+        {
         // change tree topology (attach and detach children)
     /*
-...
           numRenders += mChildren.get(i).renderRecursive(time);
+          }
         setAsOutput(time);
         numRenders += renderChildren(time,mNumChildren,mChildren);
         numRenders += renderChildren(time,mNumChildren,mChildren,fbo);
         return numRenders;
+        }
-...
+        {
         GLES31.glBindFramebuffer(GLES31.GL_FRAMEBUFFER, mFBOH[0]);
         if( mTime!=time )
         if( mTime[0]!=time )
+          {
           mTime = time;
           mTime[0] = time;
           clear();
+          }
+        }

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision 8ebbc730

Added by Leszek Koltunski over 7 years ago