Browse Source
Merge branch 'master' into fix-animation-repeat-modes
pull/2163/head
Jumar Macato
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
4 deletions
-
native/Avalonia.Native/src/OSX/gl.mm
|
|
@ -208,9 +208,8 @@ public: |
|
|
|
|
|
|
|
|
virtual ~AvnGlRenderingSession() |
|
|
virtual ~AvnGlRenderingSession() |
|
|
{ |
|
|
{ |
|
|
glFlush(); |
|
|
|
|
|
[_context flushBuffer]; |
|
|
[_context flushBuffer]; |
|
|
[_context setView:nil]; |
|
|
[NSOpenGLContext clearCurrentContext]; |
|
|
CGLUnlockContext([_context CGLContextObj]); |
|
|
CGLUnlockContext([_context CGLContextObj]); |
|
|
[_view unlockFocus]; |
|
|
[_view unlockFocus]; |
|
|
} |
|
|
} |
|
|
@ -241,9 +240,8 @@ public: |
|
|
auto gl = _context; |
|
|
auto gl = _context; |
|
|
CGLLockContext([_context CGLContextObj]); |
|
|
CGLLockContext([_context CGLContextObj]); |
|
|
[gl setView: _view]; |
|
|
[gl setView: _view]; |
|
|
|
|
|
[gl update]; |
|
|
[gl makeCurrentContext]; |
|
|
[gl makeCurrentContext]; |
|
|
auto frame = [_view frame]; |
|
|
|
|
|
|
|
|
|
|
|
*ret = new AvnGlRenderingSession(_window, _view, gl); |
|
|
*ret = new AvnGlRenderingSession(_window, _view, gl); |
|
|
return S_OK; |
|
|
return S_OK; |
|
|
} |
|
|
} |
|
|
|
