isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-30 03:50:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

2008-05-06 Matthew Allum <mallum@openedhand.com>

Browse Source 
* clutter/glx/clutter-glx-texture-pixmap.c:
        * clutter/x11/clutter-x11-texture-pixmap.c:
        More cleanups, safety additions.
This commit is contained in:
Matthew Allum 2008-05-06 19:57:05 +00:00
parent a1d0b30070
commit 0782e7d635
3 changed files with 125 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-05-06 Matthew Allum <mallum@openedhand.com>
* clutter/glx/clutter-glx-texture-pixmap.c:
* clutter/x11/clutter-x11-texture-pixmap.c:
More cleanups, safety additions.
2008-05-05 Øyvind Kolås <pippin@o-hand.com> 2008-05-05 Øyvind Kolås <pippin@o-hand.com>
* clutter/cogl/gl/cogl-primitives.c: * clutter/cogl/gl/cogl-primitives.c:

104
clutter/glx/clutter-glx-texture-pixmap.c
View File

@ -27,9 +27,7 @@
/* TODO: /* TODO:
* - Automagically handle named pixmaps, and window resizes (i.e * - Automagically handle named pixmaps, and window resizes (i.e
* essentially handle window id's being passed in) * essentially handle window id's being passed in) ?
* - Dont bomb out when an invalid pixmap is passed (trap damage handling)
* - track and trap referenced pixmap/win getting destroyed
*/ */
/** /**
@ -78,6 +76,9 @@ struct _ClutterGLXTexturePixmapPrivate
COGLenum target_type; COGLenum target_type;
guint texture_id; guint texture_id;
GLXPixmap glx_pixmap; GLXPixmap glx_pixmap;
gboolean use_fallback;
gboolean bound; gboolean bound;
}; };
@ -162,7 +163,7 @@ clutter_glx_texture_pixmap_notify (GObject *object, GParamSpec *pspec)
} }
} }
static void static gboolean
create_cogl_texture (ClutterTexture *texture, create_cogl_texture (ClutterTexture *texture,
guint width, guint width,
guint height) guint height)
@ -184,9 +185,10 @@ create_cogl_texture (ClutterTexture *texture,
(CLUTTER_X11_TEXTURE_PIXMAP (texture), (CLUTTER_X11_TEXTURE_PIXMAP (texture),
0, 0, 0, 0,
width, height); width, height);
return TRUE;
} }
else
g_warning ("unable to realize"); return FALSE;
} }
static void static void
@ -198,13 +200,18 @@ clutter_glx_texture_pixmap_realize (ClutterActor *actor)
priv = CLUTTER_GLX_TEXTURE_PIXMAP (actor)->priv; priv = CLUTTER_GLX_TEXTURE_PIXMAP (actor)->priv;
if (!_have_tex_from_pixmap_ext if (priv->use_fallback
|| !clutter_feature_available (COGL_FEATURE_TEXTURE_NPOT)) || !_have_tex_from_pixmap_ext
|| !(clutter_feature_available (COGL_FEATURE_TEXTURE_NPOT)
|| clutter_feature_available (COGL_FEATURE_TEXTURE_RECTANGLE)))
{ {
/* Fall back */ /* Fall back */
CLUTTER_NOTE (TEXTURE, "texture from pixmap appears unsupported"); CLUTTER_NOTE (TEXTURE, "texture from pixmap appears unsupported");
CLUTTER_NOTE (TEXTURE, "Falling back to X11 manual mechansim"); CLUTTER_NOTE (TEXTURE, "Falling back to X11 manual mechansim");
/* FIXME: Also check for sliced npots ? */ /* FIXME: Also check for sliced npots ? */
priv->use_fallback = TRUE;
CLUTTER_ACTOR_CLASS (clutter_glx_texture_pixmap_parent_class)-> CLUTTER_ACTOR_CLASS (clutter_glx_texture_pixmap_parent_class)->
realize (actor); realize (actor);
return; return;
@ -219,7 +226,16 @@ clutter_glx_texture_pixmap_realize (ClutterActor *actor)
if (!pixmap) if (!pixmap)
return; return;
create_cogl_texture (CLUTTER_TEXTURE (actor), pixmap_width, pixmap_height); if (!create_cogl_texture (CLUTTER_TEXTURE (actor),
pixmap_width, pixmap_height))
{
CLUTTER_NOTE (TEXTURE, "Unable to create a valid pixmap");
CLUTTER_NOTE (TEXTURE, "Falling back to X11 manual mechanism");
priv->use_fallback = TRUE;
CLUTTER_ACTOR_CLASS (clutter_glx_texture_pixmap_parent_class)->
realize (actor);
return;
}
CLUTTER_NOTE (TEXTURE, "texture pixmap realised"); CLUTTER_NOTE (TEXTURE, "texture pixmap realised");
} }
@ -243,7 +259,7 @@ clutter_glx_texture_pixmap_unrealize (ClutterActor *actor)
if (!CLUTTER_ACTOR_IS_REALIZED (actor)) if (!CLUTTER_ACTOR_IS_REALIZED (actor))
return; return;
if (priv->bound && priv->glx_pixmap) if (priv->glx_pixmap && priv->bound)
{ {
clutter_x11_trap_x_errors (); clutter_x11_trap_x_errors ();
@ -253,6 +269,8 @@ clutter_glx_texture_pixmap_unrealize (ClutterActor *actor)
XSync (clutter_x11_get_default_display(), FALSE); XSync (clutter_x11_get_default_display(), FALSE);
clutter_x11_untrap_x_errors (); clutter_x11_untrap_x_errors ();
priv->bound = FALSE;
} }
CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED); CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED);
@ -373,8 +391,7 @@ clutter_glx_texture_pixmap_free_glx_pixmap (ClutterGLXTexturePixmap *texture)
dpy = clutter_x11_get_default_display (); dpy = clutter_x11_get_default_display ();
if (_have_tex_from_pixmap_ext && if (priv->glx_pixmap &&
CLUTTER_ACTOR_IS_REALIZED (texture) &&
priv->bound) priv->bound)
{ {
texture_bind (texture); texture_bind (texture);
@ -391,19 +408,23 @@ clutter_glx_texture_pixmap_free_glx_pixmap (ClutterGLXTexturePixmap *texture)
CLUTTER_NOTE (TEXTURE, "Failed to release?"); CLUTTER_NOTE (TEXTURE, "Failed to release?");
CLUTTER_NOTE (TEXTURE, "Destroyed pxm: %li", priv->glx_pixmap); CLUTTER_NOTE (TEXTURE, "Destroyed pxm: %li", priv->glx_pixmap);
priv->bound = FALSE;
} }
clutter_x11_trap_x_errors (); clutter_x11_trap_x_errors ();
if (priv->glx_pixmap)
glXDestroyGLXPixmap (dpy, priv->glx_pixmap); glXDestroyGLXPixmap (dpy, priv->glx_pixmap);
XSync (dpy, FALSE); XSync (dpy, FALSE);
clutter_x11_untrap_x_errors (); clutter_x11_untrap_x_errors ();
priv->glx_pixmap = None;
} }
static void static void
clutter_glx_texture_pixmap_create_glx_pixmap (ClutterGLXTexturePixmap *texture) clutter_glx_texture_pixmap_create_glx_pixmap (ClutterGLXTexturePixmap *texture)
{ {
ClutterGLXTexturePixmapPrivate *priv = texture->priv; ClutterGLXTexturePixmapPrivate *priv = texture->priv;
GLXPixmap glx_pixmap; GLXPixmap glx_pixmap = None;
int attribs[7], i = 0; int attribs[7], i = 0;
GLXFBConfig *fbconfig; GLXFBConfig *fbconfig;
Display *dpy; Display *dpy;
@ -425,14 +446,16 @@ clutter_glx_texture_pixmap_create_glx_pixmap (ClutterGLXTexturePixmap *texture)
"pixmap", &pixmap, "pixmap", &pixmap,
NULL); NULL);
if (!pixmap) if (!pixmap)
return; {
goto cleanup;
}
fbconfig = get_fbconfig_for_depth (depth); fbconfig = get_fbconfig_for_depth (depth);
if (!fbconfig) if (!fbconfig)
{ {
g_warning ("Could not find an FBConfig for selected pixmap"); g_warning ("Could not find an FBConfig for selected pixmap");
return; goto cleanup;
} }
attribs[i++] = GLX_TEXTURE_FORMAT_EXT; attribs[i++] = GLX_TEXTURE_FORMAT_EXT;
@ -448,14 +471,18 @@ clutter_glx_texture_pixmap_create_glx_pixmap (ClutterGLXTexturePixmap *texture)
else else
{ {
g_warning ("Pixmap with depth bellow 24 are not supported"); g_warning ("Pixmap with depth bellow 24 are not supported");
return; goto cleanup;
} }
attribs[i++] = GLX_MIPMAP_TEXTURE_EXT; attribs[i++] = GLX_MIPMAP_TEXTURE_EXT;
attribs[i++] = 0; attribs[i++] = 0;
attribs[i++] = GLX_TEXTURE_TARGET_EXT; attribs[i++] = GLX_TEXTURE_TARGET_EXT;
if (clutter_feature_available (COGL_FEATURE_TEXTURE_NPOT))
attribs[i++] = GLX_TEXTURE_2D_EXT; attribs[i++] = GLX_TEXTURE_2D_EXT;
else
attribs[i++] = GLX_TEXTURE_RECTANGLE_EXT;
attribs[i++] = None; attribs[i++] = None;
@ -470,16 +497,18 @@ clutter_glx_texture_pixmap_create_glx_pixmap (ClutterGLXTexturePixmap *texture)
g_free (fbconfig); g_free (fbconfig);
if (glx_pixmap != None) cleanup:
{
if (priv->glx_pixmap) if (priv->glx_pixmap)
clutter_glx_texture_pixmap_free_glx_pixmap (texture); clutter_glx_texture_pixmap_free_glx_pixmap (texture);
if (glx_pixmap != None)
{
priv->glx_pixmap = glx_pixmap; priv->glx_pixmap = glx_pixmap;
if (!clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (texture))) if (!clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (texture)))
{ {
create_cogl_texture (texture, create_cogl_texture (CLUTTER_TEXTURE (texture),
pixmap_width, pixmap_width,
pixmap_height); pixmap_height);
} }
@ -488,6 +517,11 @@ clutter_glx_texture_pixmap_create_glx_pixmap (ClutterGLXTexturePixmap *texture)
return; return;
} }
else
{
priv->use_fallback = TRUE;
priv->glx_pixmap = None;
}
} }
static void static void
@ -506,11 +540,10 @@ clutter_glx_texture_pixmap_update_area (ClutterX11TexturePixmap *texture,
priv = CLUTTER_GLX_TEXTURE_PIXMAP (texture)->priv; priv = CLUTTER_GLX_TEXTURE_PIXMAP (texture)->priv;
dpy = clutter_x11_get_default_display(); dpy = clutter_x11_get_default_display();
if (!CLUTTER_ACTOR_IS_REALIZED (texture)) if (!CLUTTER_ACTOR_IS_REALIZED (texture))
return; return;
if (!_have_tex_from_pixmap_ext) if (priv->use_fallback)
{ {
parent_class->update_area (texture, parent_class->update_area (texture,
x, y, x, y,
@ -518,11 +551,8 @@ clutter_glx_texture_pixmap_update_area (ClutterX11TexturePixmap *texture,
return; return;
} }
if (_have_tex_from_pixmap_ext) if (priv->glx_pixmap == None)
{ return;
Display *dpy;
dpy = clutter_x11_get_default_display();
if (texture_bind (CLUTTER_GLX_TEXTURE_PIXMAP(texture))) if (texture_bind (CLUTTER_GLX_TEXTURE_PIXMAP(texture)))
{ {
@ -548,7 +578,6 @@ clutter_glx_texture_pixmap_update_area (ClutterX11TexturePixmap *texture,
if (CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR(texture))) if (CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR(texture)))
clutter_actor_queue_redraw (CLUTTER_ACTOR(texture)); clutter_actor_queue_redraw (CLUTTER_ACTOR(texture));
}
} }
@ -596,6 +625,25 @@ clutter_glx_texture_pixmap_class_init (ClutterGLXTexturePixmapClass *klass)
} }
} }
/**
* clutter_glx_texture_pixmap_using_extension:
* @texture: A #ClutterGLXTexturePixmap
*
* Return value: A boolean indicating if the texture is using the
* GLX_EXT_texture_from_pixmap OpenGL extension or falling back to
* slower software mechanism.
*
* Since: 0.8
**/
gboolean
clutter_glx_texture_pixmap_using_extension (ClutterGLXTexturePixmap *texture)
{
ClutterGLXTexturePixmapPrivate *priv;
priv = CLUTTER_GLX_TEXTURE_PIXMAP (texture)->priv;
return (priv->use_fallback != FALSE);
}
/** /**
* clutter_glx_texture_pixmap_new_with_pixmap: * clutter_glx_texture_pixmap_new_with_pixmap:
@ -608,7 +656,7 @@ clutter_glx_texture_pixmap_class_init (ClutterGLXTexturePixmapClass *klass)
* *
* Since: 0.8 * Since: 0.8
**/ **/
ClutterActor * ClutterActor*
clutter_glx_texture_pixmap_new_with_pixmap (Pixmap pixmap) clutter_glx_texture_pixmap_new_with_pixmap (Pixmap pixmap)
{ {
ClutterActor *actor; ClutterActor *actor;

11
clutter/x11/clutter-x11-texture-pixmap.c
View File

@ -310,7 +310,10 @@ free_damage_resources (ClutterX11TexturePixmap *texture)
if (priv->damage) if (priv->damage)
{ {
clutter_x11_trap_x_errors ();
XDamageDestroy (dpy, priv->damage); XDamageDestroy (dpy, priv->damage);
XSync (dpy, FALSE);
clutter_x11_untrap_x_errors ();
priv->damage = None; priv->damage = None;
} }
@ -797,7 +800,6 @@ clutter_x11_texture_pixmap_set_pixmap (ClutterX11TexturePixmap *texture,
clutter_x11_trap_x_errors (); clutter_x11_trap_x_errors ();
if (pixmap != None)
status = XGetGeometry (clutter_x11_get_default_display(), status = XGetGeometry (clutter_x11_get_default_display(),
(Drawable)pixmap, (Drawable)pixmap,
&root, &root,
@ -959,10 +961,15 @@ clutter_x11_texture_pixmap_set_automatic (ClutterX11TexturePixmap *texture,
{ {
clutter_x11_add_filter (on_x_event_filter, (gpointer)texture); clutter_x11_add_filter (on_x_event_filter, (gpointer)texture);
/* NOTE: Appears this will not work for a named pixmap */ clutter_x11_trap_x_errors ();
/* NOTE: Appears this will not work for a named pixmap ? */
priv->damage = XDamageCreate (dpy, priv->damage = XDamageCreate (dpy,
priv->pixmap, priv->pixmap,
XDamageReportNonEmpty); XDamageReportNonEmpty);
XSync (dpy, FALSE);
clutter_x11_untrap_x_errors ();
} }
else else
free_damage_resources (texture); free_damage_resources (texture);