1 files changed, 32 insertions, 32 deletions

diff --git a/src/demos/hdr/ARBFPPipeline.java b/src/demos/hdr/ARBFPPipeline.java
index be98982..04ae00b 100755
--- a/src/demos/hdr/ARBFPPipeline.java
+++ b/src/demos/hdr/ARBFPPipeline.java
@@ -21,51 +21,51 @@ public class ARBFPPipeline implements Pipeline {
   }
 
   public void initFloatingPointTexture(GL2 gl, int textureObject, int w, int h) {
-    gl.glBindTexture(GL2.GL_TEXTURE_RECTANGLE, textureObject);
-    gl.glCopyTexImage2D(GL2.GL_TEXTURE_RECTANGLE, 0, textureFormat, 0, 0, w, h, 0);
+    gl.glBindTexture(GL2.GL_TEXTURE_RECTANGLE_ARB, textureObject);
+    gl.glCopyTexImage2D(GL2.GL_TEXTURE_RECTANGLE_ARB, 0, textureFormat, 0, 0, w, h, 0);
   }
 
   public void initTexture(GL2 gl, int textureObject, int w, int h) {
-    gl.glBindTexture(GL2.GL_TEXTURE_RECTANGLE, textureObject);
-    gl.glCopyTexImage2D(GL2.GL_TEXTURE_RECTANGLE, 0, GL2.GL_RGBA, 0, 0, w, h, 0);
+    gl.glBindTexture(GL2.GL_TEXTURE_RECTANGLE_ARB, textureObject);
+    gl.glCopyTexImage2D(GL2.GL_TEXTURE_RECTANGLE_ARB, 0, GL2.GL_RGBA, 0, 0, w, h, 0);
   }
 
   public void copyToTexture(GL2 gl, int textureObject, int w, int h) {
-    gl.glBindTexture(GL2.GL_TEXTURE_RECTANGLE, textureObject);
-    gl.glCopyTexSubImage2D(GL2.GL_TEXTURE_RECTANGLE, 0, 0, 0, 0, 0, w, h);
+    gl.glBindTexture(GL2.GL_TEXTURE_RECTANGLE_ARB, textureObject);
+    gl.glCopyTexSubImage2D(GL2.GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, 0, 0, w, h);
   }
 
   public void bindTexture(GL2 gl, int textureObject) {
-    gl.glBindTexture(GL2.GL_TEXTURE_RECTANGLE, textureObject);
+    gl.glBindTexture(GL2.GL_TEXTURE_RECTANGLE_ARB, textureObject);
   }
 
   private List programs = new ArrayList();
   public int loadVertexProgram(GL2 gl, String filename) throws IOException {
-    return loadProgram(gl, filename, GL2.GL_VERTEX_PROGRAM);
+    return loadProgram(gl, filename, GL2.GL_VERTEX_PROGRAM_ARB);
   }
 
   public int loadFragmentProgram(GL2 gl, String filename) throws IOException {
-    return loadProgram(gl, filename, GL2.GL_FRAGMENT_PROGRAM);
+    return loadProgram(gl, filename, GL2.GL_FRAGMENT_PROGRAM_ARB);
   }
 
   private int loadProgram(GL2 gl, String fileName, int profile) throws IOException {
     String programBuffer = FileUtils.loadStreamIntoString(getClass().getClassLoader().getResourceAsStream(fileName));
     int[] tmpInt = new int[1];
-    gl.glGenPrograms(1, tmpInt, 0);
+    gl.glGenProgramsARB(1, tmpInt, 0);
     int res = tmpInt[0];
-    gl.glBindProgram(profile, res);
-    gl.glProgramString(profile, GL2.GL_PROGRAM_FORMAT_ASCII, programBuffer.length(), programBuffer);
+    gl.glBindProgramARB(profile, res);
+    gl.glProgramStringARB(profile, GL2.GL_PROGRAM_FORMAT_ASCII_ARB, programBuffer.length(), programBuffer);
     int[] errPos = new int[1];
-    gl.glGetIntegerv(GL2.GL_PROGRAM_ERROR_POSITION, errPos, 0);
+    gl.glGetIntegerv(GL2.GL_PROGRAM_ERROR_POSITION_ARB, errPos, 0);
     if (errPos[0] >= 0) {
       String kind = "Program";
-      if (profile == GL2.GL_VERTEX_PROGRAM) {
+      if (profile == GL2.GL_VERTEX_PROGRAM_ARB) {
         kind = "Vertex program";
-      } else if (profile == GL2.GL_FRAGMENT_PROGRAM) {
+      } else if (profile == GL2.GL_FRAGMENT_PROGRAM_ARB) {
         kind = "Fragment program";
       }
       System.out.println(kind + " failed to load:");
-      String errMsg = gl.glGetString(GL2.GL_PROGRAM_ERROR_STRING);
+      String errMsg = gl.glGetString(GL2.GL_PROGRAM_ERROR_STRING_ARB);
       if (errMsg == null) {
         System.out.println("[No error message available]");
       } else {
@@ -79,10 +79,10 @@ public class ARBFPPipeline implements Pipeline {
       System.out.println(programBuffer.substring(errPos[0], endPos));
       throw new GLException("Error loading " + kind);
     } else {
-      if (profile == GL2.GL_FRAGMENT_PROGRAM) {
+      if (profile == GL2.GL_FRAGMENT_PROGRAM_ARB) {
         int[] isNative = new int[1];
-        gl.glGetProgramiv(GL2.GL_FRAGMENT_PROGRAM,
-                             GL2.GL_PROGRAM_UNDER_NATIVE_LIMITS,
+        gl.glGetProgramiv(GL2.GL_FRAGMENT_PROGRAM_ARB,
+                             GL2.GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB,
                              isNative, 0);
         if (isNative[0] != 1) {
           System.out.println("WARNING: fragment program is over native resource limits");
@@ -94,21 +94,21 @@ public class ARBFPPipeline implements Pipeline {
   }
 
   public void enableVertexProgram(GL2 gl, int program) {
-    gl.glBindProgram(GL2.GL_VERTEX_PROGRAM, program);
-    gl.glEnable(GL2.GL_VERTEX_PROGRAM);
+    gl.glBindProgramARB(GL2.GL_VERTEX_PROGRAM_ARB, program);
+    gl.glEnable(GL2.GL_VERTEX_PROGRAM_ARB);
   }
 
   public void enableFragmentProgram(GL2 gl, int program) {
-    gl.glBindProgram(GL2.GL_FRAGMENT_PROGRAM, program);
-    gl.glEnable(GL2.GL_FRAGMENT_PROGRAM);
+    gl.glBindProgramARB(GL2.GL_FRAGMENT_PROGRAM_ARB, program);
+    gl.glEnable(GL2.GL_FRAGMENT_PROGRAM_ARB);
   }
 
   public void disableVertexProgram(GL2 gl) {
-    gl.glDisable(GL2.GL_VERTEX_PROGRAM);
+    gl.glDisable(GL2.GL_VERTEX_PROGRAM_ARB);
   }
 
   public void disableFragmentProgram(GL2 gl) {
-    gl.glDisable(GL2.GL_FRAGMENT_PROGRAM);
+    gl.glDisable(GL2.GL_FRAGMENT_PROGRAM_ARB);
   }
 
   public int getNamedParameter(int program, String name) {
@@ -117,32 +117,32 @@ public class ARBFPPipeline implements Pipeline {
 
   public void setVertexProgramParameter1f(GL2 gl, int param, float val) {
     if (param < 0) return;
-    gl.glProgramLocalParameter4f(GL2.GL_VERTEX_PROGRAM, param, val, 0, 0, 0);
+    gl.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, param, val, 0, 0, 0);
   }
 
   public void setVertexProgramParameter3f(GL2 gl, int param, float x, float y, float z) {
     if (param < 0) return;
-    gl.glProgramLocalParameter4f(GL2.GL_VERTEX_PROGRAM, param, x, y, z, 0);
+    gl.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, param, x, y, z, 0);
   }
 
   public void setVertexProgramParameter4f(GL2 gl, int param, float x, float y, float z, float w) {
     if (param < 0) return;
-    gl.glProgramLocalParameter4f(GL2.GL_VERTEX_PROGRAM, param, x, y, z, w);
+    gl.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, param, x, y, z, w);
   }
 
   public void setFragmentProgramParameter1f(GL2 gl, int param, float val) {
     if (param < 0) return;
-    gl.glProgramLocalParameter4f(GL2.GL_FRAGMENT_PROGRAM, param, val, 0, 0, 0);
+    gl.glProgramLocalParameter4fARB(GL2.GL_FRAGMENT_PROGRAM_ARB, param, val, 0, 0, 0);
   }
 
   public void setFragmentProgramParameter3f(GL2 gl, int param, float x, float y, float z) {
     if (param < 0) return;
-    gl.glProgramLocalParameter4f(GL2.GL_FRAGMENT_PROGRAM, param, x, y, z, 0);
+    gl.glProgramLocalParameter4fARB(GL2.GL_FRAGMENT_PROGRAM_ARB, param, x, y, z, 0);
   }
 
   public void setFragmentProgramParameter4f(GL2 gl, int param, float x, float y, float z, float w) {
     if (param < 0) return;
-    gl.glProgramLocalParameter4f(GL2.GL_FRAGMENT_PROGRAM, param, x, y, z, w);
+    gl.glProgramLocalParameter4fARB(GL2.GL_FRAGMENT_PROGRAM_ARB, param, x, y, z, w);
   }
 
   public void trackModelViewProjectionMatrix(GL2 gl, int param) {
@@ -170,7 +170,7 @@ public class ARBFPPipeline implements Pipeline {
   public void setMatrixParameterfc(GL2 gl, int param, float[] matrix) {
     // Correct for row-major vs. column-major differences
     for (int i = 0; i < 4; i++) {
-      gl.glProgramLocalParameter4f(GL2.GL_VERTEX_PROGRAM, param + i, matrix[i],  matrix[4+i],  matrix[8+i],  matrix[12+i]);
+      gl.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, param + i, matrix[i],  matrix[4+i],  matrix[8+i],  matrix[12+i]);
     }
   }
 }