Graph Shader Simplification, 'a'/'b' redefined; GraphUI 2-pass demo;

Graph Shader Simplification

  - remove enable factor and 2nd 'discard' branch

  - use build-in 'max'/'clamp' functions, supposed to be faster

Graph Shader 'a'/'b' redefined

  - 'a' is 1-pass shader only

  - 'b' is 2-pass incl. (1st pass + 2nd pass)
    - Works well on ARM Mali-400 MP (Galaxy S2).
    - Doesn't work on NV tegra2 (P1202: Texture's gl states do not match with shader's),
      however 2-pass on mobile seems to be overkill for now.
      We may create a workaround (switch shader ..).

GraphUI 2-pass demo;
  - Propagate renderModes and texSize to UIShape's render(..)
  - TODO: Remove GL dependency in UIShape, maybe use a callback or visitor model
  - Adding GarpUI 2-pass launcher (Android and Standalone)

1 files changed, 3 insertions, 8 deletions

diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java b/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java
index 0218c729a..0217a6369 100755
--- a/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java
@@ -46,16 +46,11 @@ public class RegionRendererImpl01 extends RegionRenderer {
         

     }

     

-    /**

-     * FIXME: 2nd pass shader !

-     */

     @Override

     protected String getFragmentShaderName(GL2ES2 gl) {

-        if(Region.isNonUniformWeight(renderModes)){

-            // FIXME: split shader !

-            return "curverenderer02" + getShaderGLVersionSuffix(gl);

-        }

-        return "curverenderer01a" + getShaderGLVersionSuffix(gl);

+        final String type = Region.isNonUniformWeight(renderModes) ? "02" : "01" ;

+        final String pass = Region.isVBAA(renderModes) ? "b" : "a" ;

+        return "curverenderer" + type + pass + getShaderGLVersionSuffix(gl);

     }

     

     protected boolean initShaderProgram(GL2ES2 gl) {