- Fixed rootrel.build usage, this works properly through gluegen, jogl-demos and this build.

  You can say -Drootrel.build=build-x86_64 for example.

- Fixed jogl-demos in regard to this changeset

- Gluegen
    - Fixed gluegen BuildComposablePipeline's 'getGL*' methods.
      Now they return 'this', otherwise the pipeline would be broken/removed.

    - Add BuildComposablePipeline CustomPipeline, which allows customized
      class composition with an interface (to be wrapped),
      prolog class and the downstream class.

    - Add GlueGen (incl. ant task) 'outputRootDir' to be able to set a
      top output root dir via ant / commandline.

- GL fixed function
    - Package 'javax.media.opengl.sub.fixed.*' defines some fixed function interfaces.
      This allows partitioning of custom implementation.

    - Using gluegen's new CustomPipeline to compose a GLFixedFuncIf implementation,
      using a GL downstream and a GLFixedFuncHookIf prolog.
      The latter implements the fixed functionality.
      Example is the GLFixedFuncImpl.
        gl.getContext().setGL( new GLFixedFuncImpl(gl, new FixedFuncHook(gl.getGL2ES2())) ) ;
      or
        gl.getContext().setGL( new GLFixedFuncImpl(gl, gl.getGL2ES1()) ) ;

   -  The example GLFixedFuncHookIf impl FixedFuncPipeline/
      can be instantiated with custom shader code.


- ES2 and all other interfaces only contain the original functionality,
  besides minor convenient data access methods.

- Fix: GL2ES2 createCompileShader() and createLoadShader() is moved to ShaderCode util class.

- Updated PMVMatrix

- Add: GLAutoDrawable.setContext() .. and all it's implementations
  Necessary to set a new GLContext.

- Add: GLContext getAttachedObject(int) and putAttachedObject(int, Object),
  to allow the user to attach application specific and TLS sensitive objects to the GLContext.


-


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

1 files changed, 9 insertions, 8 deletions

diff --git a/src/classes/javax/media/opengl/GLProfile.java b/src/classes/javax/media/opengl/GLProfile.java
index 0d1c73d07..a6a51862a 100644
--- a/src/classes/javax/media/opengl/GLProfile.java
+++ b/src/classes/javax/media/opengl/GLProfile.java
@@ -36,6 +36,7 @@
 
 package javax.media.opengl;
 
+import javax.media.opengl.sub.fixed.*;
 import java.lang.reflect.*;
 import java.security.*;
 import com.sun.opengl.impl.*;
@@ -299,8 +300,8 @@ public class GLProfile {
             return false;
         }
         switch(index) {
-            case GL.GL_VERTEX_ARRAY:
-            case GL.GL_TEXTURE_COORD_ARRAY:
+            case GLPointerIf.GL_VERTEX_ARRAY:
+            case GLPointerIf.GL_TEXTURE_COORD_ARRAY:
                 switch(type) {
                     case GL.GL_BYTE:
                     case GL.GL_SHORT:
@@ -326,7 +327,7 @@ public class GLProfile {
                         return false;
                 }
                 break;
-            case GL.GL_NORMAL_ARRAY:
+            case GLPointerIf.GL_NORMAL_ARRAY:
                 switch(type) {
                     case GL.GL_BYTE:
                     case GL.GL_SHORT:
@@ -350,7 +351,7 @@ public class GLProfile {
                         return false;
                 }
                 break;
-            case GL.GL_COLOR_ARRAY:
+            case GLPointerIf.GL_COLOR_ARRAY:
                 switch(type) {
                     case GL.GL_UNSIGNED_BYTE:
                     case GL.GL_FIXED:
@@ -437,7 +438,7 @@ public class GLProfile {
             }
         } else {
             switch(index) {
-                case GL.GL_VERTEX_ARRAY:
+                case GLPointerIf.GL_VERTEX_ARRAY:
                     switch(type) {
                         case GL.GL_SHORT:
                         case GL.GL_FLOAT:
@@ -463,7 +464,7 @@ public class GLProfile {
                             return false;
                     }
                     break;
-                case GL.GL_NORMAL_ARRAY:
+                case GLPointerIf.GL_NORMAL_ARRAY:
                     switch(type) {
                         case GL.GL_BYTE:
                         case GL.GL_SHORT:
@@ -488,7 +489,7 @@ public class GLProfile {
                             return false;
                     }
                     break;
-                case GL.GL_COLOR_ARRAY:
+                case GLPointerIf.GL_COLOR_ARRAY:
                     switch(type) {
                         case GL.GL_UNSIGNED_BYTE:
                         case GL.GL_BYTE:
@@ -517,7 +518,7 @@ public class GLProfile {
                             return false;
                     }
                     break;
-                case GL.GL_TEXTURE_COORD_ARRAY:
+                case GLPointerIf.GL_TEXTURE_COORD_ARRAY:
                     switch(type) {
                         case GL.GL_SHORT:
                         case GL.GL_FLOAT: