aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXerxes RĂ„nby <[email protected]>2019-09-11 23:03:33 +0200
committerSven Gothel <[email protected]>2019-11-21 03:58:57 +0100
commit10d3ba66b725fb44dc2c646c9ddc9816a4d72777 (patch)
tree7b63f20c3396a76d54b82f79594967e1bf85cc57
parente1161a3773a35fdb7d94eb5263b1ab9a85e565fb (diff)
gbm/WindowDriver: make it compile and link
-rw-r--r--src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java2
-rw-r--r--src/newt/classes/jogamp/newt/driver/gbm/WindowDriver.java10
-rw-r--r--src/newt/native/gbm.c2
3 files changed, 8 insertions, 6 deletions
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java
index 5539a13b1..df1feefc7 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java
@@ -179,7 +179,7 @@ public abstract class NativeWindowFactory {
if(guessGBM()){
return TYPE_GBM;
}
- return TYPE_DEFAULT;
+ return TYPE_X11;
}
}
diff --git a/src/newt/classes/jogamp/newt/driver/gbm/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/gbm/WindowDriver.java
index cbada076c..f4e86ed00 100644
--- a/src/newt/classes/jogamp/newt/driver/gbm/WindowDriver.java
+++ b/src/newt/classes/jogamp/newt/driver/gbm/WindowDriver.java
@@ -30,6 +30,12 @@ public class WindowDriver extends WindowImpl {
this.linuxEventDeviceTracker = LinuxEventDeviceTracker.getSingleton();
}
+
+ @Override
+ protected final int getSupportedReconfigMaskImpl() {
+ return minimumReconfigStateMask;
+ }
+
@Override
protected void createNativeImpl() {
if (0 != getParentWindowHandle()) {
@@ -111,8 +117,4 @@ public class WindowDriver extends WindowImpl {
y);
}
- @Override
- protected void updateInsetsImpl(final Insets insets) {
-
- }
}
diff --git a/src/newt/native/gbm.c b/src/newt/native/gbm.c
index cdb1223f6..927faa47e 100644
--- a/src/newt/native/gbm.c
+++ b/src/newt/native/gbm.c
@@ -41,7 +41,7 @@ JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_gbm_DisplayDriver_initGbm
drmModeEncoder *encoder = NULL;
int i, area;
- for (i = 0; i < ARRAY_SIZE(modules); i++) {
+ for (i = 0; i < 6 /* ARRAY_SIZE(modules) */; i++) {
printf("trying to load module %s...", modules[i]);
drm.fd = drmOpen(modules[i], NULL);
if (drm.fd < 0) {