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

« Previous | Next »

Revision 78ff6ea9

Added by Leszek Koltunski over 3 years ago

ID 78ff6ea992ca60e97cd98b300141171b15313f6c
Parent 72ef21f7
Child 8b36dabf

Convert the Integer part (i.e. effect names and the two associations) of vertex and fragment shaders to Uniform Buffer Objects.
Next: convert the last part, i.e. the float effect parameters.

+      {
       public static final int MAIN_VARIANTS = 4; // Number of Main program variants (ATM 4: MAIN, MAIN OIT, PREPROCESS, FULL)
       static final int PROP_VERT_UBO_BINDING = 5;
       static final int PROP_FRAG_UBO_BINDING = 6;
       private static final int CREATE = 0;
       private static final int ATTACH = 1;
       private static final int DETACH = 2;
-...
       long mTime;
       int mNumEffects;              // 'ToBe' will be more than mNumEffects if doWork() hasn't
       private int mNumEffectsToBe;  // added them yet (or less if it hasn't removed some yet)
       private int mNumFloatUniforms, mNumIntUniforms;
       private final int mNumFloatUniforms;
       Effect[] mEffects;
       float[] mFloatUniforms;
       int[] mIntUniforms;
       UniformBlockProperties mUBP;
       private long mID;
       private int mIndex;
       private final int mIndex;
       private boolean mCreated;
       private static class Job
-...
+          }
+        }
       private ArrayList<Job> mJobs = new ArrayList<>();
       private final ArrayList<Job> mJobs;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         mNumEffectsToBe   = 0;
         mIndex            = index;
         mNumFloatUniforms = numFloatUniforms;
         mNumIntUniforms   = numIntUniforms;
         mUBP  = new UniformBlockProperties(numIntUniforms);
         mJobs = new ArrayList<>();
         mJobs.add(new Job(CREATE,numFloatUniforms,numIntUniforms, false,null)); // create the stuff that depends on max number
         InternalMaster.newSlave(this);                                          // of uniforms later, on first render.
-...
           mNumEffectsToBe   = 0;
           mIndex            = source.mIndex;
           mNumFloatUniforms = source.mNumFloatUniforms;
           mNumIntUniforms   = source.mNumIntUniforms;
           mUBP  = new UniformBlockProperties(source.mUBP);
           mJobs = new ArrayList<>();
           int numJobs = source.mJobs.size();
-...
           mNumEffectsToBe   = source.mNumEffectsToBe;
           mIndex            = source.mIndex;
           mNumFloatUniforms = source.mNumFloatUniforms;
           mNumIntUniforms   = source.mNumIntUniforms;
           mUBP  = new UniformBlockProperties(source.mUBP);
           mJobs = new ArrayList<>();
           int max = InternalStackFrameList.getMax(mIndex);
-...
+            {
             mEffects       = new Effect[max];
             mFloatUniforms = new float[max*source.mNumFloatUniforms];
             mIntUniforms   = new int[max*source.mNumIntUniforms];
             if( mNumEffects>=0 )
+              {
               System.arraycopy(source.mEffects, 0, mEffects, 0, mNumEffects);
+              }
             if( mNumIntUniforms*mNumEffects>=0 )
+              {
               System.arraycopy(source.mIntUniforms, 0, mIntUniforms, 0, mNumIntUniforms*mNumEffects);
+              }
+            }
+          }
+        }
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public static void send(EffectQueue[] queues, float distance, float mipmap,
       public static void send(EffectQueue[] queues, int programH, float distance, float mipmap,
                               float[] projection, float inflate, int variant )
+        {
         ((EffectQueueMatrix  )queues[0]).send(distance, mipmap, projection, variant);
         ((EffectQueueVertex  )queues[1]).send(inflate, variant);
         ((EffectQueueFragment)queues[2]).send(variant);
         ((EffectQueueVertex  )queues[1]).send(inflate, programH, variant);
         ((EffectQueueFragment)queues[2]).send(programH, variant);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
           mNumEffects--;
           mEffects[pos].remQueue(this);
           System.arraycopy(mEffects, pos+1, mEffects, pos, mNumEffects-pos);
           System.arraycopy(mIntUniforms, mNumIntUniforms*(pos+1), mIntUniforms, mNumIntUniforms*pos, mNumIntUniforms*(mNumEffects-pos) );
           mUBP.remove(pos, mNumEffects);
           mEffects[mNumEffects] = null;
+          }
+        }
-...
       private void addNow(int pos, Effect effect)
+        {
         mEffects[pos]                     = effect;
         mIntUniforms[mNumIntUniforms*pos] = effect.getName().ordinal();
         mEffects[pos] = effect;
         mUBP.addOrdinal(pos, effect.getName().ordinal() );
         effect.addQueue(this);
         if( mIndex==EffectType.VERTEX.ordinal() )
+          {
           effect.writeAssociations(mIntUniforms, mNumIntUniforms*pos+1, mNumIntUniforms*pos+3);
           mUBP.addAssociations(pos,effect);
+          }
+        }
-...
+          {
           if (mEffects[j].getID() == effectID)
+            {
             mEffects[j].writeAssociations(mIntUniforms, mNumIntUniforms*j+1, mNumIntUniforms*j+3);
             mUBP.addAssociations(j,mEffects[j]);
+            }
+          }
+        }
-...
+                           {
                            mEffects       = new Effect[max];
                            mFloatUniforms = new float[max*job.num1];
                            mIntUniforms   = new int[max*job.num2];
                            mUBP           = new UniformBlockProperties(job.num2);
+                           }
                          mCreated = true;
-...
+                             }
                            else if( position<=mNumEffects )
+                             {
                              System.arraycopy(mEffects    , position, mEffects    , position+1, mNumEffects-position);
                              System.arraycopy(mIntUniforms, mNumIntUniforms*position, mIntUniforms, mNumIntUniforms*(position+1), mNumIntUniforms*(mNumEffects-position) );
                              System.arraycopy(mEffects, position, mEffects, position+1, mNumEffects-position);
                              mUBP.makeHole(position, mNumEffects);
                              addNow(position,job.effect);
                              mNumEffects++;
                              changed = true;

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision 78ff6ea9

Added by Leszek Koltunski over 3 years ago