diff options
author | Sven Gothel <[email protected]> | 2019-11-28 02:00:29 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2019-11-28 02:00:29 +0100 |
commit | 3e19c2267500c0c459e7dce8d2087387a56f3296 (patch) | |
tree | 1c6e2e64b7f5f5ee8d6178824dc6ff2e0a3bdbbe /make/scripts | |
parent | 976e89ff24da3b2cdf206e8ef8f222f54fb467de (diff) |
Bug 1156 - Implement DRM/GBM Support for JOGL(EGL) and NEWT
Adding new classes DRMLib (gluegen of drm + gbm), DRMUtil and DRMMode GBMDummyUpstreamSurfaceHook
to new package jogamp.nativewindow.drm, allowing full awareness of DRM + GBM within NativeWindow for JOGL + NEWT.
DRMMode replaces the previous native code of collecting drmMode* attributes: active connector, used mode, encoder etc
and also supports multiple active connectors.
DRMUtil handles the global static drmFd (file descriptor), currently only the GNU/Linux DRM device is supported.
GBMDummyUpstreamSurfaceHook provides a simple dummy GBM surface.
NativeWindow provides the new nativewindow_drm.so and nativewindow-os-drm.jar,
which are included in most 'all' jar packages.
build property: setup.addNativeEGLGBM -> setup.addNativeDRMGBM
Changes NativeWindowFactory:
- TYPE_EGL_GBM -> TYPE_DRM_GBM while keeping the package ID of '.egl.gbm' for NEWT (using EGL)
- Initializing DRMUtil at initialization
Changes EGLDrawableFactory:
- Using native GBM device for the default EGL display creation instead of EGL_DEFAULT_DISPLAY.
This resolves issues as seen in Bug 1402, as well in cases w/o surfaceless support.
- GL profile mapping uses surfaceless when available for GBM,
otherwise uses createDummySurfaceImpl (dummy GBM surface via GBMDummyUpstreamSurfaceHook)
- createDummySurfaceImpl uses a dummy GBM surface via GBMDummyUpstreamSurfaceHook
- DesktopGL not available with GBM, see Bug 1401
NEWT's DRM + GBM + EGL Driver
- Using DRMLib, DRMUtil and DRMMode, removed most native code but WindowDriver swapBuffer
- ScreenDriver uses DRMMode, however currently only first connected CRT.
- WindowDriver aligns position and size to screen, positions other than 0/0 causes DRM failure
- WindowDriver reconfigure n/a
NEWT TODO:
- DRM Cursor support (mouse pointer)
- Pointer event handling
Diffstat (limited to 'make/scripts')
-rwxr-xr-x[-rw-r--r--] | make/scripts/gluegen-gl.sh | 23 | ||||
-rw-r--r-- | make/scripts/tests.sh | 6 |
2 files changed, 24 insertions, 5 deletions
diff --git a/make/scripts/gluegen-gl.sh b/make/scripts/gluegen-gl.sh index 6b978c16a..b94658523 100644..100755 --- a/make/scripts/gluegen-gl.sh +++ b/make/scripts/gluegen-gl.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/bash rootrel=build-x86_64 #rootrel=build-x86_64-clang @@ -11,6 +11,23 @@ function copy_temp() { cp -a $builddir/jogl/gensrc/classes/* $buildtmp/gensrc/classes/ } +function gluegen_drmgbm() { +rm -f ../$rootrel/nativewindow/gensrc/classes/jogamp/nativewindow/drm/* +rm -f ../$rootrel/nativewindow/gensrc/native/drm/* +java \ +-classpath \ +../../gluegen/$rootrel/gluegen.jar:../$rootrel/jogl/gluegen-gl.jar \ +com.jogamp.gluegen.GlueGen \ +--debug \ +-O../$rootrel/nativewindow \ +-Ecom.jogamp.gluegen.JavaEmitter \ +-C./config/nativewindow/drm-gbm-lib.cfg \ +-Istub_includes/drm \ +-I../../gluegen/make/stub_includes/gluegen \ +-Istub_includes/jni \ +stub_includes/drm/drm-gbm-lib.c +} + function gluegen_jawt_x11() { java \ -classpath \ @@ -881,11 +898,13 @@ copy_temp function gluegen_all() { # bash scripts/make.jogl.all.linux-x86_64.sh -f build-jogl.xml build.gluegen-gl.jar + gluegen_drmgbm +# # gluegen_jawt_x11 # # gluegen_if_gl # gluegen_gl2es1 - gluegen_es1 +# gluegen_es1 # gluegen_gl2es2 # gluegen_es2 # gluegen_gl2es3 diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index ddfa6c113..92b3670bf 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -119,9 +119,9 @@ function jrun() { #D_ARGS="-Dnewt.debug=all" #D_ARGS="-Djogl.debug=all -Dnewt.debug=all" #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all" - #D_ARGS="-Djogamp.debug=all -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" - #D_ARGS="-Djogamp.debug=all -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.disable.opengldesktop" - D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.disable.opengldesktop" + #D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" + #D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.disable.opengldesktop" + #D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.disable.opengldesktop -Djogl.quirks.force=NoSurfacelessCtx" #D_ARGS="-Dnativewindow.debug.JAWT -Djogamp.debug.UnsafeUtil" #D_ARGS="-Dnativewindow.debug.OSXUtil -Dnativewindow.debug.JAWT -Djogl.debug.GLContext" |