Tested:

    - Linux / X11 / GL3 / GL2 / ES1 / ES2
    - Using etc/profile.jogl JOGL_ALL 
        . ./setenv-jogl.x86.sh JOGL_ALL
    - Java2D/GLJPanel: demos.jrefract.JRefract
    - GLCanvas: demos.gears.Gears
    - Newt/Nativewindow (demos.GLInfo, demos.es2.RedSquare, demos.es2.RedSquare)
        - with multiple instances of different GL profiles, ie
            java demos.es1.RedSquare -GLES2 -GLES1
            java demos.GLInfo -GLES2 -GL2
    - GL 3.1 test  with demos.GLInfo
            java demos.GLInfo -GL3
            java demos.GLInfo -GL3 -GL2
      with NVIDIA 180.37.05

JOGL
    Enable parallel GLProfiles:
        - GL holds it's GLProfile

        - GL / GLBase added:
            hasGLSL()
            getGLProfile()

        - Removed all hardcoded GLProfile checks

        - Make GLProfile an instance of GLCapabilities

        - GLCapabilities needs GLProfile in constructor,
          or null for the default GLProfile

        - All GLProfiles are singelton mapped objects, 
          setup and verified at static init.

        - All GLDrawableFactories in GLDrawableFactory are singelton objects, 
          setup at static init.

        - GLDrawableFactories.getFactory() needs an argument,
          which leads to GLProfile, ie
          NativeWindow, AbstractGraphicsConfiguration, GLCapabilities or GLProfile.

        - EGLDrawableFactory takes GLProfile as an argument,
          being able to take the singleton role as ES1 or ES2

        - EGLDrawableFactory loads ES & EGL libraries _local_,
          otherwise the symbols produce a collision (Unix/PC-Emulation).
          TODO: Check on Windows/WinCE !

        - Fixing etc/profile.jogl JOGL_ALL

    EGLGraphicsConfigurationFactory
        - Added eglGetConfigs -> GLCapabilities -> eglChooseConfig,
          in case the simple eglChooseConfig fails.

        - Using given chooser, is null, use DefaultGLCapabilitiesChooser

    Moved FixedFuncUtil.class -> jogl.util.jar,
          otherwise the FixedFuncUtil pipeline cannot be used without emulation.

    GLDrawable
        Rename getChosenGLCapabilities() -> getGLCapabilities(),
               since all GLCapabilities access functions return the current state.
        Add getGLProfile()

    NativeLibLoader[Base]
        Added 'addLoaded' and 'isLoaded', so all LoadAction implementation
        can use it and circumvent double library loading.

    GlueGen
        Split openLibrary -> openLibraryLocal / Global,
              utilizing as an optional flag (global), which is true per default.
        TODO: How to do this on Windows ?
            
    TODO: Verify Windows and MacOSX !!



git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1922 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 6 insertions, 1 deletions

diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles2.java b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
index 77d2256b6..c68fcd0ce 100755
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
@@ -2,9 +2,10 @@
 // query Vertex Buffer Object state
 private boolean inBeginEndPair;
 
-public GLES2Impl(GLContextImpl context) {
+public GLES2Impl(GLProfile glp, GLContextImpl context) {
   this._context = context; 
   this.bufferSizeTracker = context.getBufferSizeTracker();
+  this.glProfile = glp;
 }
 
 public final boolean isGL() {
@@ -39,6 +40,10 @@ public final boolean isGL2ES2() {
     return true;
 }
 
+public final boolean hasGLSL() {
+    return true;
+}
+
 public final GL getGL() throws GLException {
     return this;
 }