aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java
diff options
context:
space:
mode:
authorKenneth Russel <kbrussel@alum.mit.edu>2009-03-19 06:39:36 +0000
committerKenneth Russel <kbrussel@alum.mit.edu>2009-03-19 06:39:36 +0000
commit45eac4e00b9b9dd935265c2ab25a61a2cf3cbf63 (patch)
tree3f1b3f3c0bee714b01acccdff54c29b378b0eb45 /src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java
parent0da2cacaab3c6862df6ca05abdbf0a7d9e9e5451 (diff)
Moved remaining portions of fixed function emulation out of core JOGL
public and implementation packages and into com.sun.opengl.util.glsl.fixed.* and other subpackages of com.sun.opengl.util. Renamed javax.media.opengl.sub.GLObject to javax.media.opengl.GLBase. Moved interfaces in javax.media.opengl.sub.fixed to javax.media.opengl.fixedfunc and changed naming convention. Moved all classes in javax.media.opengl.util to com.sun.opengl.util. Moved com.sun.opengl.impl.packrect to com.sun.opengl.util.packrect. Renamed InternalBufferUtils to InternalBufferUtil to match naming convention and copied in needed routines for GLU and other classes. Fixed build breakage when specifying rootrel.build property; reintroduced build-temp directory. Updated demos. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1886 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java')
-rw-r--r--src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java b/src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java
index 59024dec7..caf6efe12 100644
--- a/src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java
+++ b/src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java
@@ -3,8 +3,8 @@ package com.sun.opengl.util;
import javax.media.opengl.*;
import java.nio.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.glsl.*;
+
+import com.sun.opengl.util.glsl.*;
public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataEditable {
@@ -35,7 +35,7 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
int stride, Buffer buffer, int vboBufferUsage)
throws GLException
{
- GLProfile.isValidateArrayDataType(index, comps, dataType, false, true);
+ GLProfile.isValidArrayDataType(index, comps, dataType, false, true);
GLArrayDataServer ads = new GLArrayDataServer();
GLArrayHandler glArrayHandler = new GLFixedArrayHandler(ads);
@@ -59,7 +59,7 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
int initialSize, int vboBufferUsage)
throws GLException
{
- GLProfile.isValidateArrayDataType(index, comps, dataType, false, true);
+ GLProfile.isValidArrayDataType(index, comps, dataType, false, true);
GLArrayDataServer ads = new GLArrayDataServer();
GLArrayHandler glArrayHandler = new GLFixedArrayHandler(ads);
@@ -81,7 +81,7 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
if(!GLProfile.isGL2ES2()) {
throw new GLException("GLArrayDataServer not supported for profile: "+GLProfile.getProfile());
}
- GLProfile.isValidateArrayDataType(-1, comps, dataType, true, true);
+ GLProfile.isValidArrayDataType(-1, comps, dataType, true, true);
GLArrayDataServer ads = new GLArrayDataServer();
GLArrayHandler glArrayHandler = new GLSLArrayHandler(ads);
@@ -103,7 +103,7 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
if(!GLProfile.isGL2ES2()) {
throw new GLException("GLArrayDataServer not supported for profile: "+GLProfile.getProfile());
}
- GLProfile.isValidateArrayDataType(-1, comps, dataType, true, true);
+ GLProfile.isValidArrayDataType(-1, comps, dataType, true, true);
GLArrayDataServer ads = new GLArrayDataServer();
GLArrayHandler glArrayHandler = new GLSLArrayHandler(ads);