From 606fbe8b3f4c420f1c4faecf4f49276e054543a0 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 9 Dec 2019 07:12:56 +0100 Subject: Bug 1156: NEWT WindowDriver: Handle case with requested CapabilitiesImmutable not being GLCapabilitiesImmutable --- .../opengl/egl/EGLGraphicsConfigurationFactory.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java') diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java index 1d9a9732d..02bbafc95 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java @@ -219,6 +219,25 @@ public class EGLGraphicsConfigurationFactory extends GLGraphicsConfigurationFact return availableCaps; } + /** + * Returns a {@link GLCapabilitiesImmutable} based on the given {@link CapabilitiesImmutable}. + *

+ * If the given {@code caps} is an instance of {@link GLCapabilitiesImmutable}, same reference will be returned, + * otherwise a new {@link GLCapabilitiesImmutable} using the default EGL GLProfile will be created and all + * given {@link CapabilitiesImmutable} values copied into. + *

+ * @param caps + * @return immutable {@link GLCapabilitiesImmutable} either identical to {@code caps} or a new instance, see above. + */ + public static final GLCapabilitiesImmutable castOrCopyImmutable(final CapabilitiesImmutable caps) { + if ( caps instanceof GLCapabilitiesImmutable ) { + return (GLCapabilitiesImmutable)caps; + } else { + final GLCapabilities glCapsReq = new GLCapabilities( GLProfile.getDefault( GLDrawableFactory.getEGLFactory().getDefaultDevice() ) ); + return glCapsReq.copyFrom(caps); + } + } + /** * Called mainly by {@link #chooseGraphicsConfigurationImpl(CapabilitiesImmutable, CapabilitiesImmutable, CapabilitiesChooser, AbstractGraphicsScreen, int)} * @param capsChosen the intermediate chosen capabilities to be refined by this implementation, may be equal to capsRequested -- cgit v1.2.3