brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2007-10-09 Rob Bradford <rob@openedhand.com>

Browse Source 
* clutter/eglnative/clutter-backend-egl.c:
	(clutter_backend_egl_dispose):
	Call eglTerminate() on the display when the backend is disposed of.

	* clutter/eglnative/clutter-stage-egl.c:
	(clutter_stage_egl_realize):
	Don't use the createNativeWindow() call, it's not generic EGL.
This commit is contained in:
Robert Bradford 2007-10-09 13:56:29 +00:00
parent ac9aa06fcf
commit 9e3f1e0d4c
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2007-10-09 Rob Bradford <rob@openedhand.com>
* clutter/eglnative/clutter-backend-egl.c:
(clutter_backend_egl_dispose):
Call eglTerminate() on the display when the backend is disposed of.
* clutter/eglnative/clutter-stage-egl.c:
(clutter_stage_egl_realize):
Don't use the createNativeWindow() call, it's not generic EGL.
2007-10-09 Emmanuele Bassi <ebassi@openedhand.com> 2007-10-09 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-script-private.h: * clutter/clutter-script-private.h:

6
clutter/eglnative/clutter-backend-egl.c
View File

@ -134,6 +134,12 @@ clutter_backend_egl_dispose (GObject *gobject)
backend_egl->stage = NULL; backend_egl->stage = NULL;
} }
if (backend_egl->edpy)
{
eglTerminate (backend_egl->edpy);
backend_egl->edpy = NULL;
}
G_OBJECT_CLASS (clutter_backend_egl_parent_class)->dispose (gobject); G_OBJECT_CLASS (clutter_backend_egl_parent_class)->dispose (gobject);
} }

10
clutter/eglnative/clutter-stage-egl.c
View File

@ -15,9 +15,6 @@
G_DEFINE_TYPE (ClutterStageEGL, clutter_stage_egl, CLUTTER_TYPE_STAGE); G_DEFINE_TYPE (ClutterStageEGL, clutter_stage_egl, CLUTTER_TYPE_STAGE);
/* NOTE: EGL implementation needs to provide this function */
extern NativeWindowType createNativeWindow(void);
static void static void
clutter_stage_egl_show (ClutterActor *actor) clutter_stage_egl_show (ClutterActor *actor)
{ {
@ -80,8 +77,6 @@ clutter_stage_egl_realize (ClutterActor *actor)
if (G_LIKELY (!is_offscreen)) if (G_LIKELY (!is_offscreen))
{ {
NativeWindowType window;
EGLint cfg_attribs[] = { EGL_BUFFER_SIZE, EGL_DONT_CARE, EGLint cfg_attribs[] = { EGL_BUFFER_SIZE, EGL_DONT_CARE,
EGL_RED_SIZE, 5, EGL_RED_SIZE, 5,
EGL_GREEN_SIZE, 6, EGL_GREEN_SIZE, 6,
@ -115,13 +110,10 @@ clutter_stage_egl_realize (ClutterActor *actor)
if (stage_egl->egl_surface) if (stage_egl->egl_surface)
eglDestroySurface (clutter_egl_display(), stage_egl->egl_surface); eglDestroySurface (clutter_egl_display(), stage_egl->egl_surface);
/* EGL Implementation needs to provide createNativeWindow() */
window = createNativeWindow();
stage_egl->egl_surface stage_egl->egl_surface
= eglCreateWindowSurface (clutter_egl_display(), = eglCreateWindowSurface (clutter_egl_display(),
configs[0], configs[0],
window, NULL,
NULL); NULL);
eglQuerySurface (clutter_egl_display(), eglQuerySurface (clutter_egl_display(),