aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--make/build-newt.xml21
-rw-r--r--src/newt/classes/jogamp/newt/DisplayImpl.java2
-rw-r--r--src/newt/classes/jogamp/newt/ScreenImpl.java2
-rw-r--r--src/newt/classes/jogamp/newt/WindowImpl.java2
-rw-r--r--src/newt/classes/jogamp/newt/egl/android/event/AndroidNewtEventFactory.java (renamed from src/newt/classes/jogamp/newt/opengl/android/event/AndroidNewtEventFactory.java)2
-rw-r--r--src/newt/classes/jogamp/newt/egl/broadcom/Display.java (renamed from src/newt/classes/jogamp/newt/opengl/broadcom/egl/Display.java)2
-rw-r--r--src/newt/classes/jogamp/newt/egl/broadcom/Screen.java (renamed from src/newt/classes/jogamp/newt/opengl/broadcom/egl/Screen.java)2
-rw-r--r--src/newt/classes/jogamp/newt/egl/broadcom/Window.java (renamed from src/newt/classes/jogamp/newt/opengl/broadcom/egl/Window.java)2
-rw-r--r--src/newt/classes/jogamp/newt/egl/kd/KDDisplay.java (renamed from src/newt/classes/jogamp/newt/opengl/kd/KDDisplay.java)2
-rw-r--r--src/newt/classes/jogamp/newt/egl/kd/KDScreen.java (renamed from src/newt/classes/jogamp/newt/opengl/kd/KDScreen.java)2
-rw-r--r--src/newt/classes/jogamp/newt/egl/kd/KDWindow.java (renamed from src/newt/classes/jogamp/newt/opengl/kd/KDWindow.java)2
-rw-r--r--src/newt/native/BroadcomEGL.c16
-rw-r--r--src/newt/native/KDWindow.c20
13 files changed, 36 insertions, 41 deletions
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 55a535962..c6bd9c861 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -105,11 +105,11 @@
<property name="java.part.macosx"
value="jogamp/newt/macosx/*"/>
- <property name="java.part.opengl"
- value="com/jogamp/newt/opengl/* jogamp/newt/opengl/kd/*"/>
+ <property name="java.part.egl"
+ value="jogamp/newt/egl/**"/>
- <property name="java.part.broadcomegl"
- value="jogamp/newt/opengl/broadcom/egl/*"/>
+ <property name="java.part.opengl"
+ value="com/jogamp/newt/opengl/** ${java.part.egl}"/>
<property name="java.part.intelgdl"
value="jogamp/newt/intel/gdl/*"/>
@@ -121,8 +121,7 @@
<isset property="setup.noAWT"/>
</condition>
- <condition property="java.excludes.opengl"
- value="${java.part.opengl} ${java.part.broadcomegl}">
+ <condition property="java.excludes.opengl" value="${java.part.opengl}">
<isset property="setup.noOpenGL"/>
</condition>
@@ -162,7 +161,7 @@
<property name="javadoc.dev" value="${project.root}/javadoc_newt_dev" />
<property name="javadoc.windowtitle" value="NEWT API -- ${newt_base_version} Specification" />
<property name="javadoc.overview" value="spec-overview.html" />
- <property name="javadoc.spec.packagenames" value="com.jogamp.newt, com.jogamp.newt.event.*, com.jogamp.newt.opengl" />
+ <property name="javadoc.spec.packagenames" value="com.jogamp.newt, com.jogamp.newt.event, com.jogamp.newt.opengl, com.jogamp.newt.util" />
<property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" />
@@ -549,7 +548,7 @@
</macrodef>
<target name="c.build.newt.prepare.KD" if="useKD">
- <javah destdir="${src.generated.c}/KD" classpath="${classes}" class="jogamp.newt.opengl.kd.KDWindow" />
+ <javah destdir="${src.generated.c}/KD" classpath="${classes}" class="jogamp.newt.egl.kd.KDWindow" />
</target>
<target name="c.build.newt.prepare.IntelGDL" if="useIntelGDL">
@@ -559,7 +558,7 @@
</target>
<target name="c.build.newt.prepare.BroadcomEGL" if="useBroadcomEGL">
- <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${classes}" class="jogamp.newt.opengl.broadcom.egl.Window" />
+ <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${classes}" class="jogamp.newt.egl.broadcom.Window" />
</target>
<target name="c.build.newt.prepare.desktop" unless="setup.nodesktop">
@@ -627,10 +626,6 @@
<fileset dir="${classes}"
includes="${java.part.opengl}"/>
</jar>
- <jar manifest="tempversion" destfile="${newt.hw.broadcomegl.jar}" filesonly="true">
- <fileset dir="${classes}"
- includes="${java.part.broadcomegl}"/>
- </jar>
</target>
<target name="build-jars-driver" depends="setup-manifestfile">
diff --git a/src/newt/classes/jogamp/newt/DisplayImpl.java b/src/newt/classes/jogamp/newt/DisplayImpl.java
index 299f4fb54..d18d1e912 100644
--- a/src/newt/classes/jogamp/newt/DisplayImpl.java
+++ b/src/newt/classes/jogamp/newt/DisplayImpl.java
@@ -57,7 +57,7 @@ public abstract class DisplayImpl extends Display {
Class displayClass = NewtFactory.getCustomClass(type, "Display");
if(null==displayClass) {
if (NativeWindowFactory.TYPE_EGL.equals(type)) {
- displayClass = Class.forName("jogamp.newt.opengl.kd.KDDisplay");
+ displayClass = Class.forName("jogamp.newt.egl.kd.KDDisplay");
} else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
displayClass = Class.forName("jogamp.newt.windows.WindowsDisplay");
} else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
diff --git a/src/newt/classes/jogamp/newt/ScreenImpl.java b/src/newt/classes/jogamp/newt/ScreenImpl.java
index 39f6b8a0f..54f7aa411 100644
--- a/src/newt/classes/jogamp/newt/ScreenImpl.java
+++ b/src/newt/classes/jogamp/newt/ScreenImpl.java
@@ -70,7 +70,7 @@ public abstract class ScreenImpl extends Screen implements ScreenModeListener {
Class screenClass = NewtFactory.getCustomClass(type, "Screen");
if(null==screenClass) {
if (NativeWindowFactory.TYPE_EGL.equals(type)) {
- screenClass = Class.forName("jogamp.newt.opengl.kd.KDScreen");
+ screenClass = Class.forName("jogamp.newt.egl.kd.KDScreen");
} else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
screenClass = Class.forName("jogamp.newt.windows.WindowsScreen");
} else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java
index 2286fdd00..f98315f53 100644
--- a/src/newt/classes/jogamp/newt/WindowImpl.java
+++ b/src/newt/classes/jogamp/newt/WindowImpl.java
@@ -141,7 +141,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
Class windowClass = NewtFactory.getCustomClass(type, "Window");
if(null==windowClass) {
if (NativeWindowFactory.TYPE_EGL.equals(type)) {
- windowClass = Class.forName("jogamp.newt.opengl.kd.KDWindow");
+ windowClass = Class.forName("jogamp.newt.egl.kd.KDWindow");
} else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
windowClass = Class.forName("jogamp.newt.windows.WindowsWindow");
} else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
diff --git a/src/newt/classes/jogamp/newt/opengl/android/event/AndroidNewtEventFactory.java b/src/newt/classes/jogamp/newt/egl/android/event/AndroidNewtEventFactory.java
index 498e0281e..c8e3f204f 100644
--- a/src/newt/classes/jogamp/newt/opengl/android/event/AndroidNewtEventFactory.java
+++ b/src/newt/classes/jogamp/newt/egl/android/event/AndroidNewtEventFactory.java
@@ -26,7 +26,7 @@
* or implied, of JogAmp Community.
*/
-package jogamp.newt.opengl.android.event;
+package jogamp.newt.egl.android.event;
import com.jogamp.common.util.IntIntHashMap;
diff --git a/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Display.java b/src/newt/classes/jogamp/newt/egl/broadcom/Display.java
index 494908a81..9a97fe6a2 100644
--- a/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Display.java
+++ b/src/newt/classes/jogamp/newt/egl/broadcom/Display.java
@@ -31,7 +31,7 @@
*
*/
-package jogamp.newt.opengl.broadcom.egl;
+package jogamp.newt.egl.broadcom;
import jogamp.newt.*;
import jogamp.opengl.egl.*;
diff --git a/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Screen.java b/src/newt/classes/jogamp/newt/egl/broadcom/Screen.java
index 2224f7860..9a6b6ed1e 100644
--- a/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Screen.java
+++ b/src/newt/classes/jogamp/newt/egl/broadcom/Screen.java
@@ -31,7 +31,7 @@
*
*/
-package jogamp.newt.opengl.broadcom.egl;
+package jogamp.newt.egl.broadcom;
import javax.media.nativewindow.*;
diff --git a/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Window.java b/src/newt/classes/jogamp/newt/egl/broadcom/Window.java
index 9532178f3..79e8b371e 100644
--- a/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Window.java
+++ b/src/newt/classes/jogamp/newt/egl/broadcom/Window.java
@@ -31,7 +31,7 @@
*
*/
-package jogamp.newt.opengl.broadcom.egl;
+package jogamp.newt.egl.broadcom;
import jogamp.opengl.egl.*;
import javax.media.nativewindow.*;
diff --git a/src/newt/classes/jogamp/newt/opengl/kd/KDDisplay.java b/src/newt/classes/jogamp/newt/egl/kd/KDDisplay.java
index c9d83a750..d7e7cb87a 100644
--- a/src/newt/classes/jogamp/newt/opengl/kd/KDDisplay.java
+++ b/src/newt/classes/jogamp/newt/egl/kd/KDDisplay.java
@@ -31,7 +31,7 @@
*
*/
-package jogamp.newt.opengl.kd;
+package jogamp.newt.egl.kd;
import com.jogamp.newt.*;
import jogamp.newt.*;
diff --git a/src/newt/classes/jogamp/newt/opengl/kd/KDScreen.java b/src/newt/classes/jogamp/newt/egl/kd/KDScreen.java
index 2996fb194..132e10b9e 100644
--- a/src/newt/classes/jogamp/newt/opengl/kd/KDScreen.java
+++ b/src/newt/classes/jogamp/newt/egl/kd/KDScreen.java
@@ -31,7 +31,7 @@
*
*/
-package jogamp.newt.opengl.kd;
+package jogamp.newt.egl.kd;
import com.jogamp.newt.*;
import jogamp.newt.ScreenImpl;
diff --git a/src/newt/classes/jogamp/newt/opengl/kd/KDWindow.java b/src/newt/classes/jogamp/newt/egl/kd/KDWindow.java
index 9cfa13cd9..cde946bb2 100644
--- a/src/newt/classes/jogamp/newt/opengl/kd/KDWindow.java
+++ b/src/newt/classes/jogamp/newt/egl/kd/KDWindow.java
@@ -31,7 +31,7 @@
*
*/
-package jogamp.newt.opengl.kd;
+package jogamp.newt.egl.kd;
import jogamp.newt.*;
import jogamp.opengl.egl.*;
diff --git a/src/newt/native/BroadcomEGL.c b/src/newt/native/BroadcomEGL.c
index 80b482130..9ae1b5836 100644
--- a/src/newt/native/BroadcomEGL.c
+++ b/src/newt/native/BroadcomEGL.c
@@ -37,7 +37,7 @@
#include <stdio.h>
#include <string.h>
-#include "jogamp_newt_opengl_broadcom_egl_Window.h"
+#include "jogamp_newt_egl_broadcom_egl_Window.h"
#include "MouseEvent.h"
#include "KeyEvent.h"
@@ -67,7 +67,7 @@ static jmethodID windowCreatedID = NULL;
* Display
*/
-JNIEXPORT void JNICALL Java_jogamp_newt_opengl_broadcom_egl_Display_DispatchMessages
+JNIEXPORT void JNICALL Java_jogamp_newt_egl_broadcom_egl_Display_DispatchMessages
(JNIEnv *env, jobject obj)
{
// FIXME: n/a
@@ -75,7 +75,7 @@ JNIEXPORT void JNICALL Java_jogamp_newt_opengl_broadcom_egl_Display_DispatchMess
(void) obj;
}
-JNIEXPORT jlong JNICALL Java_jogamp_newt_opengl_broadcom_egl_Display_CreateDisplay
+JNIEXPORT jlong JNICALL Java_jogamp_newt_egl_broadcom_egl_Display_CreateDisplay
(JNIEnv *env, jobject obj, jint width, jint height)
{
(void) env;
@@ -89,7 +89,7 @@ JNIEXPORT jlong JNICALL Java_jogamp_newt_opengl_broadcom_egl_Display_CreateDispl
return (jlong) (intptr_t) dpy;
}
-JNIEXPORT void JNICALL Java_jogamp_newt_opengl_broadcom_egl_Display_DestroyDisplay
+JNIEXPORT void JNICALL Java_jogamp_newt_egl_broadcom_egl_Display_DestroyDisplay
(JNIEnv *env, jobject obj, jlong display)
{
EGLDisplay dpy = (EGLDisplay)(intptr_t)display;
@@ -106,7 +106,7 @@ JNIEXPORT void JNICALL Java_jogamp_newt_opengl_broadcom_egl_Display_DestroyDispl
* Window
*/
-JNIEXPORT jboolean JNICALL Java_jogamp_newt_opengl_broadcom_egl_Window_initIDs
+JNIEXPORT jboolean JNICALL Java_jogamp_newt_egl_broadcom_egl_Window_initIDs
(JNIEnv *env, jclass clazz)
{
windowCreatedID = (*env)->GetMethodID(env, clazz, "windowCreated", "(III)V");
@@ -118,7 +118,7 @@ JNIEXPORT jboolean JNICALL Java_jogamp_newt_opengl_broadcom_egl_Window_initIDs
return JNI_TRUE;
}
-JNIEXPORT jlong JNICALL Java_jogamp_newt_opengl_broadcom_egl_Window_CreateWindow
+JNIEXPORT jlong JNICALL Java_jogamp_newt_egl_broadcom_egl_Window_CreateWindow
(JNIEnv *env, jobject obj, jlong display, jboolean chromaKey, jint width, jint height)
{
EGLDisplay dpy = (EGLDisplay)(intptr_t)display;
@@ -162,7 +162,7 @@ JNIEXPORT jlong JNICALL Java_jogamp_newt_opengl_broadcom_egl_Window_CreateWindow
return (jlong) (intptr_t) window;
}
-JNIEXPORT void JNICALL Java_jogamp_newt_opengl_broadcom_egl_Window_CloseWindow
+JNIEXPORT void JNICALL Java_jogamp_newt_egl_broadcom_egl_Window_CloseWindow
(JNIEnv *env, jobject obj, jlong display, jlong window)
{
EGLDisplay dpy = (EGLDisplay) (intptr_t) display;
@@ -175,7 +175,7 @@ JNIEXPORT void JNICALL Java_jogamp_newt_opengl_broadcom_egl_Window_CloseWindow
DBG_PRINT( "[CloseWindow] X\n");
}
-JNIEXPORT void JNICALL Java_jogamp_newt_opengl_broadcom_egl_Window_SwapWindow
+JNIEXPORT void JNICALL Java_jogamp_newt_egl_broadcom_egl_Window_SwapWindow
(JNIEnv *env, jobject obj, jlong display, jlong window)
{
EGLDisplay dpy = (EGLDisplay) (intptr_t) display;
diff --git a/src/newt/native/KDWindow.c b/src/newt/native/KDWindow.c
index b314f9d44..ee335f73e 100644
--- a/src/newt/native/KDWindow.c
+++ b/src/newt/native/KDWindow.c
@@ -43,7 +43,7 @@
#include <KD/kd.h>
-#include "jogamp_newt_opengl_kd_KDWindow.h"
+#include "jogamp_newt_egl_kd_KDWindow.h"
#include "MouseEvent.h"
#include "KeyEvent.h"
@@ -81,7 +81,7 @@ static jmethodID sendKeyEventID = NULL;
* Display
*/
-JNIEXPORT void JNICALL Java_jogamp_newt_opengl_kd_KDDisplay_DispatchMessages
+JNIEXPORT void JNICALL Java_jogamp_newt_egl_kd_KDDisplay_DispatchMessages
(JNIEnv *env, jobject obj)
{
const KDEvent * evt;
@@ -177,7 +177,7 @@ JNIEXPORT void JNICALL Java_jogamp_newt_opengl_kd_KDDisplay_DispatchMessages
* Window
*/
-JNIEXPORT jboolean JNICALL Java_jogamp_newt_opengl_kd_KDWindow_initIDs
+JNIEXPORT jboolean JNICALL Java_jogamp_newt_egl_kd_KDWindow_initIDs
(JNIEnv *env, jclass clazz)
{
#ifdef VERBOSE_ON
@@ -205,7 +205,7 @@ JNIEXPORT jboolean JNICALL Java_jogamp_newt_opengl_kd_KDWindow_initIDs
return JNI_TRUE;
}
-JNIEXPORT jlong JNICALL Java_jogamp_newt_opengl_kd_KDWindow_CreateWindow
+JNIEXPORT jlong JNICALL Java_jogamp_newt_egl_kd_KDWindow_CreateWindow
(JNIEnv *env, jobject obj, jlong display, jintArray jAttrs)
{
jint * attrs = NULL;
@@ -247,7 +247,7 @@ JNIEXPORT jlong JNICALL Java_jogamp_newt_opengl_kd_KDWindow_CreateWindow
return (jlong) (intptr_t) window;
}
-JNIEXPORT jlong JNICALL Java_jogamp_newt_opengl_kd_KDWindow_RealizeWindow
+JNIEXPORT jlong JNICALL Java_jogamp_newt_egl_kd_KDWindow_RealizeWindow
(JNIEnv *env, jobject obj, jlong window)
{
KDWindow *w = (KDWindow*) (intptr_t) window;
@@ -262,7 +262,7 @@ JNIEXPORT jlong JNICALL Java_jogamp_newt_opengl_kd_KDWindow_RealizeWindow
return (jlong) (intptr_t) nativeWindow;
}
-JNIEXPORT jint JNICALL Java_jogamp_newt_opengl_kd_KDWindow_CloseWindow
+JNIEXPORT jint JNICALL Java_jogamp_newt_egl_kd_KDWindow_CloseWindow
(JNIEnv *env, jobject obj, jlong window, jlong juserData)
{
KDWindow *w = (KDWindow*) (intptr_t) window;
@@ -276,11 +276,11 @@ JNIEXPORT jint JNICALL Java_jogamp_newt_opengl_kd_KDWindow_CloseWindow
}
/*
- * Class: jogamp_newt_opengl_kd_KDWindow
+ * Class: jogamp_newt_egl_kd_KDWindow
* Method: setVisible0
* Signature: (JJZ)V
*/
-JNIEXPORT void JNICALL Java_jogamp_newt_opengl_kd_KDWindow_setVisible0
+JNIEXPORT void JNICALL Java_jogamp_newt_egl_kd_KDWindow_setVisible0
(JNIEnv *env, jobject obj, jlong window, jboolean visible)
{
KDWindow *w = (KDWindow*) (intptr_t) window;
@@ -290,7 +290,7 @@ JNIEXPORT void JNICALL Java_jogamp_newt_opengl_kd_KDWindow_setVisible0
(*env)->CallVoidMethod(env, obj, visibleChangedID, visible); // FIXME: or send via event ?
}
-JNIEXPORT void JNICALL Java_jogamp_newt_opengl_kd_KDWindow_setFullScreen0
+JNIEXPORT void JNICALL Java_jogamp_newt_egl_kd_KDWindow_setFullScreen0
(JNIEnv *env, jobject obj, jlong window, jboolean fullscreen)
{
/** not supported, due to missing NV property ..
@@ -307,7 +307,7 @@ JNIEXPORT void JNICALL Java_jogamp_newt_opengl_kd_KDWindow_setFullScreen0
(void)fullscreen;
}
-JNIEXPORT void JNICALL Java_jogamp_newt_opengl_kd_KDWindow_setSize0
+JNIEXPORT void JNICALL Java_jogamp_newt_egl_kd_KDWindow_setSize0
(JNIEnv *env, jobject obj, jlong window, jint width, jint height)
{
KDWindow *w = (KDWindow*) (intptr_t) window;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 10:36:37 +0000