diff options
Diffstat (limited to 'src/jogl/classes/com/sun/opengl/util')
4 files changed, 11 insertions, 11 deletions
diff --git a/src/jogl/classes/com/sun/opengl/util/GLArrayDataClient.java b/src/jogl/classes/com/sun/opengl/util/GLArrayDataClient.java index 8bfd60834..7037da97d 100644 --- a/src/jogl/classes/com/sun/opengl/util/GLArrayDataClient.java +++ b/src/jogl/classes/com/sun/opengl/util/GLArrayDataClient.java @@ -63,8 +63,8 @@ public class GLArrayDataClient extends GLArrayDataWrapper implements GLArrayData int initialSize) throws GLException { - if(!GLProfile.isGL2ES2()) { - throw new GLException("GLArrayDataServer not supported for profile: "+GLProfile.getProfile()); + if(!GLProfile.hasGLSL()) { + throw new GLException("GLArrayDataClient.GLSL not supported for profile: "+GLProfile.getProfile()); } GLProfile.isValidArrayDataType(-1, comps, dataType, true, true); @@ -78,8 +78,8 @@ public class GLArrayDataClient extends GLArrayDataWrapper implements GLArrayData int stride, Buffer buffer) throws GLException { - if(!GLProfile.isGL2ES2()) { - throw new GLException("GLArrayDataServer not supported for profile: "+GLProfile.getProfile()); + if(!GLProfile.hasGLSL()) { + throw new GLException("GLArrayDataClient.GLSL not supported for profile: "+GLProfile.getProfile()); } GLProfile.isValidArrayDataType(-1, comps, dataType, true, true); diff --git a/src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java b/src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java index caf6efe12..5c3fc39f0 100644 --- a/src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java +++ b/src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java @@ -78,8 +78,8 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE int initialSize, int vboBufferUsage) throws GLException { - if(!GLProfile.isGL2ES2()) { - throw new GLException("GLArrayDataServer not supported for profile: "+GLProfile.getProfile()); + if(!GLProfile.hasGLSL()) { + throw new GLException("GLArrayDataServer.GLSL not supported for profile: "+GLProfile.getProfile()); } GLProfile.isValidArrayDataType(-1, comps, dataType, true, true); @@ -100,8 +100,8 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE int stride, Buffer buffer, int vboBufferUsage) throws GLException { - if(!GLProfile.isGL2ES2()) { - throw new GLException("GLArrayDataServer not supported for profile: "+GLProfile.getProfile()); + if(!GLProfile.hasGLSL()) { + throw new GLException("GLArrayDataServer.GLSL not supported for profile: "+GLProfile.getProfile()); } GLProfile.isValidArrayDataType(-1, comps, dataType, true, true); diff --git a/src/jogl/classes/com/sun/opengl/util/GLArrayDataWrapper.java b/src/jogl/classes/com/sun/opengl/util/GLArrayDataWrapper.java index a36ebc60a..04009595e 100644 --- a/src/jogl/classes/com/sun/opengl/util/GLArrayDataWrapper.java +++ b/src/jogl/classes/com/sun/opengl/util/GLArrayDataWrapper.java @@ -26,8 +26,8 @@ public class GLArrayDataWrapper implements GLArrayData { int vboName, long bufferOffset) throws GLException { - if(!GLProfile.isGL2ES2()) { - throw new GLException("GLArrayDataServer not supported for profile: "+GLProfile.getProfile()); + if(!GLProfile.hasGLSL()) { + throw new GLException("GLArrayDataWrapper.GLSL not supported for profile: "+GLProfile.getProfile()); } GLProfile.isValidArrayDataType(-1, comps, dataType, true, true); diff --git a/src/jogl/classes/com/sun/opengl/util/ImmModeSink.java b/src/jogl/classes/com/sun/opengl/util/ImmModeSink.java index 90ea9ce7c..ad4e58129 100644 --- a/src/jogl/classes/com/sun/opengl/util/ImmModeSink.java +++ b/src/jogl/classes/com/sun/opengl/util/ImmModeSink.java @@ -258,7 +258,7 @@ public class ImmModeSink { int cComps, int cDataType, int nComps, int nDataType, int tComps, int tDataType, boolean useGLSL) { - if(useGLSL && !GLProfile.isGL2ES2()) { + if(useGLSL && !GLProfile.hasGLSL()) { throw new GLException("ImmModeSink GLSL usage not supported for profile: "+GLProfile.getProfile()); } vboSet = new VBOSet(glBufferUsage, initialSize, |