summaryrefslogtreecommitdiffstats
path: root/src/newt
diff options
context:
space:
mode:
Diffstat (limited to 'src/newt')
-rw-r--r--src/newt/classes/jogamp/newt/driver/egl/gbm/DisplayDriver.java29
-rw-r--r--src/newt/classes/jogamp/newt/driver/egl/gbm/ScreenDriver.java58
-rw-r--r--src/newt/classes/jogamp/newt/driver/egl/gbm/WindowDriver.java163
-rw-r--r--src/newt/native/drm_gbm.c83
-rw-r--r--src/newt/native/drm_gbm.h (renamed from src/newt/native/egl_gbm.h)11
-rw-r--r--src/newt/native/drm_gbm_legacy.c306
-rw-r--r--src/newt/native/egl_gbm.c353
-rw-r--r--src/newt/native/egl_gbm_drmflip.c230
8 files changed, 549 insertions, 684 deletions
diff --git a/src/newt/classes/jogamp/newt/driver/egl/gbm/DisplayDriver.java b/src/newt/classes/jogamp/newt/driver/egl/gbm/DisplayDriver.java
index 4d9835826..847532bb4 100644
--- a/src/newt/classes/jogamp/newt/driver/egl/gbm/DisplayDriver.java
+++ b/src/newt/classes/jogamp/newt/driver/egl/gbm/DisplayDriver.java
@@ -31,6 +31,8 @@ import com.jogamp.nativewindow.AbstractGraphicsDevice;
import com.jogamp.nativewindow.NativeWindowException;
import com.jogamp.opengl.GLProfile;
+import jogamp.nativewindow.drm.DRMLib;
+import jogamp.nativewindow.drm.DRMUtil;
import jogamp.newt.DisplayImpl;
import jogamp.newt.NEWTJNILibLoader;
import jogamp.opengl.egl.EGLDisplayUtil;
@@ -50,31 +52,23 @@ public class DisplayDriver extends DisplayImpl {
if (!WindowDriver.initIDs()) {
throw new NativeWindowException("Failed to initialize egl.gbm Window jmethodIDs");
}
- drmHandle = initDrm(DEBUG);
- }
-
- static void validateDrm() {
- if( 0 == drmHandle ) {
- throw new NativeWindowException("Failed to initialize egl.gbm DRM handle");
- }
}
public static void initSingleton() {
// just exist to ensure static init has been run
}
- private static void shutdownHook() {
- freeDrm(drmHandle);
- }
-
public DisplayDriver() {
gbmHandle = 0;
}
@Override
protected void createNativeImpl() {
- validateDrm();
- gbmHandle = OpenGBMDisplay0(drmHandle);
+ final int drmFd = DRMUtil.getDrmFd();
+ if( 0 > drmFd ) {
+ throw new NativeWindowException("Failed to initialize DRM");
+ }
+ gbmHandle = DRMLib.gbm_create_device(drmFd);
aDevice = EGLDisplayUtil.eglCreateEGLGraphicsDevice(gbmHandle, AbstractGraphicsDevice.DEFAULT_CONNECTION, AbstractGraphicsDevice.DEFAULT_UNIT);
aDevice.open();
}
@@ -82,11 +76,10 @@ public class DisplayDriver extends DisplayImpl {
@Override
protected void closeNativeImpl(final AbstractGraphicsDevice aDevice) {
aDevice.close();
- CloseGBMDisplay0(gbmHandle);
+ DRMLib.gbm_device_destroy(gbmHandle);
gbmHandle = 0;
}
- /* pp */ static final long getDrmHandle() { validateDrm(); return drmHandle; }
/* pp */ final long getGBMHandle() { return gbmHandle; }
@Override
@@ -98,14 +91,8 @@ public class DisplayDriver extends DisplayImpl {
// Internals only
//
private static native boolean initIDs();
- private static native long initDrm(boolean verbose);
- private static native void freeDrm(long drmHandle);
-
- private static native long OpenGBMDisplay0(long drmHandle);
- private static native void CloseGBMDisplay0(long gbmHandle);
private static native void DispatchMessages0();
- private static final long drmHandle;
private long gbmHandle;
}
diff --git a/src/newt/classes/jogamp/newt/driver/egl/gbm/ScreenDriver.java b/src/newt/classes/jogamp/newt/driver/egl/gbm/ScreenDriver.java
index 2ff7ab299..7d6c2b41c 100644
--- a/src/newt/classes/jogamp/newt/driver/egl/gbm/ScreenDriver.java
+++ b/src/newt/classes/jogamp/newt/driver/egl/gbm/ScreenDriver.java
@@ -31,6 +31,9 @@ import com.jogamp.nativewindow.DefaultGraphicsScreen;
import com.jogamp.nativewindow.util.Rectangle;
import com.jogamp.newt.MonitorDevice;
import com.jogamp.newt.MonitorMode;
+
+import jogamp.nativewindow.drm.DRMUtil;
+import jogamp.nativewindow.drm.DrmMode;
import jogamp.newt.MonitorModeProps;
import jogamp.newt.ScreenImpl;
@@ -45,26 +48,40 @@ public class ScreenDriver extends ScreenImpl {
@Override
protected void createNativeImpl() {
aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), screen_idx);
- initNative( DisplayDriver.getDrmHandle() );
+ drmMode = DrmMode.create(DRMUtil.getDrmFd(), true /* preferNativeMode */);
+ if( DEBUG ) {
+ drmMode.print(System.err);
+ }
}
@Override
- protected void closeNativeImpl() { }
+ protected void closeNativeImpl() {
+ drmMode.destroy();
+ drmMode = null;
+ }
@Override
protected int validateScreenIndex(final int idx) {
- return 0; // only one screen available
+ // FIXME add multi-monitor support
+ /**
+ if( 0 <= idx && idx < drmMode.count ) {
+ return idx;
+ } */
+ return 0;
}
@Override
protected void collectNativeMonitorModesAndDevicesImpl(final MonitorModeProps.Cache cache) {
+ // FIXME add multi-monitor multi-mode support
+ final int scridx = 0; // getIndex();
+
int[] props = new int[ MonitorModeProps.NUM_MONITOR_MODE_PROPERTIES_ALL ];
int i = 0;
props[i++] = MonitorModeProps.NUM_MONITOR_MODE_PROPERTIES_ALL;
- props[i++] = cachedWidth; // width
- props[i++] = cachedHeight; // height
+ props[i++] = drmMode.getModes()[scridx].getHdisplay();
+ props[i++] = drmMode.getModes()[scridx].getVdisplay();
props[i++] = ScreenImpl.default_sm_bpp; // FIXME
- props[i++] = cachedVRrefresh * 100;
+ props[i++] = drmMode.getModes()[scridx].getVrefresh() * 100;
props[i++] = 0; // flags
props[i++] = 0; // mode_idx
props[i++] = 0; // rotation
@@ -76,45 +93,40 @@ public class ScreenDriver extends ScreenImpl {
props[i++] = 0; // crt_idx
props[i++] = 0; // is-clone
props[i++] = 1; // is-primary
- props[i++] = ScreenImpl.default_sm_widthmm; // FIXME
- props[i++] = ScreenImpl.default_sm_heightmm; // FIXME
+ props[i++] = drmMode.getConnectors()[scridx].getMmWidth();
+ props[i++] = drmMode.getConnectors()[scridx].getMmHeight();
props[i++] = 0; // rotated viewport x pixel-units
props[i++] = 0; // rotated viewport y pixel-units
- props[i++] = cachedWidth; // rotated viewport width pixel-units
- props[i++] = cachedHeight; // rotated viewport height pixel-units
+ props[i++] = drmMode.getModes()[scridx].getHdisplay(); // rotated viewport width pixel-units
+ props[i++] = drmMode.getModes()[scridx].getVdisplay(); // rotated viewport height pixel-units
props[i++] = 0; // rotated viewport x window-units
props[i++] = 0; // rotated viewport y window-units
- props[i++] = cachedWidth; // rotated viewport width window-units
- props[i++] = cachedHeight; // rotated viewport height window-units
+ props[i++] = drmMode.getModes()[scridx].getHdisplay(); // rotated viewport width window-units
+ props[i++] = drmMode.getModes()[scridx].getVdisplay(); // rotated viewport height window-units
MonitorModeProps.streamInMonitorDevice(cache, this, currentMode, null, cache.monitorModes, props, 0, null);
}
@Override
protected MonitorMode queryCurrentMonitorModeImpl(final MonitorDevice monitor) {
+ // FIXME add multi-monitor multi-mode support
return monitor.getSupportedModes().get(0);
}
@Override
protected boolean setCurrentMonitorModeImpl(final MonitorDevice monitor, final MonitorMode mode) {
+ // FIXME add multi-monitor multi-mode support
return false;
}
@Override
protected void calcVirtualScreenOriginAndSize(final Rectangle viewport, final Rectangle viewportInWindowUnits) {
- viewport.set(0, 0, cachedWidth, cachedHeight);
+ // FIXME add multi-monitor support
+ final int scridx = 0; // getIndex();
+ viewport.set(0, 0, drmMode.getModes()[scridx].getHdisplay(), drmMode.getModes()[scridx].getVdisplay());
viewportInWindowUnits.set(viewport);
}
- /** Called from {@link #initNative(long)}. */
- protected void notifyScreenMode(final int width, final int height, final int vrefresh) {
- cachedWidth = width; // write to static field intended
- cachedHeight = height; // write to static field intended
- cachedVRrefresh = vrefresh;
- }
-
- private static int cachedWidth = 0;
- private static int cachedHeight = 0;
- private static int cachedVRrefresh = 0;
+ /* pp */ DrmMode drmMode;
protected static native boolean initIDs();
protected native void initNative(long drmHandle);
diff --git a/src/newt/classes/jogamp/newt/driver/egl/gbm/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/egl/gbm/WindowDriver.java
index 8517a132f..7253fac52 100644
--- a/src/newt/classes/jogamp/newt/driver/egl/gbm/WindowDriver.java
+++ b/src/newt/classes/jogamp/newt/driver/egl/gbm/WindowDriver.java
@@ -27,17 +27,27 @@
*/
package jogamp.newt.driver.egl.gbm;
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+
+import com.jogamp.common.nio.Buffers;
+import com.jogamp.nativewindow.AbstractGraphicsDevice;
import com.jogamp.nativewindow.AbstractGraphicsScreen;
import com.jogamp.nativewindow.NativeWindowException;
import com.jogamp.nativewindow.egl.EGLGraphicsDevice;
import com.jogamp.nativewindow.util.Point;
import com.jogamp.nativewindow.util.Rectangle;
import com.jogamp.nativewindow.util.RectangleImmutable;
+import com.jogamp.newt.Display;
import com.jogamp.opengl.GLCapabilitiesChooser;
import com.jogamp.opengl.GLCapabilitiesImmutable;
import com.jogamp.opengl.GLException;
import com.jogamp.opengl.egl.EGL;
+import jogamp.nativewindow.drm.DRMLib;
+import jogamp.nativewindow.drm.DRMUtil;
+import jogamp.nativewindow.drm.DrmMode;
+import jogamp.nativewindow.drm.drmModeModeInfo;
import jogamp.newt.WindowImpl;
import jogamp.newt.driver.linux.LinuxEventDeviceTracker;
import jogamp.newt.driver.linux.LinuxMouseTracker;
@@ -120,21 +130,66 @@ public class WindowDriver extends WindowImpl {
}
}
+ /**
+ * Align given rectangle to given screen bounds.
+ *
+ * @param screen
+ * @param rect the {@link RectangleImmutable} in pixel units
+ * @param definePosSize if {@code true} issue {@link #definePosition(int, int)} and {@link #defineSize(int, int)}
+ * if either has changed.
+ * @return If position or size has been aligned a new {@link RectangleImmutable} instance w/ clamped values
+ * will be returned, otherwise the given {@code rect} is returned.
+ */
+ private RectangleImmutable alignRect2Screen(final ScreenDriver screen, final RectangleImmutable rect, final boolean definePosSize) {
+ int x = rect.getX();
+ int y = rect.getY();
+ int w = rect.getWidth();
+ int h = rect.getHeight();
+ final int s_w = screen.getWidth();
+ final int s_h = screen.getHeight();
+ boolean modPos = false;
+ boolean modSize = false;
+ if( 0 != x ) {
+ x = 0;
+ modPos = true;
+ }
+ if( 0 != y ) {
+ y = 0;
+ modPos = true;
+ }
+ if( s_w != w ) {
+ w = s_w;
+ modSize = true;
+ }
+ if( s_h != h ) {
+ h = s_h;
+ modSize = true;
+ }
+ if( modPos || modSize ) {
+ if( definePosSize ) {
+ if( modPos ) {
+ definePosition(x, y);
+ }
+ if( modSize ) {
+ defineSize(w, h);
+ }
+ }
+ return new Rectangle(x, y, w, h);
+ } else {
+ return rect;
+ }
+ }
+
@Override
protected boolean canCreateNativeImpl() {
// clamp if required incl. redefinition of position and size
- clampRect((ScreenDriver) getScreen(), new Rectangle(getX(), getY(), getWidth(), getHeight()), true);
- return true; // default: always able to be created
- }
+ // clampRect((ScreenDriver) getScreen(), new Rectangle(getX(), getY(), getWidth(), getHeight()), true);
- static int fourcc_code(final char a, final char b, final char c, final char d) {
- // return ( (int)(a) | ((int)(b) << 8) | ((int)(c) << 16) | ((int)(d) << 24) );
- return ( (a) | ((b) << 8) | ((c) << 16) | ((d) << 24) );
+ // Turns out DRM / GBM can only handle full screen size FB and crtc-modesetting (?)
+ alignRect2Screen((ScreenDriver) getScreen(), new Rectangle(getX(), getY(), getWidth(), getHeight()), true);
+
+ return true; // default: always able to be created
}
- /** [31:0] x:R:G:B 8:8:8:8 little endian */
- static final int GBM_FORMAT_XRGB8888 = fourcc_code('X', 'R', '2', '4');
- /** [31:0] A:R:G:B 8:8:8:8 little endian */
- static final int GBM_FORMAT_ARGB8888 = fourcc_code('A', 'R', '2', '4');
@Override
protected void createNativeImpl() {
@@ -148,7 +203,12 @@ public class WindowDriver extends WindowImpl {
// Create own screen/device resource instance allowing independent ownership,
// while still utilizing shared EGL resources.
final AbstractGraphicsScreen aScreen = screen.getGraphicsScreen();
- final int nativeVisualID = capsRequested.isBackgroundOpaque() ? GBM_FORMAT_XRGB8888 : GBM_FORMAT_ARGB8888;
+ final int nativeVisualID = capsRequested.isBackgroundOpaque() ? DRMUtil.GBM_FORMAT_XRGB8888 : DRMUtil.GBM_FORMAT_ARGB8888;
+
+ final boolean ctDesktopGL = false;
+ if( !EGL.eglBindAPI( ctDesktopGL ? EGL.EGL_OPENGL_API : EGL.EGL_OPENGL_ES_API) ) {
+ throw new GLException("Caught: eglBindAPI to "+(ctDesktopGL ? "ES" : "GL")+" failed , error "+toHexString(EGL.eglGetError()));
+ }
final EGLGraphicsConfiguration eglConfig = EGLGraphicsConfigurationFactory.chooseGraphicsConfigurationStatic(
(GLCapabilitiesImmutable)capsRequested, (GLCapabilitiesImmutable)capsRequested, (GLCapabilitiesChooser)capabilitiesChooser,
@@ -157,8 +217,8 @@ public class WindowDriver extends WindowImpl {
throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
}
setGraphicsConfiguration(eglConfig);
- final long nativeWindowHandle = CreateWindow0(DisplayDriver.getDrmHandle(), display.getGBMHandle(),
- getX(), getY(), getWidth(), getHeight(), nativeVisualID);
+ final long nativeWindowHandle = DRMLib.gbm_surface_create(display.getGBMHandle(), getWidth(), getHeight(), nativeVisualID,
+ DRMLib.GBM_BO_USE_SCANOUT | DRMLib.GBM_BO_USE_RENDERING);
if (nativeWindowHandle == 0) {
throw new NativeWindowException("Error creating egl window: "+eglConfig);
}
@@ -174,15 +234,7 @@ public class WindowDriver extends WindowImpl {
throw new NativeWindowException("Creation of eglSurface failed: "+eglConfig+", windowHandle 0x"+Long.toHexString(nativeWindowHandle)+", error "+toHexString(EGL.eglGetError()));
}
- if(false) {
- /**
- if(!EGL.eglSwapBuffers(display.getHandle(), eglSurface)) {
- throw new GLException("Error swapping buffers, eglError "+toHexString(EGL.eglGetError())+", "+this);
- } */
- lastBO = FirstSwapSurface0(DisplayDriver.getDrmHandle(), nativeWindowHandle, display.getHandle(), eglSurface);
- } else {
- lastBO = 0;
- }
+ lastBO = 0;
if( null != linuxEventDeviceTracker ) {
addWindowListener(linuxEventDeviceTracker);
@@ -196,8 +248,7 @@ public class WindowDriver extends WindowImpl {
@Override
protected void closeNativeImpl() {
- final DisplayDriver display = (DisplayDriver) getScreen().getDisplay();
- final EGLGraphicsDevice eglDevice = (EGLGraphicsDevice) getGraphicsConfiguration().getScreen().getDevice();
+ final Display display = getScreen().getDisplay();
if( null != linuxMouseTracker ) {
removeWindowListener(linuxMouseTracker);
@@ -209,7 +260,7 @@ public class WindowDriver extends WindowImpl {
lastBO = 0;
if(0 != eglSurface) {
try {
- if (!EGL.eglDestroySurface(eglDevice.getHandle(), eglSurface)) {
+ if (!EGL.eglDestroySurface(display.getHandle(), eglSurface)) {
throw new GLException("Error destroying window surface (eglDestroySurface)");
}
} catch (final Throwable t) {
@@ -219,11 +270,9 @@ public class WindowDriver extends WindowImpl {
}
}
if( 0 != windowHandleClose ) {
- CloseWindow0(display.getGBMHandle(), windowHandleClose);
+ DRMLib.gbm_surface_destroy(windowHandleClose);
windowHandleClose = 0;
}
-
- eglDevice.close();
}
@Override
@@ -233,21 +282,21 @@ public class WindowDriver extends WindowImpl {
@Override
public boolean surfaceSwap() {
- final DisplayDriver display = (DisplayDriver) getScreen().getDisplay();
+ final ScreenDriver screen = (ScreenDriver) getScreen();
+ final DisplayDriver display = (DisplayDriver) screen.getDisplay();
final long nativeWindowHandle = getWindowHandle();
+ final DrmMode d = screen.drmMode;
+ if(!EGL.eglSwapBuffers(display.getHandle(), eglSurface)) {
+ throw new GLException("Error swapping buffers, eglError "+toHexString(EGL.eglGetError())+", "+this);
+ }
if( 0 == lastBO ) {
- /** if(!EGL.eglSwapBuffers(display.getHandle(), eglSurface)) {
- throw new GLException("Error swapping buffers, eglError "+toHexString(EGL.eglGetError())+", "+this);
- } */
- lastBO = FirstSwapSurface0(DisplayDriver.getDrmHandle(), nativeWindowHandle, display.getHandle(), eglSurface);
+ lastBO = FirstSwapSurface(d.drmFd, d.getCrtcIDs()[0], getX(), getY(), d.getConnectors()[0].getConnector_id(),
+ d.getModes()[0], nativeWindowHandle);
+ } else {
+ lastBO = NextSwapSurface(d.drmFd, d.getCrtcIDs()[0], getX(), getY(), d.getConnectors()[0].getConnector_id(),
+ d.getModes()[0], nativeWindowHandle, lastBO);
}
-
- /**if(!EGL.eglSwapBuffers(display.getHandle(), eglSurface)) {
- throw new GLException("Error swapping buffers, eglError "+toHexString(EGL.eglGetError())+", "+this);
- } */
- lastBO = NextSwapSurface0(DisplayDriver.getDrmHandle(), nativeWindowHandle, lastBO, display.getHandle(), eglSurface);
- System.exit(1);
return true; // eglSwapBuffers done!
}
@@ -273,11 +322,11 @@ public class WindowDriver extends WindowImpl {
@Override
protected boolean reconfigureWindowImpl(final int x, final int y, final int width, final int height, final int flags) {
- final RectangleImmutable rect = clampRect((ScreenDriver) getScreen(), new Rectangle(x, y, width, height), false);
+ // final RectangleImmutable rect = clampRect((ScreenDriver) getScreen(), new Rectangle(x, y, width, height), false);
// reconfigure0 will issue position/size changed events if required
- reconfigure0(getWindowHandle(), rect.getX(), rect.getY(), rect.getWidth(), rect.getHeight(), flags);
+ // reconfigure0(getWindowHandle(), rect.getX(), rect.getY(), rect.getWidth(), rect.getHeight(), flags);
- return true;
+ return false;
}
@Override
@@ -295,9 +344,29 @@ public class WindowDriver extends WindowImpl {
private long lastBO;
protected static native boolean initIDs();
- private native long CreateWindow0(long drmHandle, long gbmHandle, int x, int y, int width, int height, int nativeVisualID);
- private native void CloseWindow0(long gbmDisplay, long eglWindowHandle);
- private native void reconfigure0(long eglWindowHandle, int x, int y, int width, int height, int flags);
- private native long FirstSwapSurface0(long drmHandle, long gbmSurface, long eglDisplay, long eglSurface);
- private native long NextSwapSurface0(long drmHandle, long gbmSurface, long lastBO, long eglDisplay, long eglSurface);
+ // private native void reconfigure0(long eglWindowHandle, int x, int y, int width, int height, int flags);
+
+ private long FirstSwapSurface(final int drmFd, final int crtc_id, final int x, final int y, final int connector_id, final drmModeModeInfo drmMode, final long gbmSurface) {
+ final ByteBuffer bb = drmMode.getBuffer();
+ if(!Buffers.isDirect(bb)) {
+ throw new IllegalArgumentException("drmMode's buffer is not direct (NIO)");
+ }
+ return FirstSwapSurface0(drmFd, crtc_id, x, y, connector_id,
+ bb, Buffers.getDirectBufferByteOffset(bb),
+ gbmSurface);
+ }
+ private native long FirstSwapSurface0(int drmFd, int crtc_id, int x, int y, int connector_id, Object mode, int mode_byte_offset,
+ long gbmSurface);
+
+ private long NextSwapSurface(final int drmFd, final int crtc_id, final int x, final int y, final int connector_id, final drmModeModeInfo drmMode, final long gbmSurface, final long lastBO) {
+ final ByteBuffer bb = drmMode.getBuffer();
+ if(!Buffers.isDirect(bb)) {
+ throw new IllegalArgumentException("drmMode's buffer is not direct (NIO)");
+ }
+ return NextSwapSurface0(drmFd, crtc_id, x, y, connector_id,
+ bb, Buffers.getDirectBufferByteOffset(bb),
+ gbmSurface, lastBO);
+ }
+ private native long NextSwapSurface0(int drmFd, int crtc_id, int x, int y, int connector_id, Object mode, int mode_byte_offset,
+ long gbmSurface, long lastBO);
}
diff --git a/src/newt/native/drm_gbm.c b/src/newt/native/drm_gbm.c
new file mode 100644
index 000000000..93b02dbe7
--- /dev/null
+++ b/src/newt/native/drm_gbm.c
@@ -0,0 +1,83 @@
+/**
+ * Copyright 2019 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+
+#include "drm_gbm.h"
+
+static jmethodID sizeChangedID = NULL;
+static jmethodID positionChangedID = NULL;
+static jmethodID visibleChangedID = NULL;
+static jmethodID windowDestroyNotifyID = NULL;
+
+/**
+ * Display
+ */
+
+JNIEXPORT jboolean JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_initIDs
+ (JNIEnv *env, jclass clazz)
+{
+ DBG_PRINT( "EGL_GBM.Display initIDs ok\n" );
+ return JNI_TRUE;
+}
+
+JNIEXPORT void JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_DispatchMessages0
+ (JNIEnv *env, jclass clazz)
+{
+}
+
+/**
+ * Screen
+ */
+JNIEXPORT jboolean JNICALL Java_jogamp_newt_driver_egl_gbm_ScreenDriver_initIDs
+ (JNIEnv *env, jclass clazz)
+{
+ DBG_PRINT( "EGL_GBM.Screen initIDs ok\n" );
+ return JNI_TRUE;
+}
+
+/**
+ * Window
+ */
+
+JNIEXPORT jboolean JNICALL Java_jogamp_newt_driver_egl_gbm_WindowDriver_initIDs
+ (JNIEnv *env, jclass clazz)
+{
+ sizeChangedID = (*env)->GetMethodID(env, clazz, "sizeChanged", "(ZIIZ)V");
+ positionChangedID = (*env)->GetMethodID(env, clazz, "positionChanged", "(ZII)V");
+ visibleChangedID = (*env)->GetMethodID(env, clazz, "visibleChanged", "(Z)V");
+ windowDestroyNotifyID = (*env)->GetMethodID(env, clazz, "windowDestroyNotify", "(Z)Z");
+ if (sizeChangedID == NULL ||
+ positionChangedID == NULL ||
+ visibleChangedID == NULL ||
+ windowDestroyNotifyID == NULL) {
+ DBG_PRINT( "initIDs failed\n" );
+ return JNI_FALSE;
+ }
+ DBG_PRINT( "EGL_GBM.Window initIDs ok\n" );
+ return JNI_TRUE;
+}
+
diff --git a/src/newt/native/egl_gbm.h b/src/newt/native/drm_gbm.h
index ae7c9121f..3fac0f59b 100644
--- a/src/newt/native/egl_gbm.h
+++ b/src/newt/native/drm_gbm.h
@@ -42,7 +42,7 @@
#define WEAK __attribute__((weak))
-#define VERBOSE_ON 1
+// #define VERBOSE_ON 1
#ifdef VERBOSE_ON
#define DBG_PRINT(...) fprintf(stderr, __VA_ARGS__); fflush(stderr)
@@ -51,12 +51,3 @@
#endif
#define ERR_PRINT(...) fprintf(stderr, __VA_ARGS__); fflush(stderr)
-typedef struct {
- int fd; // drmClose
- drmModeConnector *connector; // drmModeFreeConnector
- drmModeEncoder *encoder; // drmModeFreeEncoder
- int crtc_index;
-
- drmModeModeInfo *current_mode;
-} DRM_HANDLE;
-
diff --git a/src/newt/native/drm_gbm_legacy.c b/src/newt/native/drm_gbm_legacy.c
new file mode 100644
index 000000000..8cc1c3c15
--- /dev/null
+++ b/src/newt/native/drm_gbm_legacy.c
@@ -0,0 +1,306 @@
+/**
+ * Copyright 2019 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+
+#include "drm_gbm.h"
+
+WEAK uint64_t
+gbm_bo_get_modifier(struct gbm_bo *bo);
+
+WEAK int
+gbm_bo_get_plane_count(struct gbm_bo *bo);
+
+WEAK uint32_t
+gbm_bo_get_stride_for_plane(struct gbm_bo *bo, int plane);
+
+WEAK uint32_t
+gbm_bo_get_offset(struct gbm_bo *bo, int plane);
+
+typedef struct {
+ struct gbm_bo *bo;
+ uint32_t fb_id;
+ uint32_t x, y;
+} DRM_FB;
+
+static void page_flip_handler(int fd, unsigned int frame,
+ unsigned int sec, unsigned int usec, void *data)
+{
+ /* suppress 'unused parameter' warnings */
+ (void)fd, (void)frame, (void)sec, (void)usec;
+
+ int *waiting_for_flip = data;
+ *waiting_for_flip = 0;
+}
+
+static drmEventContext drm_event_ctx = {
+ .version = DRM_EVENT_CONTEXT_VERSION,
+ .page_flip_handler = page_flip_handler,
+ };
+
+static void drm_fb_destroy_callback(struct gbm_bo *bo, void *data)
+{
+ struct gbm_device * gbmDev = gbm_bo_get_device(bo);
+ int drm_fd = gbm_device_get_fd(gbmDev);
+ DRM_FB *fb = data;
+
+ if (fb->fb_id) {
+ drmModeRmFB(drm_fd, fb->fb_id);
+ fb->fb_id = 0;
+ fb->bo = NULL;
+ }
+
+ free(fb);
+}
+
+static DRM_FB * drm_fb_get_from_bo2(int drmFd, struct gbm_bo *bo)
+{
+ DRM_FB *fb = gbm_bo_get_user_data(bo);
+ uint32_t width, height, format,
+ strides[4] = {0}, handles[4] = {0},
+ offsets[4] = {0}, flags = 0;
+ int ret = -1;
+
+ if (fb) {
+ return fb;
+ }
+
+ fb = calloc(1, sizeof *fb);
+ fb->bo = bo;
+
+ width = gbm_bo_get_width(bo);
+ height = gbm_bo_get_height(bo);
+ format = gbm_bo_get_format(bo);
+
+ if (gbm_bo_get_modifier && gbm_bo_get_plane_count &&
+ gbm_bo_get_stride_for_plane && gbm_bo_get_offset) {
+
+ uint64_t modifiers[4] = {0};
+ modifiers[0] = gbm_bo_get_modifier(bo);
+ const int num_planes = gbm_bo_get_plane_count(bo);
+ for (int i = 0; i < num_planes; i++) {
+ strides[i] = gbm_bo_get_stride_for_plane(bo, i);
+ handles[i] = gbm_bo_get_handle(bo).u32;
+ offsets[i] = gbm_bo_get_offset(bo, i);
+ modifiers[i] = modifiers[0];
+ }
+
+ if (modifiers[0]) {
+ flags = DRM_MODE_FB_MODIFIERS;
+ DBG_PRINT("Using modifier %" PRIx64 "\n", modifiers[0]);
+ }
+
+ ret = drmModeAddFB2WithModifiers(drmFd, width, height,
+ format, handles, strides, offsets,
+ modifiers, &fb->fb_id, flags);
+ if(ret) {
+ ERR_PRINT("drmModeAddFB2WithModifiers failed!\n");
+ } else {
+ DBG_PRINT("drmModeAddFB2WithModifiers OK!\n");
+ }
+ }
+
+ if (ret) {
+ memcpy(handles, (uint32_t [4]){gbm_bo_get_handle(bo).u32,0,0,0}, 16);
+ memcpy(strides, (uint32_t [4]){gbm_bo_get_stride(bo),0,0,0}, 16);
+ memset(offsets, 0, 16);
+ ret = drmModeAddFB2(drmFd, width, height, format,
+ handles, strides, offsets, &fb->fb_id, 0);
+ if(ret) {
+ ERR_PRINT("drmModeAddFB2 failed!\n");
+ } else {
+ DBG_PRINT("drmModeAddFB2 OK!\n");
+ }
+ }
+
+ if (ret) {
+ ERR_PRINT("failed to create fb: %s\n", strerror(errno));
+ free(fb);
+ return NULL;
+ }
+
+ gbm_bo_set_user_data(bo, fb, drm_fb_destroy_callback);
+
+ return fb;
+}
+
+static DRM_FB * drm_fb_get_from_bo(int drmFd, struct gbm_bo *bo)
+{
+ DRM_FB *fb = gbm_bo_get_user_data(bo);
+ uint32_t width, height, stride, handle;
+ int ret;
+
+ if (fb) {
+ return fb;
+ }
+
+ fb = calloc(1, sizeof *fb);
+ fb->bo = bo;
+
+ width = gbm_bo_get_width(bo);
+ height = gbm_bo_get_height(bo);
+ stride = gbm_bo_get_stride(bo);
+ handle = gbm_bo_get_handle(bo).u32;
+
+ ret = drmModeAddFB(drmFd, width, height, 24, 32, stride, handle, &fb->fb_id);
+ if (ret) {
+ ERR_PRINT("failed to create fb: %s\n", strerror(errno));
+ free(fb);
+ return NULL;
+ } else {
+ DBG_PRINT("drmModeAddFB OK!\n");
+ }
+
+ gbm_bo_set_user_data(bo, fb, drm_fb_destroy_callback);
+
+ return fb;
+}
+
+JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_egl_gbm_WindowDriver_FirstSwapSurface0
+ (JNIEnv *env, jobject obj, jint drmFd, jint jcrtc_id, jint jx, jint jy,
+ jint jconnector_id, jobject jmode, jint jmode_byte_offset, jlong jgbmSurface)
+{
+ uint32_t crtc_id = (uint32_t)jcrtc_id;
+ uint32_t connector_id = (uint32_t)jconnector_id;
+ drmModeModeInfo *drmMode = NULL;
+ struct gbm_surface *gbmSurface = (struct gbm_surface *) (intptr_t) jgbmSurface;
+ struct gbm_bo *nextBO = NULL;
+ DRM_FB *fb = NULL;
+ int ret;
+
+ if ( NULL != jmode ) {
+ const char * c1 = (const char *) (*env)->GetDirectBufferAddress(env, jmode);
+ drmMode = (drmModeModeInfo *) (intptr_t) ( c1 + jmode_byte_offset );
+ }
+ nextBO = gbm_surface_lock_front_buffer(gbmSurface);
+ fb = drm_fb_get_from_bo(drmFd, nextBO);
+ if (!fb) {
+ ERR_PRINT("Failed to get a new framebuffer BO (0)\n");
+ return 0;
+ }
+ fb->x = (uint32_t)jx;
+ fb->y = (uint32_t)jy;
+ /**
+ * Set Mode
+ *
+ * Fails with x/y != 0: -28 No space left on device
+ * drmModeSetCrtc.0 failed to set mode: fd 26, crtc_id 0x27, fb_id 0x54, pos 10/10, conn_id 0x4d, curMode 1920x1080: -28 No space left on device
+ */
+ ret = drmModeSetCrtc(drmFd, crtc_id, fb->fb_id, fb->x, fb->y,
+ &connector_id, 1, drmMode);
+ if (ret) {
+ ERR_PRINT("drmModeSetCrtc.0 failed to set mode: fd %d, crtc_id 0x%x, fb_id 0x%x, pos %d/%d, conn_id 0x%x, curMode %s: %d %s\n",
+ drmFd, crtc_id, fb->fb_id, jx, jy, connector_id, drmMode->name, ret, strerror(errno));
+ return 0;
+ }
+ DBG_PRINT( "EGL_GBM.Window FirstSwapSurface0 nextBO %p, fd %d, crtc_id 0x%x, fb_id 0x%x, pos %d/%d, conn_id 0x%x, curMode %s\n",
+ nextBO, drmFd, crtc_id, fb->fb_id, jx, jy, connector_id, drmMode->name);
+ return (jlong) (intptr_t) nextBO;
+}
+
+JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_egl_gbm_WindowDriver_NextSwapSurface0
+ (JNIEnv *env, jobject obj, jint drmFd, jint jcrtc_id, jint jx, jint jy,
+ jint jconnector_id, jobject jmode, jint jmode_byte_offset, jlong jgbmSurface, jlong jlastBO)
+{
+ uint32_t crtc_id = (uint32_t)jcrtc_id;
+ uint32_t x = (uint32_t)jx;
+ uint32_t y = (uint32_t)jy;
+ uint32_t connector_id = (uint32_t)jconnector_id;
+ drmModeModeInfo *drmMode = NULL;
+ struct gbm_surface *gbmSurface = (struct gbm_surface *) (intptr_t) jgbmSurface;
+ struct gbm_bo *lastBO = (struct gbm_bo*) (intptr_t) jlastBO, *nextBO = NULL;
+ DRM_FB *fbNext = NULL;
+ int ret, waiting_for_flip = 1;
+ fd_set fds;
+
+ if ( NULL != jmode ) {
+ const char * c1 = (const char *) (*env)->GetDirectBufferAddress(env, jmode);
+ drmMode = (drmModeModeInfo *) (intptr_t) ( c1 + jmode_byte_offset );
+ }
+ nextBO = gbm_surface_lock_front_buffer(gbmSurface);
+ fbNext = drm_fb_get_from_bo(drmFd, nextBO);
+ if (!fbNext) {
+ ERR_PRINT("Failed to get a new framebuffer BO (1)\n");
+ return 0;
+ }
+ if( fbNext->x != x || fbNext->y != y ) {
+ // position changed, hard drmModeSetCrtc(..) w/o vsync
+ fbNext->x = x;
+ fbNext->y = y;
+
+ /**
+ * Set Mode
+ *
+ * Fails with x/y != 0: -28 No space left on device
+ * drmModeSetCrtc.0 failed to set mode: fd 26, crtc_id 0x27, fb_id 0x54, pos 10/10, conn_id 0x4d, curMode 1920x1080: -28 No space left on device
+ */
+ ret = drmModeSetCrtc(drmFd, crtc_id, fbNext->fb_id, fbNext->x, fbNext->y,
+ &connector_id, 1, drmMode);
+
+ if (ret) {
+ ERR_PRINT("drmModeSetCrtc.1 failed to set mode: fd %d, crtc_id 0x%x, fb_id 0x%x, pos %d/%d, conn_id 0x%x, curMode %s: %d %s\n",
+ drmFd, crtc_id, fbNext->fb_id, jx, jy, connector_id, drmMode->name, ret, strerror(errno));
+ return 0;
+ }
+ } else {
+ // same position, use vsync
+ ret = drmModePageFlip(drmFd, crtc_id, fbNext->fb_id,
+ DRM_MODE_PAGE_FLIP_EVENT, &waiting_for_flip);
+ if (ret) {
+ ERR_PRINT("drmModePageFlip.1 failed to queue page flip: fd %d, crtc_id 0x%x, fb_id 0x%x, conn_id 0x%x, curMode %s: %p -> %p: %d %s\n",
+ drmFd, crtc_id, fbNext->fb_id, connector_id, drmMode->name, lastBO, nextBO, ret, strerror(errno));
+ return 0;
+ }
+
+ while (waiting_for_flip) {
+ FD_ZERO(&fds);
+ FD_SET(0, &fds);
+ FD_SET(drmFd, &fds);
+
+ ret = select(drmFd + 1, &fds, NULL, NULL, NULL);
+ if (ret < 0) {
+ ERR_PRINT("drm.select: select err: %s\n", strerror(errno));
+ return ret;
+ } else if (ret == 0) {
+ ERR_PRINT("drm.select: select timeout!\n");
+ return -1;
+ } else if (FD_ISSET(0, &fds)) {
+ ERR_PRINT("drm.select: user interrupted!\n");
+ return 0;
+ }
+ drmHandleEvent(drmFd, &drm_event_ctx);
+ }
+ }
+
+ /* release last buffer to render on again: */
+ if( NULL != lastBO ) {
+ gbm_surface_release_buffer(gbmSurface, lastBO);
+ }
+
+ DBG_PRINT( "EGL_GBM.Window NextSwapSurface0 %p -> %p\n", lastBO, nextBO);
+ return (jlong) (intptr_t) nextBO;
+}
+
diff --git a/src/newt/native/egl_gbm.c b/src/newt/native/egl_gbm.c
deleted file mode 100644
index afbab9ef2..000000000
--- a/src/newt/native/egl_gbm.c
+++ /dev/null
@@ -1,353 +0,0 @@
-#include "egl_gbm.h"
-
-static jmethodID notifyScreenModeID = NULL;
-
-static jmethodID sizeChangedID = NULL;
-static jmethodID positionChangedID = NULL;
-static jmethodID visibleChangedID = NULL;
-static jmethodID windowDestroyNotifyID = NULL;
-
-/**
- * Display
- */
-
-static void freeDrm(DRM_HANDLE *drm) {
- if( NULL != drm ) {
- if( NULL != drm->encoder ) {
- drmModeFreeEncoder(drm->encoder);
- drm->encoder = NULL;
- }
- if( NULL != drm->connector ) {
- drmModeFreeConnector(drm->connector);
- drm->connector = NULL;
- }
- if( 0 <= drm->fd ) {
- drmClose(drm->fd);
- drm->fd = -1;
- }
- free(drm);
- }
-}
-
-JNIEXPORT jboolean JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_initIDs
- (JNIEnv *env, jclass clazz)
-{
- DBG_PRINT( "EGL_GBM.Display initIDs ok\n" );
- return JNI_TRUE;
-}
-
-JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_initDrm
- (JNIEnv *env, jclass clazz, jboolean verbose)
-{
- static const char *linux_dri_card0 = "/dev/dri/card0";
- static const char *modules[] = {
- "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "exynos", "msm"
- };
- int module_count = sizeof(modules) / sizeof(const char*);
- const char * module_used = NULL;
- int ret, i, j, area;
- DRM_HANDLE *drm = calloc(1, sizeof(DRM_HANDLE));
- drmModeRes *resources = NULL;
-
-#ifdef VERBOSE_ON
- verbose = JNI_TRUE;
-#endif
-
- if( verbose ) {
- ERR_PRINT( "EGL_GBM.Display initDrm start\n");
- }
-
- drm->fd = -1;
-
-#if 1
- // try linux_dri_card0 first
- drm->fd = open(linux_dri_card0, O_RDWR);
- ERR_PRINT("EGL_GBM.Display trying to open '%s': success %d\n",
- linux_dri_card0, 0<=drm->fd);
-#endif
-
- // try drm modules
- for (i = 0; 0>drm->fd && i < module_count; i++) {
- if( verbose ) {
- ERR_PRINT("EGL_GBM.Display trying to load module[%d/%d] %s...",
- i, module_count, modules[i]);
- }
- drm->fd = drmOpen(modules[i], NULL);
- if (drm->fd < 0) {
- if( verbose ) {
- ERR_PRINT("failed.\n");
- }
- } else {
- if( verbose ) {
- ERR_PRINT("success.\n");
- }
- module_used = modules[i];
- }
- }
- if (drm->fd < 0) {
- ERR_PRINT("EGL_GBM.Display could not open drm device\n");
- goto error;
- }
-
-#if 1
- ret = drmSetMaster(drm->fd);
- if(ret) {
- //drmDropMaster(int fd);
- DBG_PRINT( "EGL_GBM.Display drmSetMaster fd %d: FAILED: %d %s\n",
- drm->fd, ret, strerror(errno));
- } else {
- DBG_PRINT( "EGL_GBM.Display drmSetMaster fd %d: OK\n", drm->fd);
- }
-#endif
-
- resources = drmModeGetResources(drm->fd);
- if ( NULL == resources ) {
- ERR_PRINT("EGL_GBM.Display drmModeGetResources failed on module %s: %s\n",
- module_used, strerror(errno));
- goto error;
- }
-
- if( verbose ) {
- for (i = 0; i < resources->count_connectors; i++) {
- drmModeConnector * c = drmModeGetConnector(drm->fd, resources->connectors[i]);
- int chosen = DRM_MODE_CONNECTED == c->connection;
- ERR_PRINT( "EGL_GBM.Display Connector %d/%d chosen %d: id[con 0x%x, enc 0x%x], type %d[id 0x%x], connection %d, dim %dx%x mm, modes %d, encoders %d\n",
- i, resources->count_connectors, chosen,
- c->connector_id, c->encoder_id, c->connector_type, c->connector_type_id,
- c->connection, c->mmWidth, c->mmHeight, c->count_modes, c->count_encoders);
- drmModeFreeConnector(c);
- }
- }
- /* find a connected connector: */
- for (i = 0; i < resources->count_connectors; i++) {
- drm->connector = drmModeGetConnector(drm->fd, resources->connectors[i]);
- if( DRM_MODE_CONNECTED == drm->connector->connection ) {
- break;
- } else {
- drmModeFreeConnector(drm->connector);
- drm->connector = NULL;
- }
- }
- if( i >= resources->count_connectors ) {
- /* we could be fancy and listen for hotplug events and wait for
- * a connector..
- */
- ERR_PRINT("EGL_GBM.Display no connected connector (connector count %d, module %s)!\n",
- resources->count_connectors, module_used);
- goto error;
- }
-
- /* find highest resolution mode: */
- for (i = 0, j = -1, area = 0; i < drm->connector->count_modes; i++) {
- drmModeModeInfo *current_mode = &drm->connector->modes[i];
- int current_area = current_mode->hdisplay * current_mode->vdisplay;
- if (current_area > area) {
- drm->current_mode = current_mode;
- area = current_area;
- j = i;
- }
- if( verbose ) {
- ERR_PRINT( "EGL_GBM.Display Mode %d/%d (max-chosen %d): clock %d, %dx%d @ %d Hz, type %d, name <%s>\n",
- i, drm->connector->count_modes, j,
- current_mode->clock, current_mode->hdisplay, current_mode->vdisplay, current_mode->vrefresh,
- current_mode->type, current_mode->name);
- }
- }
- if ( NULL == drm->current_mode ) {
- ERR_PRINT("EGL_GBM.Display could not find mode (module %s)!\n", module_used);
- goto error;
- }
-
- if( verbose ) {
- for (i = 0; i < resources->count_encoders; i++) {
- drmModeEncoder * e = drmModeGetEncoder(drm->fd, resources->encoders[i]);
- int chosen = e->encoder_id == drm->connector->encoder_id;
- ERR_PRINT( "EGL_GBM.Display Encoder %d/%d chosen %d: id 0x%x, type %d, crtc_id 0x%x, possible[crtcs %d, clones %d]\n",
- i, resources->count_encoders, chosen,
- e->encoder_id, e->encoder_type, e->crtc_id,
- e->possible_crtcs, e->possible_clones);
- drmModeFreeEncoder(e);
- }
- }
- /* find encoder: */
- for (i = 0; i < resources->count_encoders; i++) {
- drm->encoder = drmModeGetEncoder(drm->fd, resources->encoders[i]);
- if( drm->encoder->encoder_id == drm->connector->encoder_id ) {
- break;
- } else {
- drmModeFreeEncoder(drm->encoder);
- drm->encoder = NULL;
- }
- }
- if ( i >= resources->count_encoders ) {
- ERR_PRINT("EGL_GBM.Display no encoder (module %s)!\n", module_used);
- goto error;
- }
- for (i = 0; i < resources->count_crtcs; i++) {
- if (resources->crtcs[i] == drm->encoder->crtc_id) {
- drm->crtc_index = i;
- break;
- }
- }
-
- drmModeFreeResources(resources);
- resources = NULL;
-
- if( verbose ) {
- DBG_PRINT( "EGL_GBM.Display initDrm end.X0 OK: fd %d, enc_id 0x%x, crtc_id 0x%x, conn_id 0x%x, curMode %s\n",
- drm->fd, drm->encoder->encoder_id, drm->encoder->crtc_id, drm->connector->connector_id, drm->current_mode->name);
- }
-
- // drm->crtc_id = encoder->crtc_id;
- // drm->connector_id = connector->connector_id;
- return (jlong) (intptr_t) drm;
-
-error:
- if( verbose ) {
- DBG_PRINT( "EGL_GBM.Display initDrm end.X2 ERROR\n");
- }
- drmModeFreeResources(resources);
- resources = NULL;
- freeDrm(drm);
- return 0;
-}
-
-JNIEXPORT void JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_freeDrm
- (JNIEnv *env, jclass clazz, jlong jdrm) {
- freeDrm( (DRM_HANDLE*) (intptr_t) jdrm );
-}
-
-JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_OpenGBMDisplay0
- (JNIEnv *env, jclass clazz, jlong jdrm)
-{
- DRM_HANDLE *drm = (DRM_HANDLE*) (intptr_t) jdrm;
- struct gbm_device * dev = gbm_create_device(drm->fd);
- DBG_PRINT( "EGL_GBM.Display OpenGBMDisplay0 handle %p\n", dev);
- return (jlong) (intptr_t) dev;
-}
-
-JNIEXPORT void JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_CloseGBMDisplay0
- (JNIEnv *env, jclass clazz, jlong jgbm)
-{
- struct gbm_device * dev = (struct gbm_device *) (intptr_t) jgbm;
- DBG_PRINT( "EGL_GBM.Display CloseGBMDisplay0 handle %p\n", dev);
- gbm_device_destroy(dev);
-}
-
-JNIEXPORT void JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_DispatchMessages0
- (JNIEnv *env, jclass clazz)
-{
-}
-
-/**
- * Screen
- */
-JNIEXPORT jboolean JNICALL Java_jogamp_newt_driver_egl_gbm_ScreenDriver_initIDs
- (JNIEnv *env, jclass clazz)
-{
- notifyScreenModeID = (*env)->GetMethodID(env, clazz, "notifyScreenMode", "(III)V");
- if (notifyScreenModeID == NULL) {
- DBG_PRINT( "EGL_GBM.Screen initIDs FALSE\n" );
- return JNI_FALSE;
- }
- DBG_PRINT( "EGL_GBM.Screen initIDs ok\n" );
- return JNI_TRUE;
-}
-
-JNIEXPORT void JNICALL Java_jogamp_newt_driver_egl_gbm_ScreenDriver_initNative
- (JNIEnv *env, jobject obj, jlong jdrm)
-{
- DRM_HANDLE *drm = (DRM_HANDLE*) (intptr_t) jdrm;
- uint32_t screen_width = 0;
- uint32_t screen_height = 0;
- uint32_t screen_vrefresh = 0;
- int32_t success = 0;
-
- if( NULL != drm ) {
- /**
- connector.modes.hdisplay; // width
- connector.modes.vdisplay; // height
- connector.modes.flags; // flags
- encoder.crtc_id; // crt_idx
- */
- screen_width = drm->current_mode->hdisplay;
- screen_height = drm->current_mode->vdisplay;
- screen_vrefresh = drm->current_mode->vrefresh;
-
- DBG_PRINT( "EGL_GBM.Screen initNative ok %dx%d @ %d\n", screen_width, screen_height, screen_vrefresh );
- (*env)->CallVoidMethod(env, obj, notifyScreenModeID, (jint) screen_width, (jint) screen_height, (jint) screen_vrefresh);
- } else {
- DBG_PRINT( "BCM.Screen initNative failed\n" );
- }
-}
-
-/**
- * Window
- */
-
-JNIEXPORT jboolean JNICALL Java_jogamp_newt_driver_egl_gbm_WindowDriver_initIDs
- (JNIEnv *env, jclass clazz)
-{
- sizeChangedID = (*env)->GetMethodID(env, clazz, "sizeChanged", "(ZIIZ)V");
- positionChangedID = (*env)->GetMethodID(env, clazz, "positionChanged", "(ZII)V");
- visibleChangedID = (*env)->GetMethodID(env, clazz, "visibleChanged", "(Z)V");
- windowDestroyNotifyID = (*env)->GetMethodID(env, clazz, "windowDestroyNotify", "(Z)Z");
- if (sizeChangedID == NULL ||
- positionChangedID == NULL ||
- visibleChangedID == NULL ||
- windowDestroyNotifyID == NULL) {
- DBG_PRINT( "initIDs failed\n" );
- return JNI_FALSE;
- }
- DBG_PRINT( "EGL_GBM.Window initIDs ok\n" );
- return JNI_TRUE;
-}
-
-#ifndef DRM_FORMAT_MOD_LINEAR
- #define DRM_FORMAT_MOD_LINEAR 0
-#endif
-
-WEAK struct gbm_surface *
-gbm_surface_create_with_modifiers(struct gbm_device *gbm,
- uint32_t width, uint32_t height,
- uint32_t format,
- const uint64_t *modifiers,
- const unsigned int count);
-
-JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_egl_gbm_WindowDriver_CreateWindow0
- (JNIEnv *env, jobject obj, jlong jdrm, jlong jgbm, jint x, jint y, jint width, jint height, jint visual_id)
-{
- DRM_HANDLE *drm = (DRM_HANDLE*) (intptr_t) jdrm;
- struct gbm_device *dev = (struct gbm_device *) (intptr_t) jgbm;
- uint64_t modifier = DRM_FORMAT_MOD_LINEAR;
- struct gbm_surface *surface = NULL;
-
- if( gbm_surface_create_with_modifiers ) {
- surface = gbm_surface_create_with_modifiers(dev, width, height, visual_id, &modifier, 1);
- }
- if( NULL == surface ) {
- if( gbm_surface_create_with_modifiers ) {
- DBG_PRINT( "EGL_GBM.Window CreateWindow0 gbm_surface_create_with_modifiers failed\n");
- }
- surface = gbm_surface_create(dev, width, height, visual_id, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
- }
- if ( NULL == surface ) {
- DBG_PRINT( "EGL_GBM.Window CreateWindow0 gbm_surface_create failed\n");
- return 0;
- }
-
- // Done in Java code ..
- // (*env)->CallVoidMethod(env, obj, visibleChangedID, JNI_TRUE);
-
- DBG_PRINT( "EGL_GBM.Window CreateWindow0 handle %p\n", surface);
- return (jlong) (intptr_t) surface;
-}
-
-JNIEXPORT void JNICALL Java_jogamp_newt_driver_egl_gbm_WindowDriver_CloseWindow0
- (JNIEnv *env, jobject obj, jlong display, jlong window)
-{
- struct gbm_surface *surface = (struct gbm_surface *) (intptr_t) window;
- DBG_PRINT( "EGL_GBM.Window CloseWindow0 handle %p\n", surface);
- gbm_surface_destroy(surface);
-}
-
diff --git a/src/newt/native/egl_gbm_drmflip.c b/src/newt/native/egl_gbm_drmflip.c
deleted file mode 100644
index 4dda026a0..000000000
--- a/src/newt/native/egl_gbm_drmflip.c
+++ /dev/null
@@ -1,230 +0,0 @@
-#include "egl_gbm.h"
-
-#include <EGL/egl.h>
-
-WEAK uint64_t
-gbm_bo_get_modifier(struct gbm_bo *bo);
-
-WEAK int
-gbm_bo_get_plane_count(struct gbm_bo *bo);
-
-WEAK uint32_t
-gbm_bo_get_stride_for_plane(struct gbm_bo *bo, int plane);
-
-WEAK uint32_t
-gbm_bo_get_offset(struct gbm_bo *bo, int plane);
-
-typedef struct {
- struct gbm_bo *bo;
- uint32_t fb_id;
-} DRM_FB;
-
-static void page_flip_handler(int fd, unsigned int frame,
- unsigned int sec, unsigned int usec, void *data)
-{
- /* suppress 'unused parameter' warnings */
- (void)fd, (void)frame, (void)sec, (void)usec;
-
- int *waiting_for_flip = data;
- *waiting_for_flip = 0;
-}
-
-static drmEventContext drm_event_ctx = {
- .version = 2,
- .page_flip_handler = page_flip_handler,
- };
-
-static void drm_fb_destroy_callback(struct gbm_bo *bo, void *data)
-{
- struct gbm_device * gbmDev = gbm_bo_get_device(bo);
- int drm_fd = gbm_device_get_fd(gbmDev);
- DRM_FB *fb = data;
-
- if (fb->fb_id)
- drmModeRmFB(drm_fd, fb->fb_id);
-
- free(fb);
-}
-
-static DRM_FB * drm_fb_get_from_bo(struct gbm_bo *bo)
-{
- struct gbm_device * gbmDev = gbm_bo_get_device(bo);
- int drm_fd = gbm_device_get_fd(gbmDev);
- DRM_FB *fb = gbm_bo_get_user_data(bo);
- uint32_t width, height, format,
- strides[4] = {0}, handles[4] = {0},
- offsets[4] = {0}, flags = 0;
- int ret = -1;
-
- if (fb)
- return fb;
-
- fb = calloc(1, sizeof *fb);
- fb->bo = bo;
-
- width = gbm_bo_get_width(bo);
- height = gbm_bo_get_height(bo);
- format = gbm_bo_get_format(bo);
-
- if (gbm_bo_get_modifier && gbm_bo_get_plane_count &&
- gbm_bo_get_stride_for_plane && gbm_bo_get_offset) {
-
- uint64_t modifiers[4] = {0};
- modifiers[0] = gbm_bo_get_modifier(bo);
- const int num_planes = gbm_bo_get_plane_count(bo);
- for (int i = 0; i < num_planes; i++) {
- strides[i] = gbm_bo_get_stride_for_plane(bo, i);
- handles[i] = gbm_bo_get_handle(bo).u32;
- offsets[i] = gbm_bo_get_offset(bo, i);
- modifiers[i] = modifiers[0];
- }
-
- if (modifiers[0]) {
- flags = DRM_MODE_FB_MODIFIERS;
- DBG_PRINT("Using modifier %" PRIx64 "\n", modifiers[0]);
- }
-
- ret = drmModeAddFB2WithModifiers(drm_fd, width, height,
- format, handles, strides, offsets,
- modifiers, &fb->fb_id, flags);
- if(ret) {
- ERR_PRINT("drmModeAddFB2WithModifiers failed!\n");
- } else {
- ERR_PRINT("drmModeAddFB2WithModifiers OK!\n");
- }
- }
-
- if (ret) {
- memcpy(handles, (uint32_t [4]){gbm_bo_get_handle(bo).u32,0,0,0}, 16);
- memcpy(strides, (uint32_t [4]){gbm_bo_get_stride(bo),0,0,0}, 16);
- memset(offsets, 0, 16);
- ret = drmModeAddFB2(drm_fd, width, height, format,
- handles, strides, offsets, &fb->fb_id, 0);
- if(ret) {
- ERR_PRINT("drmModeAddFB2 failed!\n");
- } else {
- ERR_PRINT("drmModeAddFB2 OK!\n");
- }
- }
-
- if (ret) {
- ERR_PRINT("failed to create fb: %s\n", strerror(errno));
- free(fb);
- return NULL;
- }
-
- gbm_bo_set_user_data(bo, fb, drm_fb_destroy_callback);
-
- return fb;
-}
-
-JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_egl_gbm_WindowDriver_FirstSwapSurface0
- (JNIEnv *env, jobject obj, jlong jdrm, jlong jgbmSurface, jlong jeglDisplay, jlong jeglSurface)
-{
- DRM_HANDLE *drm = (DRM_HANDLE*) (intptr_t) jdrm;
- struct gbm_surface *gbmSurface = (struct gbm_surface *) (intptr_t) jgbmSurface;
- EGLDisplay eglDisplay = (EGLDisplay) (intptr_t) jeglDisplay;
- EGLSurface eglSurface = (EGLSurface) (intptr_t) jeglSurface;
- struct gbm_bo *nextBO = NULL;
- DRM_FB *fb = NULL;
- int ret;
-
- if ( EGL_TRUE != eglSwapBuffers(eglDisplay, eglSurface) ) {
- EGLint err = eglGetError();
- ERR_PRINT("Failed eglSwapBuffers, err 0x%x\n", err);
- return 0;
- }
- nextBO = gbm_surface_lock_front_buffer(gbmSurface);
- fb = drm_fb_get_from_bo(nextBO);
- if (!fb) {
- ERR_PRINT("Failed to get a new framebuffer BO\n");
- return 0;
- }
- /* set mode: */
- ret = drmModeSetCrtc(drm->fd, drm->encoder->crtc_id, fb->fb_id, 0, 0,
- &drm->connector->connector_id, 1, drm->current_mode);
- /**
- int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
- uint32_t x, uint32_t y, uint32_t *connectors, int count,
- drmModeModeInfoPtr mode);
- */
-
- if (ret) {
- ERR_PRINT("drmModeSetCrtc failed to set mode: fd %d, enc_id 0x%x, crtc_id 0x%x, fb_id 0x%x, conn_id 0x%x, curMode %s: %d %s\n",
- drm->fd, drm->encoder->encoder_id, drm->encoder->crtc_id, fb->fb_id,
- drm->connector->connector_id, drm->current_mode->name, ret, strerror(errno));
- return 0;
- }
- DBG_PRINT( "EGL_GBM.Window FirstSwapSurface0 nextBO %p, fd %d, enc_id 0x%x, crtc_id 0x%x, fb_id 0x%x, conn_id 0x%x, curMode %s\n",
- nextBO,
- drm->fd, drm->encoder->encoder_id, drm->encoder->crtc_id, fb->fb_id,
- drm->connector->connector_id, drm->current_mode->name);
- return (jlong) (intptr_t) nextBO;
-}
-
-JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_egl_gbm_WindowDriver_NextSwapSurface0
- (JNIEnv *env, jobject obj, jlong jdrm, jlong jgbmSurface, jlong jlastBO, jlong jeglDisplay, jlong jeglSurface)
-{
- DRM_HANDLE *drm = (DRM_HANDLE*) (intptr_t) jdrm;
- struct gbm_surface *gbmSurface = (struct gbm_surface *) (intptr_t) jgbmSurface;
- struct gbm_bo *lastBO = (struct gbm_bo*) (intptr_t) jlastBO, *nextBO = NULL;
- EGLDisplay eglDisplay = (EGLDisplay) (intptr_t) jeglDisplay;
- EGLSurface eglSurface = (EGLSurface) (intptr_t) jeglSurface;
- DRM_FB *fb = NULL;
- int ret, waiting_for_flip = 1;
- fd_set fds;
-
- if ( EGL_TRUE != eglSwapBuffers(eglDisplay, eglSurface) ) {
- EGLint err = eglGetError();
- ERR_PRINT("Failed eglSwapBuffers, err 0x%x\n", err);
- return 0;
- }
- nextBO = gbm_surface_lock_front_buffer(gbmSurface);
- fb = drm_fb_get_from_bo(nextBO);
- if (!fb) {
- ERR_PRINT("Failed to get a new framebuffer BO\n");
- return 0;
- }
-
- /**
- * Here you could also update drm plane layers if you want
- * hw composition
- */
- ret = drmModePageFlip(drm->fd, drm->encoder->crtc_id, fb->fb_id,
- DRM_MODE_PAGE_FLIP_EVENT, &waiting_for_flip);
- if (ret) {
- ERR_PRINT("drmModePageFlip failed to queue page flip: fd %d, enc_id 0x%x, crtc_id 0x%x, fb_id 0x%x, conn_id 0x%x, curMode %s: %p -> %p: %d %s\n",
- drm->fd, drm->encoder->encoder_id, drm->encoder->crtc_id, fb->fb_id,
- drm->connector->connector_id, drm->current_mode->name,
- lastBO, nextBO, ret, strerror(errno));
- return 0;
- }
-
- while (waiting_for_flip) {
- FD_ZERO(&fds);
- FD_SET(0, &fds);
- FD_SET(drm->fd, &fds);
-
- ret = select(drm->fd + 1, &fds, NULL, NULL, NULL);
- if (ret < 0) {
- ERR_PRINT("select err: %s\n", strerror(errno));
- return ret;
- } else if (ret == 0) {
- ERR_PRINT("select timeout!\n");
- return -1;
- } else if (FD_ISSET(0, &fds)) {
- ERR_PRINT("user interrupted!\n");
- return 0;
- }
- drmHandleEvent(drm->fd, &drm_event_ctx);
- }
-
- /* release last buffer to render on again: */
- if( NULL != lastBO ) {
- gbm_surface_release_buffer(gbmSurface, lastBO);
- }
-
- DBG_PRINT( "EGL_GBM.Window NextSwapSurface0 %p -> %p\n", lastBO, nextBO);
- return (jlong) (intptr_t) nextBO;
-}
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 02:35:47 +0000