brl/mutter
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2007-06-29 Matthew Allum <mallum@openedhand.com>
* 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).
2007-06-29 Tomas Frydrych <tf@openedhand.com> 2007-06-29 Tomas Frydrych <tf@openedhand.com>
* clutter/clutter-group.c: * clutter/clutter-group.c:

10
clutter/clutter-texture.c
View File

@ -518,6 +518,11 @@ texture_upload_data (ClutterTexture *texture,
src_w = priv->x_tiles[x].size; src_w = priv->x_tiles[x].size;
src_h = priv->y_tiles[y].size; src_h = priv->y_tiles[y].size;
pixtmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
has_alpha,
8,
src_w, src_h);
/* clip */ /* clip */
if (priv->x_tiles[x].pos + src_w > priv->width) if (priv->x_tiles[x].pos + src_w > priv->width)
src_w = priv->width - priv->x_tiles[x].pos; src_w = priv->width - priv->x_tiles[x].pos;
@ -525,11 +530,6 @@ texture_upload_data (ClutterTexture *texture,
if (priv->y_tiles[y].pos + src_h > priv->height) if (priv->y_tiles[y].pos + src_h > priv->height)
src_h = priv->height - priv->y_tiles[y].pos; src_h = priv->height - priv->y_tiles[y].pos;
pixtmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
has_alpha,
8,
src_w, src_h);
gdk_pixbuf_copy_area (master_pixbuf, gdk_pixbuf_copy_area (master_pixbuf,
priv->x_tiles[x].pos, priv->x_tiles[x].pos,
priv->y_tiles[y].pos, priv->y_tiles[y].pos,

2
clutter/cogl/gles/cogl.c
View File

@ -521,7 +521,7 @@ cogl_setup_viewport (guint w,
* *
* See comments in ../gl/cogl.c * See comments in ../gl/cogl.c
*/ */
#define DEFAULT_Z_CAMERA 0.8699f #define DEFAULT_Z_CAMERA 0.869f
z_camera = CLUTTER_FLOAT_TO_FIXED (DEFAULT_Z_CAMERA); z_camera = CLUTTER_FLOAT_TO_FIXED (DEFAULT_Z_CAMERA);
if (fovy != CFX_60) if (fovy != CFX_60)

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

@ -182,7 +182,7 @@ clutter_backend_egl_redraw (ClutterBackend *backend)
if (stage_egl->xwin) if (stage_egl->xwin)
{ {
/* clutter_feature_wait_for_vblank (); */ /* clutter_feature_wait_for_vblank (); */
eglSwapBuffers ((EGLDisplay)stage_egl->xdpy, stage_egl->egl_surface); eglSwapBuffers (backend_egl->edpy, stage_egl->egl_surface);
} }
else else
{ {
@ -338,9 +338,9 @@ clutter_egl_untrap_x_errors (void)
/** /**
* clutter_egl_get_default_display: * clutter_egl_get_default_display:
* *
* FIXME * Returns the default X Display
* *
* Return value: FIXME * Return value: A Display pointer
* *
* Since: 0.4 * Since: 0.4
*/ */
@ -398,8 +398,17 @@ clutter_egl_get_default_root_window (void)
return backend_singleton->xwin_root; return backend_singleton->xwin_root;
} }
/**
* clutter_egl_display
*
* Gets the current EGLDisplay.
*
* Return value: an EGLDisplay
*
* Since: 0.4
*/
EGLDisplay EGLDisplay
clutter_egl_display (void) 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_BLUE_SIZE, 5,
EGL_NONE }; EGL_NONE };
status = eglGetConfigs (clutter_egl_get_default_display(), status = eglGetConfigs (clutter_egl_display(),
configs, configs,
2, 2,
&config_count); &config_count);
@ -113,7 +113,7 @@ clutter_stage_egl_realize (ClutterActor *actor)
if (status != EGL_TRUE) if (status != EGL_TRUE)
g_warning ("eglGetConfigs"); g_warning ("eglGetConfigs");
status = eglChooseConfig (clutter_egl_get_default_display(), status = eglChooseConfig (clutter_egl_display(),
cfg_attribs, cfg_attribs,
configs, configs,
sizeof configs / sizeof configs[0], sizeof configs / sizeof configs[0],