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, 6 insertions, 6 deletions

diff --git a/src/demos/vertexProgRefract/VertexProgRefract.java b/src/demos/vertexProgRefract/VertexProgRefract.java
index e9c6905..6e5a85d 100644
--- a/src/demos/vertexProgRefract/VertexProgRefract.java
+++ b/src/demos/vertexProgRefract/VertexProgRefract.java
@@ -260,7 +260,7 @@ public class VertexProgRefract {
       b[' '] = true; // animate by default
 
       int[] vtxProgTmp = new int[1];
-      gl.glGenProgramsARB(1, vtxProgTmp);
+      gl.glGenProgramsARB(1, vtxProgTmp, 0);
       vtxProg = vtxProgTmp[0];
       gl.glBindProgramARB  (GL.GL_VERTEX_PROGRAM_ARB, vtxProg);
       gl.glProgramStringARB(GL.GL_VERTEX_PROGRAM_ARB, GL.GL_PROGRAM_FORMAT_ASCII_ARB, transformRefract.length(), transformRefract);
@@ -273,7 +273,7 @@ public class VertexProgRefract {
       gl.glProgramEnvParameter4fARB(GL.GL_VERTEX_PROGRAM_ARB, 3, 0.0f, 1.0f, 2.0f, 3.0f);    // misc constants
 
       int[] cubemapTmp = new int[1];
-      gl.glGenTextures(1, cubemapTmp);
+      gl.glGenTextures(1, cubemapTmp, 0);
       cubemap = cubemapTmp[0];
       gl.glBindTexture(GL.GL_TEXTURE_CUBE_MAP_ARB, cubemap);
 
@@ -523,7 +523,7 @@ public class VertexProgRefract {
                                   GL.GL_UNSIGNED_BYTE, data);
           } else {
             gl.glTexImage2D(target, 0, GL.GL_RGB, img.getWidth(), img.getHeight(), 0,
-                            GL.GL_RGB, GL.GL_UNSIGNED_BYTE, data);
+                            GL.GL_RGB, GL.GL_UNSIGNED_BYTE, data, 0);
           }
           break;
         }
@@ -535,7 +535,7 @@ public class VertexProgRefract {
                                   GL.GL_UNSIGNED_BYTE, data);
           } else {
             gl.glTexImage2D(target, 0, GL.GL_RGB, img.getWidth(), img.getHeight(), 0,
-                            GL.GL_RGB, GL.GL_UNSIGNED_BYTE, data);
+                            GL.GL_RGB, GL.GL_UNSIGNED_BYTE, data, 0);
           }
           break;
         }
@@ -585,7 +585,7 @@ public class VertexProgRefract {
 
     private void initFragmentProgram(GL gl) {
       int[] fragProgTmp = new int[1];
-      gl.glGenProgramsARB(1, fragProgTmp);
+      gl.glGenProgramsARB(1, fragProgTmp, 0);
       fragProg = fragProgTmp[0];
       String combineFragProg =
 "!!ARBfp1.0\n" +
@@ -606,7 +606,7 @@ public class VertexProgRefract {
       gl.glProgramStringARB(GL.GL_FRAGMENT_PROGRAM_ARB, GL.GL_PROGRAM_FORMAT_ASCII_ARB,
                             combineFragProg.length(), combineFragProg);
       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) {
         System.out.println("Fragment program failed to load:");
         String errMsg = gl.glGetString(GL.GL_PROGRAM_ERROR_STRING_ARB);