diff options
| author | Sven Gothel <[email protected]> | 2014-04-01 16:46:29 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-04-01 16:46:29 +0200 |
| commit | 6f5686696b1e9085a759774056c7be9887a9e34f (patch) | |
| tree | 273eb4f75ebdcd8acc091945fb2a0ab825bb71e0 /src/jogl/classes/jogamp/opengl/x11 | |
| parent | b935d5248aef79e2386a284b32f5888348a382d6 (diff) | |
| parent | d6d9db6334193ec1cf3c1f00b2a9e154a15d779f (diff) | |
Merge branch 'master' into graph-wip
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/x11')
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java index 94620c4fc..57d39d533 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java @@ -313,7 +313,7 @@ public class X11GLXContext extends GLContextImpl { if ( !glXMakeContextCurrent(display, drawable.getHandle(), drawableRead.getHandle(), contextHandle) ) { throw new GLException(getThreadName()+": Error making temp context(0) current: display "+toHexString(display)+", context "+toHexString(contextHandle)+", drawable "+drawable); } - if( !setGLFunctionAvailability(true, 0, 0, CTX_PROFILE_COMPAT, false /* strictMatch */, false /* withinGLVersionsMapping */) ) { // use GL_VERSION + if( !setGLFunctionAvailability(true, 0, 0, CTX_PROFILE_COMPAT, false /* strictMatch */, null == sharedContext /* withinGLVersionsMapping */) ) { // use GL_VERSION throw new InternalError("setGLFunctionAvailability !strictMatch failed"); } isDirect = GLX.glXIsDirect(display, contextHandle); @@ -345,7 +345,7 @@ public class X11GLXContext extends GLContextImpl { if ( !glXMakeContextCurrent(display, drawable.getHandle(), drawableRead.getHandle(), temp_ctx) ) { throw new GLException(getThreadName()+": Error making temp context(1) current: display "+toHexString(display)+", context "+toHexString(temp_ctx)+", drawable "+drawable); } - setGLFunctionAvailability(true, 0, 0, CTX_PROFILE_COMPAT, false /* strictMatch */, false /* withinGLVersionsMapping */); // use GL_VERSION + setGLFunctionAvailability(true, 0, 0, CTX_PROFILE_COMPAT, false /* strictMatch */, null == sharedContext /* withinGLVersionsMapping */); // use GL_VERSION glXMakeContextCurrent(display, 0, 0, 0); // release temp context if( !createContextARBTried ) { // is*Available calls are valid since setGLFunctionAvailability(..) was called |