diff options
Diffstat (limited to 'src/nativewindow/classes/com/jogamp')
3 files changed, 30 insertions, 7 deletions
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/GraphicsConfigurationFactory.java b/src/nativewindow/classes/com/jogamp/nativewindow/GraphicsConfigurationFactory.java index 929af054e..5214dbf3d 100644 --- a/src/nativewindow/classes/com/jogamp/nativewindow/GraphicsConfigurationFactory.java +++ b/src/nativewindow/classes/com/jogamp/nativewindow/GraphicsConfigurationFactory.java @@ -427,6 +427,24 @@ public abstract class GraphicsConfigurationFactory { } } + /** + * Called by {@link #chooseGraphicsConfiguration(CapabilitiesImmutable, CapabilitiesImmutable, CapabilitiesChooser, AbstractGraphicsScreen, int)} + * post argument validation within {@link AbstractGraphicsDevice#lock()}ed segment. + * + * @param capsChosen the intermediate chosen capabilities to be refined by this implementation, may be equal to capsRequested + * @param capsRequested the original requested capabilities + * @param chooser the choosing implementation + * @param screen the referring Screen + * @param nativeVisualID if not {@link VisualIDHolder#VID_UNDEFINED} it reflects a pre-chosen visualID of the native platform's windowing system. + * @return the complete GraphicsConfiguration + * + * @throws IllegalArgumentException if the data type of the passed + * AbstractGraphicsDevice is not supported by this + * NativeWindowFactory. + * @throws NativeWindowException if any window system-specific errors caused + * the selection of the graphics configuration to fail. + * @see #chooseGraphicsConfiguration(CapabilitiesImmutable, CapabilitiesImmutable, CapabilitiesChooser, AbstractGraphicsScreen, int) + */ protected abstract AbstractGraphicsConfiguration chooseGraphicsConfigurationImpl(CapabilitiesImmutable capsChosen, CapabilitiesImmutable capsRequested, CapabilitiesChooser chooser, AbstractGraphicsScreen screen, int nativeVisualID) diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java index a41e9c349..d4249d404 100644 --- a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java +++ b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java @@ -86,8 +86,8 @@ public abstract class NativeWindowFactory { /** Wayland/EGL type, as retrieved with {@link #getNativeWindowType(boolean)}. String is canonical via {@link String#intern()}.*/ public static final String TYPE_WAYLAND = ".wayland"; - /** GBM/EGL type, as retrieved with {@link #getNativeWindowType(boolean)}. String is canonical via {@link String#intern()}.*/ - public static final String TYPE_EGL_GBM = ".egl.gbm"; + /** DRM/GBM type, as retrieved with {@link #getNativeWindowType(boolean)}. String is canonical via {@link String#intern()}.*/ + public static final String TYPE_DRM_GBM = ".egl.gbm"; // We leave the sub-package name as .egl.gbm for NEWT as it uses EGL /** OpenKODE/EGL type, as retrieved with {@link #getNativeWindowType(boolean)}. String is canonical via {@link String#intern()}.*/ public static final String TYPE_EGL = ".egl"; @@ -128,6 +128,8 @@ public abstract class NativeWindowFactory { private static final String JAWTUtilClassName = "jogamp.nativewindow.jawt.JAWTUtil" ; /** {@link jogamp.nativewindow.x11.X11Util} implements {@link ToolkitProperties}. */ private static final String X11UtilClassName = "jogamp.nativewindow.x11.X11Util"; + /** {@link jogamp.nativewindow.drm.DRMUtil} implements {@link ToolkitProperties}. */ + private static final String DRMUtilClassName = "jogamp.nativewindow.drm.DRMUtil"; /** {@link jogamp.nativewindow.macosx.OSXUtil} implements {@link ToolkitProperties}. */ private static final String OSXUtilClassName = "jogamp.nativewindow.macosx.OSXUtil"; /** {@link jogamp.nativewindow.ios.IOSUtil} implements {@link ToolkitProperties}. */ @@ -181,7 +183,7 @@ public abstract class NativeWindowFactory { return TYPE_WAYLAND; } if( guessGBM(false) ) { - return TYPE_EGL_GBM; + return TYPE_DRM_GBM; } if( BcmVCArtifacts.guessVCIVUsed(false) ) { return TYPE_BCM_VC_IV; @@ -259,6 +261,9 @@ public abstract class NativeWindowFactory { case TYPE_X11: clazzName = X11UtilClassName; break; + case TYPE_DRM_GBM: + clazzName = DRMUtilClassName; + break; case TYPE_WINDOWS: clazzName = GDIClassName; break; diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/VisualIDHolder.java b/src/nativewindow/classes/com/jogamp/nativewindow/VisualIDHolder.java index 69bfe50f8..62b73d230 100644 --- a/src/nativewindow/classes/com/jogamp/nativewindow/VisualIDHolder.java +++ b/src/nativewindow/classes/com/jogamp/nativewindow/VisualIDHolder.java @@ -40,13 +40,13 @@ import java.util.Comparator; public interface VisualIDHolder { public enum VIDType { - // Generic Values + /** Generic Values */ INTRINSIC(0), NATIVE(1), - // EGL Values + /** EGL Values */ EGL_CONFIG(10), - // X11 Values + /** X11 Values */ X11_XVISUAL(20), X11_FBCONFIG(21), - // Windows Values + /** Windows Values */ WIN32_PFD(30); public final int id; |