From 9517539e3b43d21017465180376329439bc25f12 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 12 Aug 2008 08:39:08 +0000
Subject: 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
---
 src/classes/javax/media/opengl/util/ImmModeSink.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/classes/javax/media/opengl/util/ImmModeSink.java')

diff --git a/src/classes/javax/media/opengl/util/ImmModeSink.java b/src/classes/javax/media/opengl/util/ImmModeSink.java
index 5de9df99a..b2c2c8f2c 100644
--- a/src/classes/javax/media/opengl/util/ImmModeSink.java
+++ b/src/classes/javax/media/opengl/util/ImmModeSink.java
@@ -34,8 +34,8 @@ public class ImmModeSink {
    * a ShaderState must be current, using ShaderState.glUseProgram().
    *
    * @see #draw(GL, boolean)
-   * @see javax.media.opengl.util.glsl.ShaderState#glUseProgram(GL2ES2, boolean)
-   * @see javax.media.opengl.util.glsl.ShaderState#getCurrent()
+   * @see javax.media.opengl.glsl.ShaderState#glUseProgram(GL2ES2, boolean)
+   * @see javax.media.opengl.glsl.ShaderState#getCurrent()
    */
   public static ImmModeSink createGLSL(int glBufferUsage, int initialSize,
                                        int vComps, int vDataType,
-- 
cgit v1.2.3