diff options
author | Sven Gothel <sgothel@jausoft.com> | 2010-11-03 07:19:34 +0100 |
---|---|---|
committer | Sven Gothel <sgothel@jausoft.com> | 2010-11-03 07:19:34 +0100 |
commit | 714e9375bbba134d333e50adf63cdd9237eb21af (patch) | |
tree | 8f29a8b980a9b0bf523e5d714fa694a6ffddbfaa /src/jogl | |
parent | 034cab60ee08f0a5ee175b6ad81a188b35d7f301 (diff) |
JOGL GLContextImpl: Trigger ProcAddressTable mapping via 'setGLFunctionAvailability' call while scanning all available context.
.. also reorder context scanning from low -> high
Diffstat (limited to 'src/jogl')
-rw-r--r-- | src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java index 5f4a9879b..ca689ed81 100644 --- a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java +++ b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java @@ -496,11 +496,11 @@ public abstract class GLContextImpl extends GLContext { if (!mappedVersionsAvailableSet) { synchronized (mappedVersionsAvailableLock) { if (!mappedVersionsAvailableSet) { - createContextARBMapVersionsAvailable(4, false /* core */); // GL4 - createContextARBMapVersionsAvailable(4, true /* compat */); // GL4bc - createContextARBMapVersionsAvailable(3, false /* core */); // GL3 - createContextARBMapVersionsAvailable(3, true /* compat */); // GL3bc createContextARBMapVersionsAvailable(2, true /* compat */); // GL2 + createContextARBMapVersionsAvailable(3, true /* compat */); // GL3bc + createContextARBMapVersionsAvailable(3, false /* core */); // GL3 + createContextARBMapVersionsAvailable(4, true /* compat */); // GL4bc + createContextARBMapVersionsAvailable(4, false /* core */); // GL4 mappedVersionsAvailableSet = true; if (DEBUG) { System.err.println(getThreadName() + ": !!! createContextARB: SET mappedVersionsAvailableSet " + mappedVersionsAvailableSet); @@ -572,9 +572,12 @@ public abstract class GLContextImpl extends GLContext { if(0!=_context) { destroyContextARBImpl(_context); mapVersionAvailable(reqMajor, reqProfile, major[0], minor[0], ctp); + setGLFunctionAvailability(true, major[0], minor[0], ctp); if (DEBUG) { - System.err.println(getThreadName() + ": createContextARBMapVersionsAvailable: "+getGLVersionAvailable(reqMajor, reqProfile)); + System.err.println(getThreadName() + ": !!! createContextARBMapVersionsAvailable HAVE: "+getGLVersionAvailable(reqMajor, reqProfile)); } + } else if (DEBUG) { + System.err.println(getThreadName() + ": !!! createContextARBMapVersionsAvailable NOPE: "+reqMajor+"."+reqProfile); } } @@ -590,6 +593,9 @@ public abstract class GLContextImpl extends GLContext { GLContext.isValidGLVersion(major[0], minor[0]) && ( major[0]>majorMin || major[0]==majorMin && minor[0] >=minorMin ) ) { + if (DEBUG) { + System.err.println(getThreadName() + ": createContextARBVersions: share "+share+", direct "+direct+", version "+major[0]+"."+minor[0]); + } _context = createContextARBImpl(share, direct, ctxOptionFlags, major[0], minor[0]); if(0==_context) { @@ -637,7 +643,6 @@ public abstract class GLContextImpl extends GLContext { if (version.isValid()) { ctxMajorVersion = version.getMajor(); ctxMinorVersion = version.getMinor(); - ctxVersionString = getGLVersion(ctxMajorVersion, ctxMinorVersion, ctxOptions, versionStr); return; } @@ -789,7 +794,7 @@ public abstract class GLContextImpl extends GLContext { if(null != table) { glProcAddressTable = table; if(DEBUG) { - System.err.println("GLContext GL ProcAddressTable reusing key("+major+","+minor+","+ctp+") -> "+table.hashCode()); + System.err.println(getThreadName() + ": !!! GLContext GL ProcAddressTable reusing key("+major+","+minor+","+ctp+") -> "+table.hashCode()); } } else { if (glProcAddressTable == null) { @@ -801,7 +806,7 @@ public abstract class GLContextImpl extends GLContext { synchronized(mappedProcAddressLock) { mappedGLProcAddress.put(key, getGLProcAddressTable()); if(DEBUG) { - System.err.println("GLContext GL ProcAddressTable mapping key("+major+","+minor+","+ctp+") -> "+getGLProcAddressTable().hashCode()); + System.err.println(getThreadName() + ": !!! GLContext GL ProcAddressTable mapping key("+major+","+minor+","+ctp+") -> "+getGLProcAddressTable().hashCode()); } } } |