summaryrefslogtreecommitdiff
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorMatthew Allum <mallum@openedhand.com>2008-04-15 21:18:13 +0000
committerMatthew Allum <mallum@openedhand.com>2008-04-15 21:18:13 +0000
commitc2cb5bf64a8e13a3d001c59edf65ae0bca45419c (patch)
treec9fa43562756fbebdfc47a5cc8614e029b06d93a /tests/Makefile.am
parent3d1f2a0859836a1dfc0aa54023fe5a05ce1f8849 (diff)
downloadclutter-c2cb5bf64a8e13a3d001c59edf65ae0bca45419c.tar.gz
2008-04-15 Matthew Allum <mallum@openedhand.com>
Work related to #873; * clutter/glx/clutter-backend-glx.c: * clutter/glx/clutter-backend-glx.h: * clutter/x11/clutter-x11-texture-pixmap.c: * clutter/x11/clutter-x11-texture-pixmap.h: General cleanup of texture pixmap code, adding; - Pixmap dimentions and depth now auto probed, read only props. - More X safety traps - Add support for optionally tracking damage and automatically updating texture. * clutter/glx/clutter-glx-texture-pixmap.c: * clutter/glx/clutter-glx-texture-pixmap.h: General cleanup and some safety additions. Needs more work so 'proper' subclass - dependent on new COGL. * clutter/x11/clutter-backend-x11.c: (clutter_x11_remove_filter): Invert g_return_if check. * configure.ac: Pull in XComposite and XDamage (at least for now) * tests/Makefile.am: * tests/test-pixmap.c: Add a modified test from Johan for above.
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a5186bf93..a14a5b1b6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,7 +7,7 @@ noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
test-threads test-timeline test-score test-script \
test-model test-grab test-effects test-fullscreen \
test-shader test-unproject test-viewport test-fbo \
- test-opacity test-multistage
+ test-opacity test-multistage test-pixmap
INCLUDES = -I$(top_srcdir)/
LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_MAJORMINOR@.la
@@ -44,5 +44,6 @@ test_viewport_SOURCES = test-viewport.c
test_fbo_SOURCES = test-fbo.c
test_opacity_SOURCES = test-opacity.c
test_multistage_SOURCES = test-multistage.c
+test_pixmap_SOURCES = test-pixmap.c
EXTRA_DIST = redhand.png test-script.json