isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

osx: added create_context function in backend

Browse Source 
Cleanup clutter_backend_osx_post_parse function and move context
initialization to clutter_backend_osx_create_context. The OpenGL pixel
format attributes were taken as is. Also move bringing application to
foreground in clutter_stage_osx_realize, it seems there is best place
for it.
This commit is contained in:
Roman Kudiyarov 2010-07-16 19:19:13 +07:00 committed by Robert Bragg
parent 904f619419
commit 50793eac51
2 changed files with 50 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
clutter/osx/clutter-backend-osx.c
View File

@ -37,61 +37,6 @@ static gboolean
clutter_backend_osx_post_parse (ClutterBackend *backend, clutter_backend_osx_post_parse (ClutterBackend *backend,
GError **error) GError **error)
{ {
ClutterBackendOSX *self = CLUTTER_BACKEND_OSX (backend);
CLUTTER_NOTE (BACKEND, "post_parse");
CLUTTER_OSX_POOL_ALLOC();
/* Bring our app to foreground, background apps don't appear in dock or
* accept keyboard focus.
*/
const ProcessSerialNumber psn = { 0, kCurrentProcess };
TransformProcessType (&psn, kProcessTransformToForegroundApplication);
/* Also raise our app to front, otherwise our window will remain under the
* terminal.
*/
SetFrontProcess (&psn);
[NSApplication sharedApplication];
/* Allocate ourselves a GL context. Since we're supposed to have only one per
* backend we can just as well create it now.
*/
NSOpenGLPixelFormatAttribute attrs[] = {
NSOpenGLPFADoubleBuffer,
NSOpenGLPFADepthSize, 24,
NSOpenGLPFAStencilSize, 8,
0
};
self->pixel_format = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs];
self->context = [[NSOpenGLContext alloc]
initWithFormat: self->pixel_format
shareContext: nil];
/* Enable vblank sync - http://developer.apple.com/qa/qa2007/qa1521.html */
#ifdef MAC_OS_X_VERSION_10_5
const int sw = 1;
#else
const long sw = 1;
#endif
[self->context setValues:&sw forParameter: NSOpenGLCPSwapInterval];
/* FIXME: move the debugging bits to cogl */
[self->context makeCurrentContext];
CLUTTER_NOTE(BACKEND, "GL information\n"
" GL_VENDOR: %s\n"
" GL_RENDERER: %s\n"
" GL_VERSION: %s\n"
"GL_EXTENSIONS: %s\n",
glGetString (GL_VENDOR),
glGetString (GL_RENDERER),
glGetString (GL_VERSION),
glGetString (GL_EXTENSIONS));
CLUTTER_OSX_POOL_RELEASE();
return TRUE; return TRUE;
} }
@ -129,6 +74,42 @@ clutter_backend_osx_init_events (ClutterBackend *backend)
_clutter_events_osx_init (); _clutter_events_osx_init ();
} }
static gboolean
clutter_backend_osx_create_context (ClutterBackend *backend,
GError **error)
{
ClutterBackendOSX *backend_osx = CLUTTER_BACKEND_OSX (backend);
CLUTTER_OSX_POOL_ALLOC();
/* Allocate ourselves a GL context. Since we're supposed to have only one per
* backend we can just as well create it now.
*/
NSOpenGLPixelFormatAttribute attrs[] = {
NSOpenGLPFADoubleBuffer,
NSOpenGLPFADepthSize, 24,
NSOpenGLPFAStencilSize, 8,
0
};
backend_osx->pixel_format = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs];
backend_osx->context = [[NSOpenGLContext alloc]
initWithFormat: backend_osx->pixel_format
shareContext: nil];
/* Enable vblank sync - http://developer.apple.com/qa/qa2007/qa1521.html */
#ifdef MAC_OS_X_VERSION_10_5
const int sw = 1;
#else
const long sw = 1;
#endif
[backend_osx->context setValues:&sw forParameter: NSOpenGLCPSwapInterval];
[backend_osx->context makeCurrentContext];
CLUTTER_NOTE (BACKEND, "Context was created");
CLUTTER_OSX_POOL_RELEASE();
return TRUE;
}
static void static void
clutter_backend_osx_ensure_context (ClutterBackend *backend, clutter_backend_osx_ensure_context (ClutterBackend *backend,
ClutterStage *wrapper) ClutterStage *wrapper)
@ -206,6 +187,7 @@ clutter_backend_osx_class_init (ClutterBackendOSXClass *klass)
backend_class->post_parse = clutter_backend_osx_post_parse; backend_class->post_parse = clutter_backend_osx_post_parse;
backend_class->get_features = clutter_backend_osx_get_features; backend_class->get_features = clutter_backend_osx_get_features;
backend_class->create_stage = clutter_backend_osx_create_stage; backend_class->create_stage = clutter_backend_osx_create_stage;
backend_class->create_context = clutter_backend_osx_create_context;
backend_class->ensure_context = clutter_backend_osx_ensure_context; backend_class->ensure_context = clutter_backend_osx_ensure_context;
backend_class->init_events = clutter_backend_osx_init_events; backend_class->init_events = clutter_backend_osx_init_events;
backend_class->redraw = clutter_backend_osx_redraw; backend_class->redraw = clutter_backend_osx_redraw;

13
clutter/osx/clutter-stage-osx.c
View File

@ -264,6 +264,19 @@ clutter_stage_osx_realize (ClutterStageWindow *stage_window)
backend_osx = CLUTTER_BACKEND_OSX (self->backend); backend_osx = CLUTTER_BACKEND_OSX (self->backend);
/* Bring our app to foreground, background apps don't appear in dock or
* accept keyboard focus.
*/
const ProcessSerialNumber psn = { 0, kCurrentProcess };
TransformProcessType (&psn, kProcessTransformToForegroundApplication);
/* Also raise our app to front, otherwise our window will remain under the
* terminal.
*/
SetFrontProcess (&psn);
[NSApplication sharedApplication];
NSRect rect = NSMakeRect(0, 0, self->requisition_width, self->requisition_height); NSRect rect = NSMakeRect(0, 0, self->requisition_width, self->requisition_height);
self->view = [[ClutterGLView alloc] self->view = [[ClutterGLView alloc]