Fixed Windows port after changes to GlueGen to include array offsets.

Ported all demos to new API. Temporarily added back in GLU entry
points taking primitive arrays as the underlying APIs (in particular,
glTexImage2D) do not yet support non-direct Buffers. Changed C code
generation to only add in array offset if array is non-null. Fixed bug
in GLU tesselator demo's vertex callback.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/branches/JSR-231@99 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4

1 files changed, 5 insertions, 5 deletions

diff --git a/src/demos/hdr/ARBFPPipeline.java b/src/demos/hdr/ARBFPPipeline.java
index e13b9f7..d7a13be 100755
--- a/src/demos/hdr/ARBFPPipeline.java
+++ b/src/demos/hdr/ARBFPPipeline.java
@@ -46,12 +46,12 @@ public class ARBFPPipeline implements Pipeline {
   private int loadProgram(GL gl, String fileName, int profile) throws IOException {
     String programBuffer = FileUtils.loadStreamIntoString(getClass().getClassLoader().getResourceAsStream(fileName));
     int[] tmpInt = new int[1];
-    gl.glGenProgramsARB(1, tmpInt);
+    gl.glGenProgramsARB(1, tmpInt, 0);
     int res = tmpInt[0];
     gl.glBindProgramARB(profile, res);
     gl.glProgramStringARB(profile, GL.GL_PROGRAM_FORMAT_ASCII_ARB, programBuffer.length(), programBuffer);
     int[] errPos = new int[1];
-    gl.glGetIntegerv(GL.GL_PROGRAM_ERROR_POSITION_ARB, errPos);
+    gl.glGetIntegerv(GL.GL_PROGRAM_ERROR_POSITION_ARB, errPos, 0);
     if (errPos[0] >= 0) {
       String kind = "Program";
       if (profile == GL.GL_VERTEX_PROGRAM_ARB) {
@@ -78,7 +78,7 @@ public class ARBFPPipeline implements Pipeline {
         int[] isNative = new int[1];
         gl.glGetProgramivARB(GL.GL_FRAGMENT_PROGRAM_ARB,
                              GL.GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB,
-                             isNative);
+                             isNative, 0);
         if (isNative[0] != 1) {
           System.out.println("WARNING: fragment program is over native resource limits");
           Thread.dumpStack();
@@ -146,8 +146,8 @@ public class ARBFPPipeline implements Pipeline {
     float[] mvp        = new float[16];
 
     // Get matrices
-    gl.glGetFloatv(GL.GL_PROJECTION_MATRIX, projection);
-    gl.glGetFloatv(GL.GL_MODELVIEW_MATRIX, modelView);
+    gl.glGetFloatv(GL.GL_PROJECTION_MATRIX, projection, 0);
+    gl.glGetFloatv(GL.GL_MODELVIEW_MATRIX, modelView, 0);
     // Multiply together
     for (int i = 0; i < 4; i++) {
       for (int j = 0; j < 4; j++) {