aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--make/build.xml22
-rwxr-xr-xmake/gl-impl-CustomJavaCode-gles1.java2
-rwxr-xr-xmake/gl-impl-CustomJavaCode-gles2.java2
-rwxr-xr-xmake/glu-CustomJavaCode-gles1.java3
-rwxr-xr-xmake/glu-CustomJavaCode-gles1_if.java3
-rwxr-xr-xmake/glu-es1.cfg4
-rwxr-xr-xsrc/classes/javax/media/opengl/util/BufferUtil.java.javame_cdc_fp10
7 files changed, 32 insertions, 14 deletions
diff --git a/make/build.xml b/make/build.xml
index 6e45f1714..3dc658d24 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -193,6 +193,9 @@
<property name="java.part.macosx"
value="com/sun/opengl/**/macosx/**"/>
+ <property name="java.part.oswin"
+ value="${java.part.x11}, ${java.part.win}, ${java.part.macosx}, com/sun/opengl/impl/jawt/*"/>
+
<property name="java.part.newt"
value="com/sun/javafx/newt/**"/>
@@ -259,13 +262,26 @@
<isset property="jogl.nonewt"/>
</condition>
+ <condition property="java.excludes.oswin"
+ value="${java.part.oswin}">
+ <or>
+ <isset property="jogl.cdcfp"/>
+ <isset property="jogl.noX11WindowsMacOsX"/>
+ </or>
+ </condition>
+
+ <condition property="java.excludes.cdcfp"
+ value="com/sun/opengl/util/io/TGAWriter*, com/sun/opengl/impl/glu/mipmap/**, com/sun/opengl/impl/GLPbufferImpl*, com/sun/opengl/util/texture/**">
+ <isset property="jogl.cdcfp"/>
+ </condition>
+
<property name="java.excludes.javadoc.packagenames"
value="com.sun.opengl.impl.gl2.fixme.*,com.sun.javafx.audio.windows.waveout.TestSpatialization"/>
<property name="java.excludes.fixme"
value="com/sun/opengl/impl/gl2/fixme/** com/sun/javafx/audio/windows/waveout/TestSpatialization.java" />
- <property name="java.excludes.all" value="${java.excludes.fixme} ${java.excludes.egl}, ${java.excludes.gl2}, ${java.excludes.es1}, ${java.excludes.es2}, ${java.excludes.awt}, ${java.excludes.glugl2}, ${java.excludes.util}, ${java.excludes.x11}, ${java.excludes.win}, ${java.excludes.macosx}, ${java.excludes.newt}" />
+ <property name="java.excludes.all" value="${java.excludes.fixme} ${java.excludes.egl}, ${java.excludes.gl2}, ${java.excludes.es1}, ${java.excludes.es2}, ${java.excludes.awt}, ${java.excludes.glugl2}, ${java.excludes.util}, ${java.excludes.x11}, ${java.excludes.win}, ${java.excludes.macosx}, ${java.excludes.newt}, ${java.excludes.oswin}, ${java.excludes.cdcfp}" />
<echo message="java.excludes.all: ${java.excludes.all}" />
@@ -1575,7 +1591,7 @@
<jar manifest="tempversion" destfile="${jogl.core.jar}">
<fileset dir="${classes}"
includes="javax/media/opengl/**, com/sun/gluegen/runtime/**, com/sun/opengl/**"
- excludes="${java.excludes.fixme} ${java.part.egl}, ${java.part.gl2}, ${java.part.gl2.dbg}, ${java.part.es1}, ${java.part.es1.dbg}, ${java.part.es2}, ${java.part.es2.dbg}, ${java.part.awt}, ${java.part.glugl2}, ${java.part.util} ${java.part.util.awt} ${java.part.util.gl2}, ${java.part.x11}, ${java.part.win}, ${java.part.macosx}, com/sun/opengl/impl/jawt/**, ${java.part.newt}"/>
+ excludes="${java.excludes.fixme} ${java.part.egl}, ${java.part.gl2}, ${java.part.gl2.dbg}, ${java.part.es1}, ${java.part.es1.dbg}, ${java.part.es2}, ${java.part.es2.dbg}, ${java.part.awt}, ${java.part.glugl2}, ${java.part.util} ${java.part.util.awt} ${java.part.util.gl2}, ${java.part.oswin}, ${java.part.newt}"/>
</jar>
<jar manifest="tempversion" destfile="${jogl.gles1.jar}">
<fileset dir="${classes}"
@@ -1619,7 +1635,7 @@
</jar>
<jar manifest="tempversion" destfile="${jogl.oswin.jar}">
<fileset dir="${classes}"
- includes="${java.part.x11}, ${java.part.win}, ${java.part.macosx}, com/sun/opengl/impl/jawt/*"
+ includes="${java.part.oswin}"
excludes="com/sun/opengl/impl/**/glx/**, com/sun/opengl/impl/**/wgl/**, com/sun/opengl/impl/**/cgl/**"/>
</jar>
<jar manifest="tempversion" destfile="${jogl.util.jar}">
diff --git a/make/gl-impl-CustomJavaCode-gles1.java b/make/gl-impl-CustomJavaCode-gles1.java
index b5cd70c6c..e077acb8e 100755
--- a/make/gl-impl-CustomJavaCode-gles1.java
+++ b/make/gl-impl-CustomJavaCode-gles1.java
@@ -252,7 +252,7 @@ public java.nio.ByteBuffer glMapBuffer(int target, int access) {
java.nio.ByteBuffer _res = (java.nio.ByteBuffer) arbVBOCache.get(key);
if (_res == null) {
_res = InternalBufferUtils.newDirectByteBuffer(addr, sz);
- _res.order(java.nio.ByteOrder.nativeOrder());
+ // FIXME n.a. on JSR-239 CDC: _res.order(java.nio.ByteOrder.nativeOrder());
arbVBOCache.put(key, _res);
}
_res.position(0);
diff --git a/make/gl-impl-CustomJavaCode-gles2.java b/make/gl-impl-CustomJavaCode-gles2.java
index 87d5e0cfc..d20635ae6 100755
--- a/make/gl-impl-CustomJavaCode-gles2.java
+++ b/make/gl-impl-CustomJavaCode-gles2.java
@@ -241,7 +241,7 @@ public java.nio.ByteBuffer glMapBuffer(int target, int access) {
java.nio.ByteBuffer _res = (java.nio.ByteBuffer) arbVBOCache.get(key);
if (_res == null) {
_res = InternalBufferUtils.newDirectByteBuffer(addr, sz);
- _res.order(java.nio.ByteOrder.nativeOrder());
+ // FIXME n.a. on JSR-239 CDC: _res.order(java.nio.ByteOrder.nativeOrder());
arbVBOCache.put(key, _res);
}
_res.position(0);
diff --git a/make/glu-CustomJavaCode-gles1.java b/make/glu-CustomJavaCode-gles1.java
index d66909409..5023f7584 100755
--- a/make/glu-CustomJavaCode-gles1.java
+++ b/make/glu-CustomJavaCode-gles1.java
@@ -239,6 +239,7 @@ public final void gluPickMatrix(double x, double y, double delX, double delY, In
//----------------------------------------------------------------------
// Mipmap and image scaling functionality
+/* FIXME n.a. on JSR-239 CDC: java.nio.ByteOrder, used by mipmap
private final java.nio.ByteBuffer copyToByteBuffer(java.nio.Buffer buf) {
if (buf instanceof java.nio.ByteBuffer) {
@@ -343,6 +344,8 @@ public final int gluBuild3DMipmaps( int target, int internalFormat, int width,
depth, format, type, buffer ) );
}
+*/
+
//----------------------------------------------------------------------
// GLUProcAddressTable handling
//
diff --git a/make/glu-CustomJavaCode-gles1_if.java b/make/glu-CustomJavaCode-gles1_if.java
index bb9f3d54d..6e17e6a3e 100755
--- a/make/glu-CustomJavaCode-gles1_if.java
+++ b/make/glu-CustomJavaCode-gles1_if.java
@@ -356,6 +356,8 @@ public abstract void gluPickMatrix(double x, double y, double delX, double delY,
public abstract void gluPickMatrix(double x, double y, double delX, double delY, IntBuffer viewport) ;
+/* FIXME n.a. on JSR-239 CDC: java.nio.ByteOrder, used by mipmap
+
public abstract int gluScaleImage( int format, int widthin, int heightin,
int typein, java.nio.Buffer datain, int widthout, int heightout,
int typeout, java.nio.Buffer dataout ) ;
@@ -380,3 +382,4 @@ public abstract int gluBuild3DMipmapLevels( int target, int internalFormat, int
public abstract int gluBuild3DMipmaps( int target, int internalFormat, int width,
int height, int depth, int format, int type, java.nio.Buffer data ) ;
+*/
diff --git a/make/glu-es1.cfg b/make/glu-es1.cfg
index f1beb1ff1..02d529fde 100755
--- a/make/glu-es1.cfg
+++ b/make/glu-es1.cfg
@@ -22,6 +22,8 @@ IncludeAs CustomJavaCode GLUes1 glu-CustomJavaCode-gles1.java
Import javax.media.opengl.GLES1
Import javax.media.opengl.glu.GLU
Import javax.media.opengl.util.BufferUtil
-Import com.sun.opengl.impl.glu.mipmap.Mipmap
+# FIXME n.a. on JSR-239 CDC: java.nio.ByteOrder, used by mipmap
+# Import com.sun.opengl.impl.glu.mipmap.Mipmap
+
Include glu-common.cfg
diff --git a/src/classes/javax/media/opengl/util/BufferUtil.java.javame_cdc_fp b/src/classes/javax/media/opengl/util/BufferUtil.java.javame_cdc_fp
index 788016f02..97d54b932 100755
--- a/src/classes/javax/media/opengl/util/BufferUtil.java.javame_cdc_fp
+++ b/src/classes/javax/media/opengl/util/BufferUtil.java.javame_cdc_fp
@@ -51,6 +51,8 @@ public class BufferUtil {
public static final int SIZEOF_SHORT = 2;
public static final int SIZEOF_INT = 4;
public static final int SIZEOF_FLOAT = 4;
+ public static final int SIZEOF_LONG = -1; // not supported
+ public static final int SIZEOF_DOUBLE = -1; // not supported
private BufferUtil() {}
@@ -227,14 +229,6 @@ public class BufferUtil {
return dest;
}
- public final static FloatBuffer getFloatBuffer(DoubleBuffer source) {
- source.rewind();
- FloatBuffer dest = BufferUtil.newFloatBuffer(source.limit());
- while(source.hasRemaining()) { dest.put((float)source.get()); }
- return dest;
- }
-
-
//----------------------------------------------------------------------
// Internals only below this point
//
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-04 04:36:25 +0000