michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/LWJGL/lwjgl

This commit is contained in:
Ioannis Tsakpinis 2013-03-22 21:31:33 +02:00
parent ead1abc2b8 58932fcdbf
commit 7b955ee86b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
View File

@ -157,6 +157,11 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXContextImplementation_setView
MacOSXPeerInfo *peer_info = (MacOSXPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
if (peer_info->isWindowed) {
if (peer_info->isCALayer && [context_info->context view] != peer_info->window_info->view) {
// mark glViewport to be set manually when setting a new context view
peer_info->glLayer->setViewport = YES;
}
[context_info->context setView: peer_info->window_info->view];
}
else {
@ -164,7 +169,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXContextImplementation_setView
}
if (peer_info->isCALayer) {
peer_info->glLayer->setViewport = YES;
// if using a CALayer, attach it to AWT Canvas and create a shared opengl context with current context
[peer_info->glLayer performSelectorOnMainThread:@selector(attachLayer) withObject:nil waitUntilDone:NO];
}