aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/build-common.xml8
-rw-r--r--make/build-jogl.xml11
-rw-r--r--make/build-test.xml6
-rw-r--r--make/build.xml3
-rw-r--r--make/config/jogl/cgl-macosx.cfg1
-rw-r--r--make/config/jogl/gl-common.cfg23
-rw-r--r--make/config/jogl/gl-gl4bc.cfg4
-rw-r--r--make/config/jogl/gl-if-CustomJavaCode-gl.java19
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-common.java6
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java2
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java8
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-gles1.java8
-rwxr-xr-xmake/scripts/tests-x64.bat10
-rwxr-xr-xmake/scripts/tests.sh21
-rw-r--r--make/stub_includes/macosx/OpenGL/OpenGL.h3
15 files changed, 111 insertions, 22 deletions
diff --git a/make/build-common.xml b/make/build-common.xml
index 8f8f33d12..c2ddae69a 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -32,6 +32,13 @@
<!--
- Base initialization of properties and detection of operating system.
-->
+ <target name="set.debug">
+ <property name="c.compiler.debug" value="true" />
+ <property name="javacdebug" value="true" />
+ <property name="javacdebuglevel" value="source,lines,vars" />
+ </target>
+ <target name="common.init.debug" depends="set.debug, common.init"/>
+
<target name="common.init" depends="jogamp.env.init, gluegen.cpptasks.detect.os" unless="common.init.done">
<property name="common.init.done" value="true" />
@@ -146,7 +153,6 @@
<!-- 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" />
- <!--property name="javacdebug" value="true" /-->
<!--property name="javacdebuglevel" value="source,lines,vars" /-->
<!-- property name="javac.memorymax" value="128m" /--> <!-- I ran out of memory with these .. linux x86_64 6u14 -->
<property name="javac.memorymax" value="512m" />
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index b708ae0dc..73b61e690 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1217,6 +1217,8 @@
<condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
<patternset id="c.src.files.jogl.desktop">
+ <include name="${rootrel.src.c}/JoglCommon.c"/>
+ <include name="${rootrel.src.c}/GLDebugMessageHandler.c"/>
<include name="${rootrel.src.c}/macosx/MacOSXCustomCGLCode.c" if="isOSX"/>
<include name="${rootrel.src.c}/macosx/MacOSXWindowSystemInterface.m" if="isOSX"/>
<include name="${rootrel.src.c}/macosx/ContextUpdater.m" if="isOSX"/>
@@ -1343,6 +1345,7 @@
</target>
<target name="c.build.jogl.prepare" depends="c.build.jogl.prepare.openMAX">
+ <javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${classes}" class="jogamp.opengl.GLDebugMessageHandler" />
<!-- Generate the waveout Mixer header -->
<!-- FIXME: this is temporary until we move this to another workspace -->
<!--javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${classes}" class="com.jogamp.audio.windows.waveout.Mixer" /-->
@@ -1396,7 +1399,7 @@
<!--
- Build the jogl.jar files.
-->
- <target name="build-jars-dependset" depends="gluegen.cpptasks.detect.os,build-jars-javase" >
+ <target name="build-jars-dependset" depends="init,gluegen.cpptasks.detect.os" >
<dependset>
<srcfileset dir="${src.java}"
includes="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/>
@@ -1404,7 +1407,7 @@
includes="${jogl.all.jar} ${jogl.all-noawt.jar} ${jogl.util.jar} ${jogl.util.fixedfuncemu.jar}" />
</dependset>
</target>
- <target name="build-jars" depends="build-jars-dependset" />
+ <target name="build-jars" depends="build-jars-dependset,build-jars-javase" />
<target name="setup-manifestfile" depends="common.init">
<property name="manifestfile" value="joglversion"/>
@@ -1490,6 +1493,10 @@
<fileset dir="${src.java}"
includes="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/>
</jar>
+ <copy todir="${classes}">
+ <fileset dir="${src.java}"
+ includes="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/>
+ </copy>
</target>
<target name="build-jars-all-noawt-javase" depends="setup-manifestfile">
<jar manifest="${build.jogl}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true">
diff --git a/make/build-test.xml b/make/build-test.xml
index b6c728870..18b131594 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -33,6 +33,8 @@
<condition property="jvmarg.headless" value="-Djava.awt.headless=true"><not><isset property="isOSX"/></not></condition>
<property name="batchtest.timeout" value="1800000"/> <!-- 30 min -->
+
+ <property name="java.part.test.shadercode" value="com/jogamp/opengl/test/junit/jogl/demos/es2/shader/*"/>
</target>
<!-- ================================================================== -->
@@ -97,7 +99,11 @@
<fileset dir="${src.test}">
<exclude name="**/*.java"/>
</fileset>
+ <fileset dir="${src.test}" includes="${java.part.test.shadercode}"/>
</jar>
+ <copy todir="${classes}">
+ <fileset dir="${src.test}" includes="${java.part.test.shadercode}"/>
+ </copy>
</target>
<target name="test.manual.run" depends="test.compile">
diff --git a/make/build.xml b/make/build.xml
index 3757924dd..6dc856367 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -12,7 +12,7 @@
<target name="all.but-archives" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,test.compile,one.dir,tag.build" />
- <target name="all.ide" description="Build nativewindow, jogl and newt projects, including all junit tests, but don't copy libs or JARs or tag the build" depends="init,build.nativewindow,build.jogl,build.newt,test.compile,one.dir" />
+ <target name="all.ide" description="Debug IDE build nativewindow, jogl and newt projects, including all junit tests, but don't tag the build or create archives" depends="init.debug,build.nativewindow,build.jogl,build.newt,test.compile,one.dir" />
<target name="test.compile">
<ant antfile="build-test.xml" target="test.compile" inheritRefs="true" inheritAll="true"/>
@@ -61,6 +61,7 @@
-->
<target name="init" depends="common.init" />
+ <target name="init.debug" depends="common.init.debug" />
<target name="build.nativewindow" depends="init">
<ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make}" target="all" inheritRefs="true" inheritAll="true"/>
diff --git a/make/config/jogl/cgl-macosx.cfg b/make/config/jogl/cgl-macosx.cfg
index 38034a7ad..06bc94626 100644
--- a/make/config/jogl/cgl-macosx.cfg
+++ b/make/config/jogl/cgl-macosx.cfg
@@ -16,6 +16,7 @@ Opaque long void *
# Opaque directives for low-level CGL binding (for Java2D/JOGL bridge)
Opaque long CGLContextObj
+Opaque long CGLShareGroupObj
Opaque long CGLPBufferObj
Opaque long CGLPixelFormatObj
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index 2c59a74ed..2faef6f0c 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -434,7 +434,7 @@ ArgumentIsString glGetUniformIndices 2
ArgumentIsString glGetUniformBlockIndex 1
ArgumentIsString glTransformFeedbackVaryings 2
-# String output values:
+# String return values must use byte[] etc ..
# ArgumentIsString glGetActiveAttrib 6
# ArgumentIsString glGetActiveUniformBlockName 4
# ArgumentIsString glGetActiveUniformName 4
@@ -443,6 +443,27 @@ ArgumentIsString glTransformFeedbackVaryings 2
# ArgumentIsString glGetShaderInfoLog 3
# ArgumentIsString glGetShaderSource 3
# ArgumentIsString glGetTransformFeedbackVarying 6
+# ArgumentIsString glGetActiveUniformARB 6
+# ArgumentIsString glGetActiveSubroutineName 5
+# ArgumentIsString glGetActiveSubroutineUniformName 5
+# ArgumentIsString glGetNamedStringARB 4 - bug param1 is String r/o see below
+
+ArgumentIsString glBindFragDataLocationIndexed 3
+ArgumentIsString glGetFragDataIndex 1
+ArgumentIsString glGetSubroutineIndex 2
+ArgumentIsString glGetSubroutineUniformLocation 2
+
+ArgumentIsString glDebugMessageInsertARB 5
+ArgumentIsString glGetDebugMessageLogARB 7
+ArgumentIsString glDebugMessageInsertAMD 4
+ArgumentIsString glGetDebugMessageLogAMD 6
+
+ArgumentIsString glNamedStringARB 2 4
+ArgumentIsString glDeleteNamedStringARB 1
+ArgumentIsString glCompileShaderIncludeARB 2
+ArgumentIsString glIsNamedStringARB 1
+ArgumentIsString glGetNamedStringARB 1
+ArgumentIsString glGetNamedStringivARB 1
#
# Use cached GL_EXTENSION if possible,
diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg
index 06a9c76f1..aafb9166b 100644
--- a/make/config/jogl/gl-gl4bc.cfg
+++ b/make/config/jogl/gl-gl4bc.cfg
@@ -51,6 +51,10 @@ ManuallyImplement glMapNamedBufferEXT
ForceProcAddressGen glMapNamedBufferEXT
JavaEpilogue glNamedBufferDataEXT bufferSizeTracker.setDirectStateBufferSize({0}, this, {1});
+# Manuall implement glDebugMessageCallback* using the proc address resolver
+ForceProcAddressGen glDebugMessageCallbackARB
+ForceProcAddressGen glDebugMessageCallbackAMD
+
# Force all of the methods to be emitted using dynamic linking so we
# don't need to link against any emulation library on the desktop or
# depend on the presence of an import library for a particular device
diff --git a/make/config/jogl/gl-if-CustomJavaCode-gl.java b/make/config/jogl/gl-if-CustomJavaCode-gl.java
index 1ff8b8e8e..4741b2df5 100644
--- a/make/config/jogl/gl-if-CustomJavaCode-gl.java
+++ b/make/config/jogl/gl-if-CustomJavaCode-gl.java
@@ -58,8 +58,25 @@
public void glDepthRange(double zNear, double zFar);
+ /**
+ * @param target a GL buffer (VBO) target as used in {@link GL#glBindBuffer(int, int)}, ie {@link GL#GL_ELEMENT_ARRAY_BUFFER}, {@link GL#GL_ARRAY_BUFFER}, ..
+ * @return the GL buffer (VBO) name bound to a target via {@link GL#glBindBuffer(int, int)} or 0 if unbound.
+ */
public int glGetBoundBuffer(int target);
+ /**
+ * @param buffer a GL buffer name, generated with {@link GL#glGenBuffers(int, int[], int)} and used in {@link GL#glBindBuffer(int, int)}, {@link GL#glBufferData(int, long, java.nio.Buffer, int)} or {@link GL2#glNamedBufferDataEXT(int, long, java.nio.Buffer, int)} for example.
+ * @return the size of the given GL buffer
+ */
+ public long glGetBufferSize(int buffer);
+
+ /**
+ * @return true if a VBO is bound to {@link GL.GL_ARRAY_BUFFER} via {@link GL#glBindBuffer(int, int)}, otherwise false
+ */
public boolean glIsVBOArrayEnabled();
- public boolean glIsVBOElementEnabled();
+
+ /**
+ * @return true if a VBO is bound to {@link GL.GL_ELEMENT_ARRAY_BUFFER} via {@link GL#glBindBuffer(int, int)}, otherwise false
+ */
+ public boolean glIsVBOElementArrayEnabled();
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-common.java b/make/config/jogl/gl-impl-CustomJavaCode-common.java
index 4872490b0..0a8e90171 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-common.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-common.java
@@ -7,11 +7,15 @@
return bufferStateTracker.getBoundBufferObject(target, this);
}
+ public long glGetBufferSize(int buffer) {
+ return bufferSizeTracker.getDirectStateBufferSize(buffer, this);
+ }
+
public boolean glIsVBOArrayEnabled() {
return checkArrayVBOEnabled(false);
}
- public boolean glIsVBOElementEnabled() {
+ public boolean glIsVBOElementArrayEnabled() {
return checkElementVBOEnabled(false);
}
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
index d99f46ec1..bc2af092b 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
@@ -2,7 +2,7 @@
if(array.getComponentNumber()==0) return;
if(array.isVBO()) {
glVertexAttribPointer(array.getLocation(), array.getComponentNumber(), array.getComponentType(),
- array.getNormalized(), array.getStride(), array.getOffset());
+ array.getNormalized(), array.getStride(), array.getVBOOffset());
} else {
glVertexAttribPointer(array.getLocation(), array.getComponentNumber(), array.getComponentType(),
array.getNormalized(), array.getStride(), array.getBuffer());
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
index 6776feeb7..dbfa3ef4d 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
@@ -358,7 +358,7 @@ native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
public void glVertexPointer(GLArrayData array) {
if(array.getComponentNumber()==0) return;
if(array.isVBO()) {
- glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+ glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
} else {
glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
}
@@ -366,7 +366,7 @@ native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
public void glColorPointer(GLArrayData array) {
if(array.getComponentNumber()==0) return;
if(array.isVBO()) {
- glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+ glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
} else {
glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
}
@@ -378,7 +378,7 @@ native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
throw new GLException("Only 3 components per normal allowed");
}
if(array.isVBO()) {
- glNormalPointer(array.getComponentType(), array.getStride(), array.getOffset());
+ glNormalPointer(array.getComponentType(), array.getStride(), array.getVBOOffset());
} else {
glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
}
@@ -386,7 +386,7 @@ native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
public void glTexCoordPointer(GLArrayData array) {
if(array.getComponentNumber()==0) return;
if(array.isVBO()) {
- glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+ glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
} else {
glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
}
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
index faff8b89f..0a0f87897 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
@@ -295,7 +295,7 @@ native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
public void glVertexPointer(GLArrayData array) {
if(array.getComponentNumber()==0) return;
if(array.isVBO()) {
- glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+ glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
} else {
glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
}
@@ -303,7 +303,7 @@ public void glVertexPointer(GLArrayData array) {
public void glColorPointer(GLArrayData array) {
if(array.getComponentNumber()==0) return;
if(array.isVBO()) {
- glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+ glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
} else {
glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
}
@@ -315,7 +315,7 @@ public void glNormalPointer(GLArrayData array) {
throw new GLException("Only 3 components per normal allowed");
}
if(array.isVBO()) {
- glNormalPointer(array.getComponentType(), array.getStride(), array.getOffset());
+ glNormalPointer(array.getComponentType(), array.getStride(), array.getVBOOffset());
} else {
glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
}
@@ -323,7 +323,7 @@ public void glNormalPointer(GLArrayData array) {
public void glTexCoordPointer(GLArrayData array) {
if(array.getComponentNumber()==0) return;
if(array.isVBO()) {
- glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+ glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
} else {
glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
}
diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat
index 3318b2072..050d48368 100755
--- a/make/scripts/tests-x64.bat
+++ b/make/scripts/tests-x64.bat
@@ -48,10 +48,18 @@ REM scripts\java-win64.bat com.jogamp.opengl.test.junit.newt.TestWindowClosingPr
REM scripts\java-win64.bat com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol03NewtAWT $*
REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn %1 %2 %3 %4
-scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT02GLn %1 %2 %3 %4
+REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT02GLn %1 %2 %3 %4
REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWTAWT01GLn $*
REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen02BitmapNEWT -time 5000
REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen02BitmapNEWT
+REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.graph.TestRegionRendererNEWT01
+REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT01
+REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.graph.demos.ui.UINewtDemo01
+scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo01
+REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02
+REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo01
+REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo02
+
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 53919ae54..c433945dc 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -72,7 +72,13 @@ function jrun() {
#D_ARGS="-Djogl.debug.GraphicsConfiguration"
#D_ARGS="-Djogl.debug.GLCanvas -Djogl.debug.GraphicsConfiguration"
#D_ARGS="-Djogl.debug.GLCanvas"
+ #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.GLDebugMessageHandler"
+ #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL"
+ #D_ARGS="-Djogl.debug.GLDebugMessageHandler -Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT"
+ #D_ARGS="-Djogl.debug.GLDebugMessageHandler -Djogl.debug.DebugGL"
#D_ARGS="-Dnativewindow.debug.ToolkitLock.TraceLock"
+ #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLCode"
+ #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLState"
#X_ARGS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=true"
#X_ARGS="-verbose:jni"
@@ -88,6 +94,7 @@ function jrun() {
echo
echo "Test Start: $*"
echo
+ echo $javaexe $X_ARGS $D_ARGS $C_ARG $*
$javaexe $X_ARGS $D_ARGS $C_ARG $*
echo
echo "Test End: $*"
@@ -117,10 +124,10 @@ function testawtmt() {
#testnoawt com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen02BitmapNEWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug00NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug01NEWT $*
#testawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $*
#testawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListNEWT $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestTransformFeedbackVaryingsBug407NEWT $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLSimple01NEWT $*
#testnoawt com.jogamp.opengl.test.junit.newt.TestRemoteWindow01NEWT $*
#testnoawt com.jogamp.opengl.test.junit.newt.TestRemoteGLWindows01NEWT $*
#testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT $*
@@ -195,10 +202,16 @@ function testawtmt() {
#testawt com.jogamp.opengl.test.junit.newt.TestFocus01SwingAWTRobot
#testawt com.jogamp.opengl.test.junit.newt.TestFocus02SwingAWTRobot
#testawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListAWT $*
+#
+#testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestTransformFeedbackVaryingsBug407NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLSimple01NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLShaderState01NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLShaderState02NEWT $*
#testnoawt com.jogamp.opengl.test.junit.graph.TestRegionRendererNEWT01 $*
-testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT01 $*
-#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo01 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT01 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.demos.ui.UINewtDemo01 $*
+testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo01 $*
#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02 $*
#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo01 $*
#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo02 $*
diff --git a/make/stub_includes/macosx/OpenGL/OpenGL.h b/make/stub_includes/macosx/OpenGL/OpenGL.h
index afb11efea..e6f3030ad 100644
--- a/make/stub_includes/macosx/OpenGL/OpenGL.h
+++ b/make/stub_includes/macosx/OpenGL/OpenGL.h
@@ -3,6 +3,7 @@
/* Typedefs to get things working */
typedef struct _cglObj* CGLContextObj;
+typedef struct _cglObj* CGLShareGroupObj;
typedef struct _cglObj* CGLPBufferObj;
typedef struct _cglObj* CGLPixelFormatObj;
@@ -110,7 +111,7 @@ CGLError CGLFlushDrawable ( CGLContextObj ctx);
CGLError CGLSetParameter ( CGLContextObj ctx, CGLContextParameter pname, const int *params );
CGLError CGLCopyContext ( CGLContextObj src, CGLContextObj dst, int mask );
-
+CGLShareGroupObj CGLGetShareGroup(CGLContextObj ctx);
/* PBuffer manipulation */
CGLError CGLCreatePBuffer(long width,
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 14:56:34 +0000