mirror of
https://github.com/brl/mutter.git
synced 2024-11-13 01:36:10 -05:00
e9a45c7744
Conflicts:
clutter/cogl/gl/cogl-texture.c
clutter/cogl/gles/cogl-primitives.c
* cogl-material:
clutter-{clone-,}texture weren't updating their material opacity.
Updates GLES1 support for CoglMaterial
Normalizes gl vs gles code in preperation for synching material changes
Removes cogl_blend_func and cogl_alpha_func
Fully integrates CoglMaterial throughout the rest of Cogl
[cogl-material] Restore the GL_TEXTURE_ENV_MODE after material_rectangle
[cogl-material] Make the user_tex_coords parameter of _rectangle const
[test-cogl-material] Remove return value from material_rectangle_paint
Add cogl-material.h and cogl-matrix.h to libclutterinclude_HEADERS
[cogl-material] improvements for cogl_material_rectangle
[cogl-material] Adds a cogl_material_set_color function
[cogl-material] Some improvements for how we sync CoglMaterial state with OpenGL
[cogl-material] Converts clutter-texture/clutter-clone-texture to the material API
[doc] Hooks up cogl-material reference documentation
Updates previous GLES multi-texturing code to use CoglMaterial
Adds a CoglMaterial abstraction, which includes support for multi-texturing
[doc] Hooks up cogl-matrix reference documentation
Adds CoglMatrix utility code
[tests] Adds an interactive unit test for multi-texturing
[multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2
85 lines
2.2 KiB
Makefile
85 lines
2.2 KiB
Makefile
|
|
UNIT_TESTS = \
|
|
test-textures.c \
|
|
test-events.c \
|
|
test-offscreen.c \
|
|
test-scale.c \
|
|
test-actors.c \
|
|
test-behave.c \
|
|
test-project.c \
|
|
test-perspective.c \
|
|
test-rotate.c \
|
|
test-depth.c \
|
|
test-threads.c \
|
|
test-score.c \
|
|
test-script.c \
|
|
test-model.c \
|
|
test-grab.c \
|
|
test-fullscreen.c \
|
|
test-shader.c \
|
|
test-unproject.c \
|
|
test-viewport.c \
|
|
test-fbo.c \
|
|
test-multistage.c \
|
|
test-cogl-primitives.c \
|
|
test-cogl-tex-tile.c \
|
|
test-cogl-tex-convert.c \
|
|
test-cogl-tex-foreign.c \
|
|
test-cogl-tex-getset.c \
|
|
test-cogl-offscreen.c \
|
|
test-cogl-tex-polygon.c \
|
|
test-cogl-multitexture.c \
|
|
test-stage-read-pixels.c \
|
|
test-random-text.c \
|
|
test-clip.c \
|
|
test-paint-wrapper.c \
|
|
test-texture-quality.c \
|
|
test-layout.c \
|
|
test-animation.c \
|
|
test-easing.c \
|
|
test-binding-pool.c \
|
|
test-text.c \
|
|
test-text-field.c \
|
|
test-clutter-cairo-flowers.c
|
|
|
|
if X11_TESTS
|
|
UNIT_TESTS += test-pixmap.c
|
|
UNIT_TESTS += test-devices.c
|
|
endif
|
|
|
|
#FIXME - this is is a bit of a yukky way of ensuring the tests find our data:
|
|
test-script.json:
|
|
ln -sf $(top_srcdir)/tests/data/test-script.json
|
|
redhand.png:
|
|
ln -sf $(top_srcdir)/tests/data/redhand.png
|
|
redhand_alpha.png:
|
|
ln -sf $(top_srcdir)/tests/data/redhand_alpha.png
|
|
light0.png:
|
|
ln -sf $(top_srcdir)/tests/data/light0.png
|
|
light1.png:
|
|
ln -sf $(top_srcdir)/tests/data/light1.png
|
|
|
|
# For convenience, this provides a way to easily run individual unit tests:
|
|
.PHONY: wrappers
|
|
wrappers: test-interactive$(EXEEXT)
|
|
for i in $(UNIT_TESTS); \
|
|
do \
|
|
ln -sf $(top_srcdir)/tests/interactive/wrapper.sh $${i%*.c}; \
|
|
done
|
|
|
|
# NB: BUILT_SOURCES here a misnomer. We aren't building source, just inserting
|
|
# a phony rule that will generate symlink scripts for running individual tests
|
|
BUILT_SOURCES = wrappers redhand.png redhand_alpha.png light0.png light1.png test-script.json
|
|
|
|
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter
|
|
LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_MAJORMINOR@.la
|
|
AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
|
|
AM_LDFLAGS = $(CLUTTER_LIBS)
|
|
|
|
noinst_PROGRAMS = test-interactive
|
|
|
|
test_interactive_SOURCES = \
|
|
test-main.c \
|
|
$(UNIT_TESTS)
|
|
test_interactive_LDFLAGS = -export-dynamic
|