diff options
| -rw-r--r-- | make/build.xml | 10 | ||||
| -rw-r--r-- | make/make.jogl.cdcfp.linux-x86.sh | 4 | ||||
| -rw-r--r-- | src/classes/javax/media/opengl/util/ImmModeSink.java | 11 |
3 files changed, 22 insertions, 3 deletions
diff --git a/make/build.xml b/make/build.xml index 27b1485c9..ac154ba0c 100644 --- a/make/build.xml +++ b/make/build.xml @@ -332,6 +332,10 @@ - validate to ensure that all user-define variables are set. --> <property name="validate.user.properties" value="${make}/validate-properties.xml" /> + <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally --> + <property name="javacdebug" value="true" /> + <property name="javacdebuglevel" value="source,lines" /> + <!-- GlueGen properties. --> <!-- NOTE that these require a checked-out GlueGen workspace as a --> <!-- sibling of the JOGL workspace. --> @@ -1022,7 +1026,7 @@ includes="javax/media/opengl/GLDrawableFactory.java javax/media/opengl/GLDrawable.java javax/media/opengl/GLContext.java javax/media/opengl/GL.java javax/media/opengl/GL2ES1.java javax/media/opengl/GL2ES2.java javax/media/opengl/GL2.java javax/media/opengl/GLES1.java javax/media/opengl/GLES2.java" fork="yes" memoryMaximumSize="128m" - source="1.4" debug="true" debuglevel="source,lines"> + source="1.4" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src.java}" /> <src path="${src.generated.java}" /> </javac> @@ -1037,7 +1041,7 @@ bootclasspath="${javac.bootclasspath.jar}" fork="yes" memoryMaximumSize="128m" - debug="true" debuglevel="source,lines"> + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src.java}" /> <src path="${src.generated.java}" /> </javac> @@ -1051,7 +1055,7 @@ classpath="${gluegen-rt.jar}" fork="yes" memoryMaximumSize="128m" - debug="true" debuglevel="source,lines"> + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src.java}" /> <src path="${src.generated.java}" /> </javac> diff --git a/make/make.jogl.cdcfp.linux-x86.sh b/make/make.jogl.cdcfp.linux-x86.sh index e8caa4b57..3c87aa004 100644 --- a/make/make.jogl.cdcfp.linux-x86.sh +++ b/make/make.jogl.cdcfp.linux-x86.sh @@ -3,8 +3,12 @@ . ../../setenv-build-jogl.sh # -Dc.compiler.debug=true +# -Djavacdebug="false" +# -Djavacdebuglevel="" ant -v \ + -Djavacdebug="false" \ + -Djavacdebuglevel="none" \ -Djogl.cdcfp=true \ -Dgluegen.cpptasks.detected.os=true \ -DisUnix=true \ diff --git a/src/classes/javax/media/opengl/util/ImmModeSink.java b/src/classes/javax/media/opengl/util/ImmModeSink.java index b2c2c8f2c..df74db5cc 100644 --- a/src/classes/javax/media/opengl/util/ImmModeSink.java +++ b/src/classes/javax/media/opengl/util/ImmModeSink.java @@ -46,6 +46,10 @@ public class ImmModeSink { vComps, vDataType, cComps, cDataType, nComps, nDataType, tComps, tDataType, true); } + public static boolean usesVBO() { return vboUsage; } + + public static void setVBOUsage(boolean v) { vboUsage = v; } + public void destroy(GL gl) { destroyList(gl); @@ -268,6 +272,7 @@ public class ImmModeSink { private VBOSet vboSet; private ArrayList vboSetList; + private static boolean vboUsage = true; protected static class VBOSet { protected VBOSet (int glBufferUsage, int initialSize, @@ -298,6 +303,12 @@ public class ImmModeSink { this.normalVBO = GLArrayDataServer.createGLSL(GLContext.mgl_Normal, nComps, nDataType, false, initialSize, glBufferUsage); this.texcoordVBO = GLArrayDataServer.createGLSL(GLContext.mgl_MultiTexCoord, tComps, tDataType, false, initialSize, glBufferUsage); } + if(!vboUsage) { + this.vertexVBO.setVBOUsage(vboUsage); + this.colorVBO.setVBOUsage(vboUsage); + this.normalVBO.setVBOUsage(vboUsage); + this.texcoordVBO.setVBOUsage(vboUsage); + } this.sealed=false; this.mode = -1; |