NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas: make current context on lockFocus for gl_cocoa backend. 

make current context on lockFocus as suggested by (following best practice):
https://developer.apple.com/library/mac/documentation/GraphicsImaging/Conceptual/OpenGL-MacProgGuide

@fix

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
pierre lamot 2015-01-30 17:42:09 +01:00 committed by Cedric BAIL
parent 6ea9b476ad
commit e573d65424
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m
View File

@ -59,13 +59,25 @@ static NSOpenGLContext *_evas_gl_cocoa_shared_context = NULL;
return self;
}
- (void)lockFocus
{
NSOpenGLContext* context = [self openGLContext];
[super lockFocus];
if ([context view] != self) {
[context setView:self];
}
[context makeCurrentContext];
}
@end
Evas_GL_Cocoa_Window *
eng_window_new(void *window,
int w,
int h)
int w,
int h)
{
Evas_GL_Cocoa_Window *gw;
@ -81,8 +93,8 @@ eng_window_new(void *window,
if (!gw->gl_context)
{
free(gw);
return NULL;
free(gw);
return NULL;
}
evas_gl_common_context_use(gw->gl_context);
evas_gl_common_context_resize(gw->gl_context, w, h, 0);
@ -106,10 +118,10 @@ eng_window_use(Evas_GL_Cocoa_Window *gw)
{
if (_evas_gl_cocoa_window != gw)
{
[[(NSOpenGLView*)gw->view openGLContext] makeCurrentContext];
[[(NSOpenGLView*)gw->view openGLContext] makeCurrentContext];
if (_evas_gl_cocoa_window)
evas_gl_common_context_flush(_evas_gl_cocoa_window->gl_context);
_evas_gl_cocoa_window = gw;
_evas_gl_cocoa_window = gw;
}
evas_gl_common_context_use(gw->gl_context);