Working:

    APX 2500
        ES 2.0 + FixedFunction GLSL
        ES 1.0

+++

javax.media.opengl.glsl
    - Shader and program state management
    - Loading and merging shader source code
    - Loading binaries incl. auto selection
      of the binary file in respect to the supported binary format.
      I.e. in case of GLES2.GL_NVIDIA_PLATFORM_BINARY_NV:
        source: com/sun/opengl/impl/glsl/fixed/shader/ashader.fp
        binary: com/sun/opengl/impl/glsl/fixed/shader/bin/nvidia/ashader.bfp

      ShaderCode sc = ShaderCode.create( gl, gl.GL_VERTEX_SHADER, 1, FixedFuncPipeline.class,
                                         "shader", "shader/bin", "ashader");

      (Derivation of com.sun.javafx.graphics.gl2es2.ShaderUtil)

javax.media.opengl.sdk.glsl
    CompileShaderNVidia implements abstract CompileShader
      Toolkit to convert JOGL shader source to binaries,
      according to the location rule as described in ShaderCode.

    Example: Converts all fixed function shader to binaries.
      jogl/src/classes/com/sun/opengl/impl/glsl/fixed/shader/scripts/nvidia-apx/glslc-ff.bat

    (Generalization of com.sun.javafx.graphics.gl2es2.PrecompileNVShader)

+++

Fixed function now resides in 'jogl.fixed.jar'
    - contains shader source and binaries
    - contains the implementation

GL2ES2:
    - removed glShaderBinaryOrSource()
    - use glCreateLoadShader() for binary and
          glCreateCompileShader() for source
    - using addition glGetError() check for shader upload/compilation
    - Skipping 'glValidateProgram' in case of ES2 and no compiler,
      since it fails on APX2500 ..
    - added: (caching the results)
        "public Set glGetShaderBinaryFormats()"
        "public boolean glShaderCompilerAvailable()"
    - shader-name and binary-data buffer: use 'remaining()'
      instead of 'limit()'

BufferUtil:
    - adding variant: <Type>Buffer new<Type>Buffer(<type>[] values, int offset, int len)

+++

Working on all profiles ES1 + ES2 (CVM) with lighting:
    demo.es1.cube.Cube
    demo.es1.cube.CubeImmModeSink
    demo.es1.cubefbo.Main
    javabullet.demos.genericjoint.GenericJointDemo


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

1 files changed, 27 insertions, 10 deletions

diff --git a/make/build.xml b/make/build.xml
index 0a6022cd7..27b1485c9 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -159,7 +159,13 @@
                   value="com/sun/opengl/impl/glu/gl2/**, com/sun/opengl/impl/glu/nurbs/**, com/sun/opengl/impl/glu/registry/**, javax/media/opengl/glu/gl2/**"/>
 
         <property name="java.part.glsl"
-                  value="javax/media/opengl/**/glsl/**, com/sun/opengl/**/glsl/**"/>
+                  value="javax/media/opengl/glsl/**, com/sun/opengl/impl/glsl/**"/>
+
+        <property name="java.part.sdk"
+                  value="javax/media/opengl/sdk/**"/>
+
+        <property name="java.part.glsl.fixed"
+                  value="com/sun/opengl/impl/glsl/fixed/**"/>
 
         <property name="java.part.gl2es12.x11"
                   value="com/sun/opengl/impl/gl2es12/**, com/sun/opengl/impl/x11/glx/*, com/sun/opengl/impl/x11/*"/>
@@ -445,12 +451,14 @@
         <property name="jogl.gl2.win.jar" value="${build}/jogl.gl2.win.jar" />
         <property name="jogl.gl2.osx.jar" value="${build}/jogl.gl2.osx.jar" />
         <property name="jogl.gl2.dbg.jar" value="${build}/jogl.gl2.dbg.jar" />
+        <property name="jogl.fixed.jar" value="${build}/jogl.fixed.jar" />
         <property name="jogl.awt.jar" value="${build}/jogl.awt.jar" />
         <property name="newt.jar" value="${build}/newt.jar" />
         <property name="newt.awt.jar" value="${build}/newt.awt.jar" />
         <property name="jogl.util.jar" value="${build}/jogl.util.jar" />
         <property name="jogl.util.gl2.jar" value="${build}/jogl.util.gl2.jar" />
         <property name="jogl.util.awt.jar" value="${build}/jogl.util.awt.jar" />
+        <property name="jogl.sdk.jar" value="${build}/jogl.sdk.jar" />
         <property name="jogl.all.jar" value="${build}/jogl.all.jar" />
 
         <!-- The javadoc dirs. -->
@@ -1557,13 +1565,13 @@
 
         <copy todir="${classes}">
             <fileset dir="${src.java}"
-                     includes="com/sun/opengl/impl/glsl/source/**, com/sun/opengl/impl/glsl/binary_nvidia/**" />
+                     includes="com/sun/opengl/impl/glsl/fixed/shader/**" />
         </copy>
 
         <jar manifest="tempversion" destfile="${jogl.core.jar}">
             <fileset dir="${classes}"
                      includes="javax/media/opengl/**, com/sun/gluegen/runtime/**, com/sun/opengl/**"
-                     excludes="${java.excludes.fixme} ${java.part.egl}, ${java.part.glsl}, ${java.part.gl2es12.x11}, ${java.part.gl2es12.win}, ${java.part.gl2es12.osx}, ${java.part.gl2es12.dbg}, ${java.part.gl2.x11}, ${java.part.gl2.win}, ${java.part.gl2.osx}, ${java.part.gl2.dbg}, ${java.part.es1}, ${java.part.es1.dbg}, ${java.part.es2}, ${java.part.es2.dbg}, ${java.part.awt}, ${java.part.glutess}, ${java.part.glumipmap}, ${java.part.glugl2}, ${java.part.util} ${java.part.util.awt} ${java.part.util.gl2}, ${java.part.newt}, ${java.part.newt.awt}"/>
+                     excludes="${java.excludes.fixme} ${java.part.egl}, ${java.part.sdk}, ${java.part.glsl}, ${java.part.glsl.fixed}, ${java.part.gl2es12.x11}, ${java.part.gl2es12.win}, ${java.part.gl2es12.osx}, ${java.part.gl2es12.dbg}, ${java.part.gl2.x11}, ${java.part.gl2.win}, ${java.part.gl2.osx}, ${java.part.gl2.dbg}, ${java.part.es1}, ${java.part.es1.dbg}, ${java.part.es2}, ${java.part.es2.dbg}, ${java.part.awt}, ${java.part.glutess}, ${java.part.glumipmap}, ${java.part.glugl2}, ${java.part.util} ${java.part.util.awt} ${java.part.util.gl2}, ${java.part.newt}, ${java.part.newt.awt}"/>
         </jar>
         <jar manifest="tempversion" destfile="${jogl.gles1.jar}">
             <fileset dir="${classes}"
@@ -1577,7 +1585,7 @@
         <jar manifest="tempversion" destfile="${jogl.gles2.jar}">
             <fileset dir="${classes}"
                      includes="${java.part.es2}, ${java.part.glsl}"
-                     excludes="${java.part.es2.dbg}"/>
+                     excludes="${java.part.es2.dbg}, ${java.part.glsl.fixed}"/>
         </jar>
         <jar manifest="tempversion" destfile="${jogl.gles2.dbg.jar}">
             <fileset dir="${classes}"
@@ -1591,17 +1599,17 @@
         <jar manifest="tempversion" destfile="${jogl.gl2es12.x11.jar}">
             <fileset dir="${classes}"
                      includes="${java.part.gl2es12.x11}, ${java.part.glsl}"
-                     excludes="${java.part.gl2es12.dbg}, ${java.part.glugl2}"/>
+                     excludes="${java.part.gl2es12.dbg}, ${java.part.glugl2}, ${java.part.glsl.fixed}"/>
         </jar>
         <jar manifest="tempversion" destfile="${jogl.gl2es12.win.jar}">
             <fileset dir="${classes}"
                      includes="${java.part.gl2es12.win}, ${java.part.glsl}"
-                     excludes="${java.part.gl2es12.dbg}, ${java.part.glugl2}"/>
+                     excludes="${java.part.gl2es12.dbg}, ${java.part.glugl2}, ${java.part.glsl.fixed}"/>
         </jar>
         <jar manifest="tempversion" destfile="${jogl.gl2es12.osx.jar}">
             <fileset dir="${classes}"
                      includes="${java.part.gl2es12.osx}, ${java.part.glsl}"
-                     excludes="${java.part.gl2es12.dbg}, ${java.part.glugl2}"/>
+                     excludes="${java.part.gl2es12.dbg}, ${java.part.glugl2}, ${java.part.glsl.fixed}"/>
         </jar>
         <jar manifest="tempversion" destfile="${jogl.gl2es12.dbg.jar}">
             <fileset dir="${classes}"
@@ -1610,22 +1618,31 @@
         <jar manifest="tempversion" destfile="${jogl.gl2.x11.jar}">
             <fileset dir="${classes}"
                      includes="${java.part.gl2.x11}, ${java.part.glsl}"
-                     excludes="${java.part.gl2.dbg}, ${java.part.glugl2}"/>
+                     excludes="${java.part.gl2.dbg}, ${java.part.glugl2}, ${java.part.glsl.fixed}"/>
         </jar>
         <jar manifest="tempversion" destfile="${jogl.gl2.win.jar}">
             <fileset dir="${classes}"
                      includes="${java.part.gl2.win}, ${java.part.glsl}"
-                     excludes="${java.part.gl2.dbg}, ${java.part.glugl2}"/>
+                     excludes="${java.part.gl2.dbg}, ${java.part.glugl2}, ${java.part.glsl.fixed}"/>
         </jar>
         <jar manifest="tempversion" destfile="${jogl.gl2.osx.jar}">
             <fileset dir="${classes}"
                      includes="${java.part.gl2.osx}, ${java.part.glsl}"
-                     excludes="${java.part.gl2.dbg}, ${java.part.glugl2}"/>
+                     excludes="${java.part.gl2.dbg}, ${java.part.glugl2}, ${java.part.glsl.fixed}"/>
         </jar>
         <jar manifest="tempversion" destfile="${jogl.gl2.dbg.jar}">
             <fileset dir="${classes}"
                      includes="${java.part.gl2.dbg}"/>
         </jar>
+        <jar manifest="tempversion" destfile="${jogl.fixed.jar}">
+            <fileset dir="${classes}"
+                     includes="${java.part.glsl.fixed}"
+                     excludes="com/sun/opengl/impl/glsl/fixed/shader/scripts/**"/>
+        </jar>
+        <jar manifest="tempversion" destfile="${jogl.sdk.jar}">
+            <fileset dir="${classes}"
+                     includes="${java.part.sdk}"/>
+        </jar>
         <jar manifest="tempversion" destfile="${jogl.glutess.jar}">
             <fileset dir="${classes}"
                      includes="${java.part.glutess}"/>