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

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

Browse Source 
* clutter/x11/clutter-x11-texture-pixmap.c:
        * configure.ac:
        * tests/Makefile.am:
        Remove the XComposite dep from Clutter itself, just use
        in test-pixmap (if available)
This commit is contained in:
Matthew Allum 2008-05-12 16:22:16 +00:00
parent 101a3cac4e
commit f360f81f22
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-05-12 Matthew Allum <mallum@openedhand.com>
* clutter/x11/clutter-x11-texture-pixmap.c:
* configure.ac:
* tests/Makefile.am:
Remove the XComposite dep from Clutter itself, just use
in test-pixmap (if available)
2008-05-12 Emmanuele Bassi <ebassi@openedhand.com> 2008-05-12 Emmanuele Bassi <ebassi@openedhand.com>
Rework the stage wrapper/implementation relation: remove Rework the stage wrapper/implementation relation: remove

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

@ -49,7 +49,6 @@
/* FIXME: Check exts exist in autogen */ /* FIXME: Check exts exist in autogen */
#include <X11/extensions/Xdamage.h> #include <X11/extensions/Xdamage.h>
#include <X11/extensions/Xcomposite.h>
#include <sys/ipc.h> #include <sys/ipc.h>
#include <sys/shm.h> #include <sys/shm.h>
@ -109,7 +108,6 @@ G_DEFINE_TYPE (ClutterX11TexturePixmap, \
static gboolean static gboolean
check_extensions (ClutterX11TexturePixmap *texture) check_extensions (ClutterX11TexturePixmap *texture)
{ {
int event_base, error_base;
int damage_error; int damage_error;
ClutterX11TexturePixmapPrivate *priv; ClutterX11TexturePixmapPrivate *priv;
Display *dpy; Display *dpy;
@ -121,12 +119,6 @@ check_extensions (ClutterX11TexturePixmap *texture)
dpy = clutter_x11_get_default_display(); dpy = clutter_x11_get_default_display();
if (!XCompositeQueryExtension (dpy, &event_base, &error_base))
{
g_warning ("No composite extension\n");
return FALSE;
}
if (!XDamageQueryExtension (dpy, if (!XDamageQueryExtension (dpy,
&_damage_event_base, &damage_error)) &_damage_event_base, &damage_error))
{ {

13
configure.ac
View File

@ -156,12 +156,10 @@ if test x$have_xdamage = xyes; then
X11_LIBS="$X11_LIBS -lXdamage" X11_LIBS="$X11_LIBS -lXdamage"
fi fi
# FIXME: Composite 0.3/0.4 likely needed when window redirection complete. # Composite 0.4 just needed for tests
# though may not be needed at all PKG_CHECK_MODULES(XCOMPOSITE, xcomposite >= 0.4, [have_xcomposite=yes], [have_xcomposite=no])
PKG_CHECK_MODULES(XCOMPOSITE, xcomposite, [have_xcomposite=yes], [have_xcomposite=no])
if test x$have_xcomposite = xyes; then if test x$have_xcomposite = xyes; then
AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension]) AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension])
X11_LIBS="$X11_LIBS -lXcomposite"
fi fi
x11_tests=no x11_tests=no
@ -169,11 +167,14 @@ x11_tests=no
# Currently require all extentions, may not for actual release. # Currently require all extentions, may not for actual release.
if test "x$clutterbackend" = "xglx" || test "x$clutterbackend" = "xeglx" if test "x$clutterbackend" = "xglx" || test "x$clutterbackend" = "xeglx"
then then
if test "x$have_xdamage" = "xno" || test "x$have_xfixes" = "xno" || test "x$have_xcomposite" = "xno" if test "x$have_xdamage" = "xno" || test "x$have_xfixes" = "xno"
then then
AC_MSG_ERROR([[Required backend X11 Libraries not found.]]) AC_MSG_ERROR([[Required backend X11 Libraries not found.]])
fi fi
if test "x$have_xcomposite" = "xyes"
then
x11_tests=yes x11_tests=yes
fi
fi fi
AM_CONDITIONAL(X11_TESTS, test "x$x11_tests" != "xno") AM_CONDITIONAL(X11_TESTS, test "x$x11_tests" != "xno")
@ -219,7 +220,7 @@ case $glesversion in
;; ;;
2*) 2*)
clutter_gl_header="GLES2/gl2.h" clutter_gl_header="GLES2/gl2.h"
CLUTTER_COGL="gl" CLUTTER_COGL="gles"
AC_DEFINE([HAVE_COGL_GLES2], 1, [Have GL/ES for rendering]) AC_DEFINE([HAVE_COGL_GLES2], 1, [Have GL/ES for rendering])
AC_CHECK_HEADERS([EGL/egl.h],, AC_CHECK_HEADERS([EGL/egl.h],,

1
tests/Makefile.am
View File

@ -53,6 +53,7 @@ test_fbo_SOURCES = test-fbo.c
test_opacity_SOURCES = test-opacity.c test_opacity_SOURCES = test-opacity.c
test_multistage_SOURCES = test-multistage.c test_multistage_SOURCES = test-multistage.c
test_pixmap_SOURCES = test-pixmap.c test_pixmap_SOURCES = test-pixmap.c
test_pixmap_LDFLAGS = -lXcomposite
test_cogl_primitives_SOURCES = test-cogl-primitives.c test_cogl_primitives_SOURCES = test-cogl-primitives.c
test_cogl_tex_tile_SOURCES = test-cogl-tex-tile.c test_cogl_tex_tile_SOURCES = test-cogl-tex-tile.c
test_cogl_tex_convert_SOURCES = test-cogl-tex-convert.c test_cogl_tex_convert_SOURCES = test-cogl-tex-convert.c