From 96d530e7127c89db9991080e6268c6e8430d0619 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 8 Jul 2014 10:47:41 +0200 Subject: Findbugs.not-written.null: Fix referencing non-written fields (never written or due branching) - AWT TextRenderer: Add throw new InternalError("fontRenderContext never initialized!"); FIXME! - GLContextImpl.hasFBOImpl(): Fix serious NPE issue if extCache is null - GLDrawableFactoryImpl.createOffscreenDrawableImpl(..): - Fix NPE issue w/ null drawable - Fix resetting GammaRamp by ensuring originalGammaRamp will be set at 1st setGammaRamp(..) - AndroidGLMediaPlayerAPI14: Fix NPE: Use already resolved local referenced - EGLDrawableFactory: Fix NPE: Only operate on non null surface! - ALAudioSink.dequeueBuffer(..): Only resolve releasedBuffer elements if not null - --- src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java') diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java b/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java index fd8052b96..1aca29d0a 100644 --- a/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java @@ -272,11 +272,14 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory { final GLCapabilitiesImmutable capsChosen = GLGraphicsConfigurationUtil.fixGLPBufferGLCapabilities(capsRequested); final GLDrawableImpl drawable = createOffscreenDrawableImpl( createMutableSurfaceImpl(device, true, capsChosen, capsRequested, chooser, new UpstreamSurfaceHookMutableSize(width, height) ) ); + final GLContextImpl ctx; if(null != drawable) { drawable.setRealized(true); + ctx = (GLContextImpl) drawable.createContext(shareWith); + } else { + ctx = null; } - - return new GLPbufferImpl( drawable, (GLContextImpl) drawable.createContext(shareWith) ); + return new GLPbufferImpl( drawable, ctx); } //--------------------------------------------------------------------------- @@ -607,7 +610,10 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory { rampEntry = 0.0f; gammaRamp[i] = rampEntry; } - needsGammaRampReset = true; + if( !needsGammaRampReset ) { + originalGammaRamp = getGammaRamp(); + needsGammaRampReset = true; + } return setGammaRamp(gammaRamp); } -- cgit v1.2.3