/ - Diff - Distorted Android

« Previous | Next »

Revision 97b6c85e

Added by Leszek Koltunski over 3 years ago

ID 97b6c85e61d0e7f46cf5681d1daa2306b1a33b22
Parent 2acab35b
Child 46d463a4

Bugfixes as a result of the Samsung Galaxy J4+ investigation:

1) By default, switch off transform feedback in the main program.
Create a new API 'needTransformFeedback()' to call if someone still needs TF in the main program.
2) lower the default max number of vertex effects to 30.
3) lower the default max number of Components of a Mesh to 100.

         maxtable[0] =100;  // By default, there can be a maximum 100 MATRIX effects in a single
                            // EffectQueueMatrix at any given time. This can be changed with a call
                            // to EffectQueueMatrix.setMax(int)
         maxtable[1] =100;  // Max 100 VERTEX Effects
         maxtable[1] = 30;  // Max 30 VERTEX Effects
         maxtable[2] =  5;  // Max 5 FRAGMENT Effects
         maxtable[3] =  3;  // Max 3 POSTPROCESSING Effects
+        }

       private static int mGLSL;
       private static String mGLSL_VERSION;
       private static boolean mOITCompilationAttempted;
       private static boolean mNeedsTransformFeedback;
       private static int mMaxTextureSize         = Integer.MAX_VALUE;
       private static int mMaxNumberOfVerUniforms = Integer.MAX_VALUE;
-...
         try
+          {
           mMainProgram = new DistortedProgram(mainVertStream, mainFragStream, mainVertHeader, mainFragHeader,
                                               enabledEffectV, enabledEffectF, mGLSL, feedback);
           mMainProgram = new DistortedProgram(mainVertStream, mainFragStream, mainVertHeader,
                                               mainFragHeader, enabledEffectV, enabledEffectF,
                                               mGLSL, mNeedsTransformFeedback ? feedback : null );
+          }
         catch(Exception e)
+          {
-...
             Log.e("DISTORTED", "GLSL Version "+GLES30.glGetString(GLES31.GL_SHADING_LANGUAGE_VERSION));
+            }
+          }
         else if( vendor.contains("Qualcomm"))
+          {
           if( version.contains("V@331.0") )
+            {
             Log.e("DISTORTED", "You are running this on an Adreno 3xx driver version 331.\nStrange shit might happen.");
+            }
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         return mMaxTextureSize;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Call this before calling onSurfaceCreated() if you want to access normal vectors in CPU.
      */
       public static void needTransformFeedback()
+        {
         mNeedsTransformFeedback = true;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Returns the maximum number of effects of a given type that can be simultaneously applied to a

+       {
        private static final int ASSOC_UBO_BINDING  = 3;
        private static final int CENTER_UBO_BINDING = 4;
        public  static final int MAX_EFFECT_COMPONENTS= 250;
        public  static final int MAX_EFFECT_COMPONENTS= 100;
        // sizes of attributes of an individual vertex.
        private static final int POS_DATA_SIZE= 3; // vertex coordinates: x,y,z

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision 97b6c85e

Added by Leszek Koltunski over 3 years ago