43efab46bc
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
147 lines
4.4 KiB
Makefile
147 lines
4.4 KiB
Makefile
include $(top_srcdir)/build/autotools/Makefile.am.silent
|
|
|
|
NULL =
|
|
|
|
noinst_PROGRAMS = test-conformance
|
|
|
|
test_conformance_SOURCES = \
|
|
test-conform-main.c \
|
|
test-conform-common.c \
|
|
test-conform-common.h \
|
|
\
|
|
test-timeline-interpolate.c \
|
|
test-timeline-rewind.c \
|
|
test-timeline.c \
|
|
test-vertex-buffer-contiguous.c \
|
|
test-vertex-buffer-interleved.c \
|
|
test-vertex-buffer-mutability.c \
|
|
test-path.c \
|
|
test-pick.c \
|
|
test-clutter-rectangle.c \
|
|
test-clutter-fixed.c \
|
|
test-actor-invariants.c \
|
|
test-paint-opacity.c \
|
|
test-backface-culling.c \
|
|
test-binding-pool.c \
|
|
test-clutter-text.c \
|
|
test-text-cache.c \
|
|
test-anchors.c \
|
|
test-npot-texture.c \
|
|
test-model.c \
|
|
test-blend-strings.c \
|
|
test-color.c \
|
|
test-clutter-units.c \
|
|
test-premult.c \
|
|
test-materials.c \
|
|
test-group.c \
|
|
test-actor-size.c \
|
|
$(NULL)
|
|
|
|
# For convenience, this provides a way to easily run individual unit tests:
|
|
.PHONY: wrappers clean-wrappers
|
|
|
|
UNIT_TESTS = `./test-conformance -l -m thorough | $(GREP) '^/'`
|
|
|
|
wrappers: stamp-test-conformance
|
|
@true
|
|
stamp-test-conformance: test-conformance$(EXEEXT)
|
|
@for i in $(UNIT_TESTS); \
|
|
do \
|
|
unit=`basename $$i | sed -e s/_/-/g`; \
|
|
echo " GEN $$unit"; \
|
|
( echo "#!/bin/sh" ; echo "$(top_srcdir)/tests/conform/test-launcher.sh '$$i'" ) > $$unit$(EXEEXT) ; \
|
|
chmod +x $$unit$(EXEEXT); \
|
|
done \
|
|
&& echo timestamp > $(@F)
|
|
|
|
clean-wrappers:
|
|
@for i in $(UNIT_TESTS); \
|
|
do \
|
|
unit=`basename $$i | sed -e s/_/-/g`; \
|
|
echo " RM $$unit"; \
|
|
rm -f $$unit$(EXEEXT) ; \
|
|
done \
|
|
&& rm -f stamp-test-conformance
|
|
|
|
# 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
|
|
|
|
test_conformance_CFLAGS = \
|
|
-I$(top_srcdir)/ \
|
|
-I$(top_srcdir)/clutter \
|
|
-I$(top_srcdir)/clutter/cogl \
|
|
-I$(top_builddir)/clutter \
|
|
-I$(top_builddir)/clutter/cogl \
|
|
-DG_DISABLE_SINGLE_INCLUDES \
|
|
$(CLUTTER_CFLAGS) \
|
|
$(MAINTAINER_CFLAGS)
|
|
|
|
test_conformance_LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la
|
|
|
|
.PHONY: test
|
|
.PHONY: test-report test-report-normal test-report-disable-npots
|
|
.PHONY: full-report full-report-normal full-report-disable-npots
|
|
.PHONY: full-report-generate
|
|
|
|
test:
|
|
@gtester -o=test-conformance-results.xml ./test-conformance
|
|
|
|
test-verbose:
|
|
@gtester --verbose -o=test-conformance-result.xml ./test-conformance
|
|
|
|
test-report-normal:
|
|
@gtester -o=test-conformance-results.xml -k ./test-conformance \
|
|
&& ( gtester-report test-conformance-results.xml \
|
|
| sed 's/>GTester Unit Test Report</>GTester Unit Test Report (normal)</' \
|
|
> test-conformance-results.html ) \
|
|
&& gnome-open ./test-conformance-results.html
|
|
|
|
test-report-disable-npots:
|
|
@../tools/disable-npots.sh \
|
|
gtester -o=test-conformance-results-dn.xml -k ./test-conformance \
|
|
&& ( gtester-report test-conformance-results-dn.xml \
|
|
| sed 's/>GTester Unit Test Report</>GTester Unit Test Report (no NPOTs)</' \
|
|
> test-conformance-results-dn.html ) \
|
|
&& gnome-open ./test-conformance-results-dn.html
|
|
|
|
test-report: test-report-normal
|
|
|
|
full-report-normal:
|
|
@gtester -o=test-conformance-results.xml -k -m=slow ./test-conformance \
|
|
&& ( gtester-report test-conformance-results.xml \
|
|
| sed 's/>GTester Unit Test Report</>GTester Unit Test Report (normal)</' \
|
|
> test-conformance-results.html )
|
|
|
|
full-report-disable-npots:
|
|
@../tools/disable-npots.sh \
|
|
gtester -o=test-conformance-results-dn.xml -k -m=slow ./test-conformance \
|
|
&& ( gtester-report test-conformance-results-dn.xml \
|
|
| sed 's/>GTester Unit Test Report</>GTester Unit Test Report (no NPOTs)</' \
|
|
> test-conformance-results-dn.html )
|
|
|
|
XML_REPORTS = test-conformance-results.xml
|
|
HTML_REPORTS = test-conformance-results.html
|
|
|
|
if HAVE_LIBDL
|
|
XML_REPORTS += test-conformance-results-dn.xml
|
|
HTML_REPORTS += test-conformance-results-dn.html
|
|
full-report-generate: full-report-normal full-report-disable-npots
|
|
|
|
else
|
|
full-report-generate: full-report-normal
|
|
|
|
endif
|
|
|
|
full-report: full-report-generate
|
|
@for x in $(HTML_REPORTS); do \
|
|
gnome-open "$$x"; \
|
|
done
|
|
|
|
EXTRA_DIST = ADDING_NEW_TESTS test-launcher.sh
|
|
|
|
# we override the clean-generic target to clean up the wrappers so
|
|
# we cannot use CLEANFILES
|
|
clean-generic: clean-wrappers
|
|
$(QUIET_RM)rm -f $(XML_REPORTS) $(HTML_REPORTS)
|