isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-08-01 14:15:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

2007-06-29 Matthew Allum <mallum@openedhand.com>

Browse Source 
* clutter/clutter-texture.c: (texture_upload_data):
        Fix a SEGV for GL ES textures.

        * clutter/cogl/gles/cogl.c: (cogl_setup_viewport):
        Tweak default z_camera for 60 degrees like GL.

        * clutter/egl/clutter-backend-egl.c::
        * clutter/egl/clutter-stage-egl.c:
        Fix edpy usage (thanks to Kaj Gronholm).
This commit is contained in:
Matthew Allum
2007-06-29 11:54:31 +00:00
parent 9958a1e6d2
commit fda8a1d948
5 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
clutter/egl/clutter-backend-egl.c
View File

@@ -182,7 +182,7 @@ clutter_backend_egl_redraw (ClutterBackend *backend)
if (stage_egl->xwin)
{
/* clutter_feature_wait_for_vblank (); */
eglSwapBuffers ((EGLDisplay)stage_egl->xdpy, stage_egl->egl_surface);
eglSwapBuffers (backend_egl->edpy, stage_egl->egl_surface);
}
else
{
@@ -338,9 +338,9 @@ clutter_egl_untrap_x_errors (void)
/**
* clutter_egl_get_default_display:
*
* FIXME
* Returns the default X Display
*
* Return value: FIXME
* Return value: A Display pointer
*
* Since: 0.4
*/
@@ -398,8 +398,17 @@ clutter_egl_get_default_root_window (void)
return backend_singleton->xwin_root;
}
/**
* clutter_egl_display
*
* Gets the current EGLDisplay.
*
* Return value: an EGLDisplay
*
* Since: 0.4
*/
EGLDisplay
clutter_egl_display (void)
{
return (EGLDisplay)clutter_egl_get_default_display ();
return backend_singleton->edpy;
}

4
clutter/egl/clutter-stage-egl.c
View File

@@ -105,7 +105,7 @@ clutter_stage_egl_realize (ClutterActor *actor)
EGL_BLUE_SIZE, 5,
EGL_NONE };
status = eglGetConfigs (clutter_egl_get_default_display(),
status = eglGetConfigs (clutter_egl_display(),
configs,
2,
&config_count);
@@ -113,7 +113,7 @@ clutter_stage_egl_realize (ClutterActor *actor)
if (status != EGL_TRUE)
g_warning ("eglGetConfigs");
status = eglChooseConfig (clutter_egl_get_default_display(),
status = eglChooseConfig (clutter_egl_display(),
cfg_attribs,
configs,
sizeof configs / sizeof configs[0],