Graph: GLSL fix, Adding renderModes bits instead of dedicated booleans, Region/GLRegion, ..

GLSL fix:
  - allowing #version tag
  - add uniform textureSize (ES2)
  - fix int/float conversion

Region/GLRegion:
  - non OpenGL Region and GL related GLRegion split

Region/Renderer renderModes bits (def. in Region)
  - user creates a Renderer* impl .. and derive Region*'s from outline,
    possibly from a different code path.

  - to avoid mode explosion, a bit field is being used for now

- Renderer: remove flushCache(), since non caching impl. is intended,
            or caching by an external user transparent object.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/TextRendererImpl01.java b/src/jogl/classes/jogamp/graph/curve/opengl/TextRendererImpl01.java
index 257d05fca..5ed3529bf 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/TextRendererImpl01.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/TextRendererImpl01.java
@@ -48,11 +48,11 @@ public class TextRendererImpl01 extends TextRenderer {
     @Override
     protected boolean initShaderProgram(GL2ES2 gl){
         final ShaderState st = rs.getShaderState();
-        
+
         ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, 1, TextRendererImpl01.class,
-                "shader", "shader/bin", "curverenderer01");
+                "shader", "shader/bin", getVertexShaderName(gl));
         ShaderCode rsFp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, 1, TextRendererImpl01.class,
-                "shader", "shader/bin", "curverenderer01");
+                "shader", "shader/bin", getFragmentShaderName(gl));
         
         ShaderProgram sp = new ShaderProgram();
         sp.add(rsVp);
@@ -75,12 +75,12 @@ public class TextRendererImpl01 extends TextRenderer {
     }
     
     @Override
-    protected void disposeImpl(GL2ES2 gl) {
-        super.disposeImpl(gl);
+    protected void destroyImpl(GL2ES2 gl) {
+        super.destroyImpl(gl);
     }
     
     @Override
-    public void renderString3D(GL2ES2 gl, Font font, String str, float[] position, int fontSize, int texSize) {
+    public void drawString3D(GL2ES2 gl, Font font, String str, float[] position, int fontSize, int texSize) {
         if(!isInitialized()){
             throw new GLException("TextRendererImpl01: not initialized!");
         }