1 commit f245f3049d8bb09c5177b4e1c19ab8f5552549b4
2 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3 Date: Tue Jul 28 13:23:26 2009 +0100
7 configure.ac | 9 ++++-----
8 1 file changed, 4 insertions(+), 5 deletions(-)
10 commit 93ecd6d0c43bbdf5bba61134394c76da192d97f5
11 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12 Date: Tue Jul 28 12:20:07 2009 +0100
16 NEWS | 26 ++++++++++++++++++++++++++
17 1 file changed, 26 insertions(+)
19 commit 77fdd7494e9ccaced094ce825022518dd50d1eaa
20 Author: Emmanuele Bassi <ebassi@linux.intel.com>
21 Date: Tue Jul 28 13:57:07 2009 +0100
23 Fix compiler warnings when COGL debug level=minimum
25 clutter/cogl/common/cogl-debug.c | 2 +-
26 clutter/pango/cogl-pango-render.c | 4 +++-
27 2 files changed, 4 insertions(+), 2 deletions(-)
29 commit 85b69237a9e0d2eb42634d9f837bc6544379f258
30 Author: Emmanuele Bassi <ebassi@linux.intel.com>
31 Date: Tue Jul 28 12:19:44 2009 +0100
33 [docs] Point the TODO to Bugzilla
36 1 file changed, 3 insertions(+), 3 deletions(-)
38 commit c6830791673d31b74dfb87d6bda472de040dc3f8
39 Author: Emmanuele Bassi <ebassi@linux.intel.com>
40 Date: Tue Jul 28 12:19:26 2009 +0100
42 [docs] Update requirements and release notes
44 README | 80 +++++++++++++++++++++++++++++++++++++++++++++++++---------------
45 1 file changed, 62 insertions(+), 18 deletions(-)
47 commit a5d6b233086faa03512975763b286c7ea44b7fec
48 Author: Emmanuele Bassi <ebassi@linux.intel.com>
49 Date: Tue Jul 28 13:43:52 2009 +0100
51 [units] Add binding-friendly initializers
53 We should follow the convention for boxed types initializers of:
55 <type_name>_from_<another_type> (boxed, value)
57 For ClutterUnits as well; so:
59 clutter_units_pixels -> clutter_units_from_pixels
60 clutter_units_em -> clutter_units_from_em
63 We should still keep the short-hand version as a macro, though.
65 clutter/clutter-units.c | 36 +++++++++---------
66 clutter/clutter-units.h | 55 ++++++++++++++++------------
67 doc/reference/clutter/clutter-sections.txt | 15 +++++---
68 tests/conform/test-clutter-units.c | 8 ++--
69 4 files changed, 63 insertions(+), 51 deletions(-)
71 commit 57baa2f0bcd37269f029351736681396739263bd
72 Author: Emmanuele Bassi <ebassi@linux.intel.com>
73 Date: Tue Jul 28 13:20:32 2009 +0100
75 [animation] Fix variable use
77 Instead of using the proper typed variables we were overwriting
78 the gpointer for the Interval's final value.
80 clutter/clutter-animation.c | 4 ++--
81 1 file changed, 2 insertions(+), 2 deletions(-)
83 commit f4ad3761c48f0cd04c04e4de334c5492eae010cc
84 Author: Neil Roberts <neil@linux.intel.com>
85 Date: Tue Jul 28 12:03:55 2009 +0100
87 [win32] Remove the call to clutter_redraw in clutter_stage_win32_show
89 Since commit 7b811f8b this is done in clutter_stage_show so there is
90 no need for it in the backends.
92 clutter/win32/clutter-stage-win32.c | 10 +---------
93 1 file changed, 1 insertion(+), 9 deletions(-)
95 commit df586eb507adeed9b83e53c667e706cd1807601a
96 Author: Neil Roberts <neil@linux.intel.com>
97 Date: Tue Jul 28 12:00:49 2009 +0100
99 [win32] Move the show/hide to be implementations of the interface
101 This makes clutter_stage_win32_show/hide be implementations of
102 ClutterStageWindowIface rather than overriding the methods in
103 ClutterActor. This reflects the changes in e4ff24bc for the X11
106 clutter/win32/clutter-stage-win32.c | 4 ++--
107 1 file changed, 2 insertions(+), 2 deletions(-)
109 commit c0cf6146343e852d3ebbca79e701d53bcddaa2d5
110 Author: Neil Roberts <neil@linux.intel.com>
111 Date: Tue Jul 28 11:58:34 2009 +0100
113 [build/mingw] Update Cairo version to 1.8.6 in mingw-cross-compile.sh
115 The Pango 1.22 binaries require Cairo 1.8.0 to get
116 cairo_show_text_glyphs.
118 build/mingw/mingw-cross-compile.sh | 2 +-
119 1 file changed, 1 insertion(+), 1 deletion(-)
121 commit a1cef026c5eff04f1233d2e9b096987716987cb9
122 Author: Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>
123 Date: Tue Jul 7 20:02:25 2009 +0200
125 Avoid near/far identifier names.
127 Leads to conflict with system headers on Windows, where macros named
128 "near" and "far" are defined.
130 clutter/cogl/common/cogl-matrix.c | 8 ++++----
131 1 file changed, 4 insertions(+), 4 deletions(-)
133 commit 05883af1f6362b3ad5a762e70412f20aaf608bf9
134 Author: Ole André Vadla Ravnås <oleavr@gmail.com>
135 Date: Wed Jul 1 16:29:12 2009 +0200
137 Remove unused variable to fix compiler warning.
139 clutter/json/json-object.c | 2 --
140 1 file changed, 2 deletions(-)
142 commit 01578512706fb4bd46d99574a8282cd4d25f7bad
143 Author: Ole André Vadla Ravnås <oleavr@gmail.com>
144 Date: Wed Jul 1 16:27:11 2009 +0200
146 Call glClientActiveTexture() through COGL context.
148 Fixes build issues on systems with OpenGL header older than 1.3.
150 clutter/cogl/common/cogl.c | 4 ++++
151 clutter/cogl/gl/cogl-primitives.c | 2 ++
152 2 files changed, 6 insertions(+)
154 commit f61f66c6fe18ad4e8c07379c19cdd3e1bff216b6
155 Author: Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>
156 Date: Tue Jun 16 22:29:21 2009 +0200
158 Avoid C99 to fix compilation with compilers like MSVC.
160 clutter/cogl/common/cogl-blend-string.c | 20 ++++++++++----------
161 clutter/cogl/common/cogl-primitives.c | 8 ++++++--
162 clutter/cogl/common/cogl.c | 4 +++-
163 3 files changed, 19 insertions(+), 13 deletions(-)
165 commit ab5a10768c225230aad25299d129269c88df1e54
166 Author: Ole André Vadla Ravnås <oleavr@gmail.com>
167 Date: Mon May 18 17:30:36 2009 +0200
169 Initialize pixel data before glReadPixels().
171 clutter/clutter-main.c | 2 +-
172 1 file changed, 1 insertion(+), 1 deletion(-)
174 commit 9cf8410b0fba4d7cb508968830ee095d92cf5d74
175 Author: Haakon Sporsheim <haakon.sporsheim@gmail.com>
176 Date: Tue Mar 31 14:45:45 2009 +0200
178 Reposition variable declarations to avoid C99.
180 tests/interactive/test-cogl-vertex-buffer.c | 3 ++-
181 1 file changed, 2 insertions(+), 1 deletion(-)
183 commit 94a571ea76ee20b93a8db04e980d08bf283ed34b
184 Author: Haakon Sporsheim <haakon.sporsheim@gmail.com>
185 Date: Tue Mar 31 14:44:46 2009 +0200
187 Add MSVC preprocessor guards in test-clutter-cairo-flowers.c
189 tests/interactive/test-clutter-cairo-flowers.c | 7 ++++++-
190 1 file changed, 6 insertions(+), 1 deletion(-)
192 commit fa4a37072ed3113862802b1a97be6dfb74abcdd2
193 Author: Haakon Sporsheim <haakon.sporsheim@gmail.com>
194 Date: Tue Mar 31 14:43:12 2009 +0200
196 Add white_color a variable on the stack.
198 tests/interactive/test-scale.c | 3 ++-
199 1 file changed, 2 insertions(+), 1 deletion(-)
201 commit fe416fb745fe4293e889d5179707051c959af921
202 Author: Haakon Sporsheim <haakon.sporsheim@gmail.com>
203 Date: Tue Mar 31 14:41:44 2009 +0200
205 Add int dummy; to empty struct TestConformSimpleFixture definition.
207 tests/conform/test-conform-common.h | 1 +
208 1 file changed, 1 insertion(+)
210 commit f852ade82379c6241683df741448be6146bb76ce
211 Author: Haakon Sporsheim <haakon.sporsheim@gmail.com>
212 Date: Tue Mar 31 14:39:46 2009 +0200
214 Remove config.h inclusion.
216 tests/interactive/test-fbo.c | 1 -
217 tests/interactive/test-shader.c | 1 -
218 2 files changed, 2 deletions(-)
220 commit e4eed92177e6720b9713227ca4b1ecd0f5ce8c0b
221 Author: Haakon Sporsheim <haakon.sporsheim@gmail.com>
222 Date: Tue Mar 31 14:37:07 2009 +0200
224 Reposition variable declarations to avoid C99.
226 clutter/cogl/common/cogl-material.c | 3 ++-
227 clutter/cogl/common/cogl-matrix.c | 6 ++++--
228 2 files changed, 6 insertions(+), 3 deletions(-)
230 commit dbc9c16259e55e3715dcd2c0286c13597a45d71d
231 Author: Neil Roberts <neil@linux.intel.com>
232 Date: Tue Jul 28 10:39:18 2009 +0100
234 Remove the MSVC build files
236 These are hopelessly out of date so they just cause more trouble than
239 Anyone interested in building with MSVC would be better off starting
240 from the build files available as part of the OAH project which is
243 https://launchpad.net/oah
245 build/msvc_2k5/README | 62 ---
246 build/msvc_2k5/clutter-version.h | 27 --
247 build/msvc_2k5/clutter.sln | 131 ------
248 build/msvc_2k5/clutter.vcproj | 772 --------------------------------
249 build/msvc_2k5/test-actors.vcproj | 201 ---------
250 build/msvc_2k5/test-behave.vcproj | 201 ---------
251 build/msvc_2k5/test-boxes.vcproj | 177 --------
252 build/msvc_2k5/test-depth.vcproj | 201 ---------
253 build/msvc_2k5/test-entry.vcproj | 177 --------
254 build/msvc_2k5/test-events.vcproj | 177 --------
255 build/msvc_2k5/test-offscreen.vcproj | 177 --------
256 build/msvc_2k5/test-perspective.vcproj | 177 --------
257 build/msvc_2k5/test-project.vcproj | 177 --------
258 build/msvc_2k5/test-rotate.vcproj | 201 ---------
259 build/msvc_2k5/test-scale.vcproj | 177 --------
260 build/msvc_2k5/test-score.vcproj | 177 --------
261 build/msvc_2k5/test-script.vcproj | 201 ---------
262 build/msvc_2k5/test-text.vcproj | 183 --------
263 build/msvc_2k5/test-textures.vcproj | 177 --------
264 build/msvc_2k5/test-threads.vcproj | 177 --------
265 build/msvc_2k5/test-timeline.vcproj | 177 --------
266 build/msvc_2k5/version.rc | 48 --
267 22 files changed, 4175 deletions(-)
269 commit fa3728126fe39e7a885184a2b69a93ac2ea34aa8
270 Author: Emmanuele Bassi <ebassi@linux.intel.com>
271 Date: Tue Jul 28 11:25:11 2009 +0100
273 [animation] Force the final state inside ::completed
275 In case we are skipping too many frames, we should force the animation
276 instance to apply the final state of the animated interval inside the
277 ::completed signal handler.
279 clutter/clutter-animation.c | 18 +++++++++++++++++-
280 1 file changed, 17 insertions(+), 1 deletion(-)
282 commit a8eb5bd461369979d75d40a1a6d17aa43141643e
283 Author: Emmanuele Bassi <ebassi@linux.intel.com>
284 Date: Mon Jul 27 17:24:35 2009 +0100
286 [build] Generate ChangeLog from the Git import
288 Makefile.am | 5 +++--
289 1 file changed, 3 insertions(+), 2 deletions(-)
291 commit 76140c5f521a8912786c292a2699b48a7b873d16
292 Author: Emmanuele Bassi <ebassi@linux.intel.com>
293 Date: Mon Jul 27 16:51:14 2009 +0100
295 [build] Use API_VERSION, not MAJORMINOR
297 The correct macro for Clutter's API version is CLUTTER_API_VERSION,
298 not CLUTTER_MAJORMINOR anymore.
300 doc/reference/clutter/Makefile.am | 2 +-
301 doc/reference/cogl/Makefile.am | 2 +-
302 tests/conform/Makefile.am | 2 +-
303 tests/interactive/Makefile.am | 2 +-
304 tests/micro-bench/Makefile.am | 3 ++-
305 5 files changed, 6 insertions(+), 5 deletions(-)
307 commit 42ea471e330bbff217e7d5c199885e3991a47e06
308 Author: Emmanuele Bassi <ebassi@linux.intel.com>
309 Date: Mon Jul 27 16:10:07 2009 +0100
311 Remove explicit size of the Vertex arrays
313 The Vertex arrays passed to some ClutterActor methods should not
314 have the size. Albeit being technically correct, it's not a good
317 clutter/clutter-actor.c | 6 +++---
318 clutter/clutter-actor.h | 4 ++--
319 2 files changed, 5 insertions(+), 5 deletions(-)
321 commit fe0e7f9f74358d8333135e51d9c3937ce7e59967
322 Author: Emmanuele Bassi <ebassi@linux.intel.com>
323 Date: Mon Jul 27 15:42:31 2009 +0100
325 [stage] Add a warning for :offscreen usage
327 The Stage:offscreen property hasn't been tested for ages, and it
328 should really just use a FBO, not indirect rendering on a X Pixmap
329 only on X11. There are better ways anyway to get the current
330 contents of ClutterStage as a buffer anyway.
332 We might remove it at any later date, or actually make it work
335 clutter/clutter-stage.c | 4 ++++
336 1 file changed, 4 insertions(+)
338 commit 6e6d0a5ea611a99438ae455c1f485e882f621863
339 Author: Emmanuele Bassi <ebassi@linux.intel.com>
340 Date: Mon Jul 27 15:08:03 2009 +0100
342 [glx] Explicitly set the depth size for GLX visuals
344 When requesting a GLX visual from the X server we should explicitly
345 set the GL_DEPTH_SIZE and the GL_ALPHA_SIZE bits, otherwise some
346 functionality might just not work, or work unreliably.
350 http://bugzilla.openedhand.com/show_bug.cgi?id=1723
352 clutter/glx/clutter-backend-glx.c | 2 ++
353 1 file changed, 2 insertions(+)
355 commit 88e77b25dfeeead3b4d54d2b24ab9056459c6ee9
356 Author: Emmanuele Bassi <ebassi@linux.intel.com>
357 Date: Mon Jul 27 15:01:52 2009 +0100
359 Convert gint to GLints in the Shader types wrapper
361 The GValue wrappers for ClutterShader types should always store
362 values using GL types (GLfloat, GLint) internally, but give and
363 take generic C types (float, int) to the Clutter side.
367 http://bugzilla.openedhand.com/show_bug.cgi?id=1359
369 clutter/clutter-shader-types.c | 14 +++++++-------
370 1 file changed, 7 insertions(+), 7 deletions(-)
372 commit ad7dcc989648791e8fec1bb45711c9f71671dfe0
373 Author: Emmanuele Bassi <ebassi@linux.intel.com>
374 Date: Mon Jul 27 12:04:40 2009 +0100
376 [color] Fix HLS to RGB colorspace conversion
378 The HLS to RGB conversion in case the S value is zero is:
380 R = G = B = luminance
382 ClutterColor uses a byte (0 to 255) for the R, G and B channels
383 encoding, while luminance is expressed using a floating point value
384 in the closed interval [0, 1]; thus the case above becomes:
386 R = G = B = (luminance * 255)
388 The clutter_color_from_hls() code is missing the final step of
389 de-normalizing the luminance value, and so it breaks the roundtrip
390 colorspace conversion between RGB and HLS.
394 http://bugzilla.openedhand.com/show_bug.cgi?id=1695
396 clutter/clutter-color.c | 14 +++++---------
397 1 file changed, 5 insertions(+), 9 deletions(-)
399 commit db2fda9c430beed64309c1881a44917933863bd0
400 Author: Emmanuele Bassi <ebassi@linux.intel.com>
401 Date: Mon Jul 27 11:46:26 2009 +0100
403 [tests] Add RGB<->HLS roundtrip test unit
405 The ClutterColor conformance test should have a unit for verifying
406 the RGB<->HLS conversion code, especially the ability to roundtrip
407 between the two colorspaces.
409 tests/conform/test-color.c | 69 +++++++++++++++++++++++++++++++++++++
410 tests/conform/test-conform-main.c | 1 +
411 2 files changed, 70 insertions(+)
413 commit 894fe4ba93f37f46c4a999022714ccb224a35703
414 Author: Owen W. Taylor <otaylor@fishsoup.net>
415 Date: Wed Jul 22 15:38:44 2009 -0400
417 Always create the Damage object for ClutterX11TexturePixmap auto updates
419 If clutter_x11_texture_set_window() was called after
420 clutter_x11_texture_pixmap_set_automatic(), then the Damage object would
421 not be properly created so updates to the window were ignored.
423 Refactor creation of the damage object to a separate function, and
424 call it from clutter_x11_texture_set_window() and clutter_x11_texture_set_pixmap()
425 as appropriate. Addition and removal of the filter function is made
426 conditional on priv->damage to make free_damage_resources() cleanly
429 See: http://bugzilla.gnome.org/show_bug.cgi?id=587189 for the original
432 http://bugzilla.openedhand.com/show_bug.cgi?id=1710
434 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
436 clutter/x11/clutter-x11-texture-pixmap.c | 74 ++++++++++++++++++++++--------
437 1 file changed, 54 insertions(+), 20 deletions(-)
439 commit 2c2f31b1be57380d4368f6da1d0a4529a5a7f8c1
440 Author: Michael Mortensen <michael@f3k.org>
441 Date: Sun Jul 26 20:13:36 2009 +0100
443 [osx] Update events to floating point coordinates
445 The event translation code should be using the float type for
450 http://bugzilla.openedhand.com/show_bug.cgi?id=1725
452 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
454 clutter/osx/clutter-event-osx.c | 10 +++++-----
455 1 file changed, 5 insertions(+), 5 deletions(-)
457 commit 13f32cb3b91d5087297a3e17ee97ce46154f9243
458 Author: Emmanuele Bassi <ebassi@linux.intel.com>
459 Date: Sun Jul 26 20:10:42 2009 +0100
461 [osx] Implement StageWindow::show/::hide
463 Instead of using the Actor class ::show and ::hide virtual function,
464 use the StageWindow interface API.
468 http://bugzilla.openedhand.com/show_bug.cgi?id=1724
470 clutter/osx/clutter-stage-osx.c | 29 +++++++++++++----------------
471 1 file changed, 13 insertions(+), 16 deletions(-)
473 commit e860d939f9d9611dcf5b8c6e70272b6318a4ba94
474 Author: Emmanuele Bassi <ebassi@linux.intel.com>
475 Date: Thu Jul 23 19:04:27 2009 +0100
477 [text] Allow key navigation by word
479 When pressing Ctrl with the left and right arrow keys we should
480 skip to (or select until) the previous and next word, respectively.
484 http://bugzilla.openedhand.com/show_bug.cgi?id=1713
486 clutter/clutter-text.c | 92 +++++++++++++++++++++++++++++++++++-------------
487 1 file changed, 67 insertions(+), 25 deletions(-)
489 commit 6a1506bd5f920430de6a6e2f035fef9da2557714
490 Author: Geoff Gustafson <geoff@linux.intel.com>
491 Date: Thu Jul 23 18:21:10 2009 +0100
493 [text] Queue a redraw when the selection is cleared
495 If you select all the text in a ClutterText, there is an invisible
496 cursor position either at the beginning or end. If it's at the beginning,
497 the bug is that left arrow won't clear the selection. If it's at the end,
498 the bug is that the right arrow won't.
500 Here are the ways to reproduce it:
502 a. Ctrl-A selects all and moves the hidden cursor position to the left.
503 b. For single line: End, Shift-Home does the same.
504 c. Or manually moving to the end and doing Shift-Left Arrow to the
507 These all put it in the state where right arrow will properly clear
508 selection and move to cursor position 1, but left arrow fails to clear
511 For b and c above, the opposite will give you the end case where right
514 Anyway, it turns out clear_selection is getting called, it just doesn't
515 show up because it's not doing a queue_redraw. So the attached patch
518 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
520 clutter/clutter-text.c | 6 +++++-
521 1 file changed, 5 insertions(+), 1 deletion(-)
523 commit 29d8d60487878f5bc87caee08cadc15789875e4d
524 Author: Emmanuele Bassi <ebassi@linux.intel.com>
525 Date: Tue Jul 21 16:35:50 2009 +0100
527 [docs] Fix wrong XML elements
529 doc/reference/clutter/clutter-animation-tutorial.xml | 2 +-
530 doc/reference/clutter/creating-behaviours.xml | 2 +-
531 2 files changed, 2 insertions(+), 2 deletions(-)
533 commit 2e38730eb1c16040503ab39625648f35e8ecffb5
534 Author: Emmanuele Bassi <ebassi@linux.intel.com>
535 Date: Tue Jul 21 14:13:31 2009 +0100
537 [docs] Update the Actor subclassing documentation
539 Mention map/unmap and fix the examples code.
541 Update the Container virtual functions.
543 doc/reference/clutter/subclassing-ClutterActor.xml | 56 ++++++++++++--------
544 1 file changed, 34 insertions(+), 22 deletions(-)
546 commit ea436a20b31eef70af60beb5366e1ccad1261c4a
547 Author: Emmanuele Bassi <ebassi@linux.intel.com>
548 Date: Tue Jul 21 14:11:28 2009 +0100
550 [build] Use per-target flags and libraries
552 AM_LDFLAGS is ignored by the LDFLAGS target, and it's also not the right
553 place to put the libraries used by the linker.
555 Thanks to Vincent Untz for spotting this.
557 tests/interactive/Makefile.am | 10 ++++------
558 1 file changed, 4 insertions(+), 6 deletions(-)
560 commit ed005685c9351b23795d40bb91cb862b92641f2b
561 Author: Emmanuele Bassi <ebassi@linux.intel.com>
562 Date: Tue Jul 21 11:51:20 2009 +0100
564 [docs] Update the "creating new behaviours" chapter
566 The signature of the ::alpha_notify virtual function has been
567 changed with the switch to float ClutterAlpha.
569 doc/reference/clutter/creating-behaviours.xml | 47 +++++++++----------------
570 1 file changed, 17 insertions(+), 30 deletions(-)
572 commit c87fea6cf1f3e3015bf2c505f0d140682b714e99
573 Author: Emmanuele Bassi <ebassi@linux.intel.com>
574 Date: Tue Jul 21 11:50:08 2009 +0100
576 [docs] Update the building instructions
578 New configure script command line switches have been added since
579 the last time we updated the documentation.
581 doc/reference/clutter/building-clutter.xml | 70 +++++++++++++++++++++++++---
582 1 file changed, 63 insertions(+), 7 deletions(-)
584 commit 78773ab6fe96923a70e09b903db188ac5ad90f9a
585 Author: Emmanuele Bassi <ebassi@linux.intel.com>
586 Date: Tue Jul 21 11:29:52 2009 +0100
588 [docs] Update the animations tutorial
590 Bring the Animation framework introduction/tutorial up to the 1.0
591 API for timelines and animations.
593 .../clutter/clutter-animation-tutorial.xml | 742 +++++++++-----------
594 1 file changed, 321 insertions(+), 421 deletions(-)
596 commit fdfd208c044609a9215f09a91026fe6f02773a3a
597 Author: Emmanuele Bassi <ebassi@linux.intel.com>
598 Date: Tue Jul 21 09:22:34 2009 +0100
600 Fix copy-and-paste errors in the deprecation macros
604 http://bugzilla.openedhand.com/show_bug.cgi?id=1704
606 clutter/clutter-deprecated.h | 6 +++---
607 1 file changed, 3 insertions(+), 3 deletions(-)
609 commit 605927db5b9d9ddb8677458b94ad2ca6d058f355
610 Author: Emmanuele Bassi <ebassi@linux.intel.com>
611 Date: Tue Jul 21 09:20:09 2009 +0100
613 [docs] Fix typo in the effects migration guide
617 http://bugzilla.openedhand.com/show_bug.cgi?id=1706
619 doc/reference/clutter/migrating-ClutterEffect.xml | 4 ++--
620 1 file changed, 2 insertions(+), 2 deletions(-)
622 commit eff857bc7f21dcfd2b8cae5f4ede1f673c24ffd1
623 Author: Emmanuele Bassi <ebassi@linux.intel.com>
624 Date: Mon Jul 20 20:59:18 2009 +0100
626 [docs] Improve the Units to and from string conversion
628 Make sure to document the conversion to and from strings for ClutterUnits,
629 with negative examples and with the behaviour for fractionary bits.
631 clutter/clutter-units.c | 22 ++++++++++++++++++----
632 1 file changed, 18 insertions(+), 4 deletions(-)
634 commit b1d98c25f4d70bc355e2b4d66c2496ab58b9b60c
635 Author: Emmanuele Bassi <ebassi@linux.intel.com>
636 Date: Mon Jul 20 12:49:35 2009 +0100
638 [doc] Miscellaneous documentation fixes
640 Remove private symbols, and add missing public ones.
642 clutter/cogl/cogl-material.h | 79 +++++++++++++++-------------
643 clutter/cogl/cogl-types.h | 16 ++++++
644 clutter/cogl/cogl.h.in | 31 +++++------
645 doc/reference/clutter/clutter-sections.txt | 1 -
646 doc/reference/cogl/Makefile.am | 7 +++
647 doc/reference/cogl/cogl-sections.txt | 22 +-------
648 6 files changed, 83 insertions(+), 73 deletions(-)
650 commit cdb239756b8c369566ae2c45b3562d2a838674cc
651 Author: Emmanuele Bassi <ebassi@linux.intel.com>
652 Date: Mon Jul 20 12:47:53 2009 +0100
654 [cogl] Make the blend string error domain public
656 The error domain and codes must present in a publicly installed header
657 otherwise they won't be usable to match a GError.
659 clutter/cogl/cogl-types.h | 11 +++++++++++
660 clutter/cogl/common/cogl-blend-string.c | 2 +-
661 clutter/cogl/common/cogl-blend-string.h | 13 -------------
662 3 files changed, 12 insertions(+), 14 deletions(-)
664 commit e1e8c76ad7d7391fcf2ee79d730ee96fa8528c10
665 Author: Emmanuele Bassi <ebassi@linux.intel.com>
666 Date: Mon Jul 20 11:45:47 2009 +0100
668 [gitignore] Add test-materials
671 1 file changed, 1 insertion(+)
673 commit 56ef6727b5807c245e3eaf434653007efce70fda
674 Author: Emmanuele Bassi <ebassi@linux.intel.com>
675 Date: Tue Jul 14 13:47:35 2009 +0100
677 Allow disabling motion event throttling
679 It might be desirable for some applications and/or platforms to get
680 every motion event that was delivered to Clutter from the windowing
681 backend. By adding a per-stage flag we can bypass the throttling
682 done when processing the events.
684 http://bugzilla.openedhand.com/show_bug.cgi?id=1665
686 clutter/clutter-stage.c | 76 +++++++++++++++++++++++-----
687 clutter/clutter-stage.h | 8 +--
688 doc/reference/clutter/clutter-sections.txt | 2 +
689 3 files changed, 71 insertions(+), 15 deletions(-)
691 commit f7850b516c1481f7a63c68a2e0c2b9959bdd67a6
692 Author: Emmanuele Bassi <ebassi@linux.intel.com>
693 Date: Sat Jul 18 19:40:29 2009 +0100
695 [docs] Move the releasing process to a separate file
697 The documentation on how to release Clutter should be in a separate
698 file from the documentation on how to hack on Clutter.
700 HACKING | 38 --------------------------------------
701 RELEASING | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
702 2 files changed, 56 insertions(+), 38 deletions(-)
704 commit da37e1e27db84135a6349460f68159f16cd02e0c
705 Author: Robert Bragg <robert@linux.intel.com>
706 Date: Sun Jul 19 10:08:32 2009 +0100
708 [doc] Remove references to cogl_vertex_buffer_delete_indices
710 These referencese were left over from before indices got CoglHandles to
711 uniquely identify them. cogl_handle_unref can be used to delete indices
714 clutter/cogl/cogl-vertex-buffer.h | 14 --------------
715 doc/reference/cogl/cogl-sections.txt | 1 -
716 2 files changed, 15 deletions(-)
718 commit dc0b1cddf5bc0195c78b0ab15a8dc54c7aa49913
719 Author: Emmanuele Bassi <ebassi@linux.intel.com>
720 Date: Sat Jul 18 16:59:54 2009 +0100
722 [cogl/gles] Fix missing symbols in CoglContext
724 Keep the CoglContext in sync between GL and GLES backends. We ought
725 to find a way to have a generic context, though, and have backend
730 http://bugzilla.openedhand.com/show_bug.cgi?id=1698
732 clutter/cogl/gles/cogl-context.h | 11 +++++++----
733 1 file changed, 7 insertions(+), 4 deletions(-)
735 commit a11b912dea3f3ad9d51d4600c6aac1b69dc004a9
736 Author: Owen W. Taylor <otaylor@fishsoup.net>
737 Date: Fri Jul 17 15:15:03 2009 -0400
739 Fix parallel build of introspection
741 We need to explicitly force order so that ClutterJson.gir and Cogl.gir
742 are present in the parent directory before we try to build Clutter.typelib.
744 http://bugzilla.openedhand.com/show_bug.cgi?id=1700
746 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
748 clutter/Makefile.am | 4 ++++
749 1 file changed, 4 insertions(+)
751 commit 7654ef10abfc5f207603ecd9012c810adb62a52a
752 Author: Owen W. Taylor <otaylor@fishsoup.net>
753 Date: Fri Jul 17 15:10:06 2009 -0400
755 Fix building introspection when dolt is not in use
757 On some platforms (anything but Linux, and on obscure Linux
758 architectures) dolt isn't used, so $(top_builddir)/doltlibtool
759 won't exist. $(top_builddir)/libtool will always be generated
760 even if dolt is used, so just use that unconditionally. We don't
761 need the extra speed when linking the single program for
764 http://bugzilla.openedhand.com/show_bug.cgi?id=1699
766 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
768 clutter/Makefile.am | 2 +-
769 clutter/cogl/Makefile.am | 2 +-
770 clutter/json/Makefile.am | 2 +-
771 3 files changed, 3 insertions(+), 3 deletions(-)
773 commit 8ca87ea60f5f522f98a58da86b8dc69e8a0b79de
774 Author: Emmanuele Bassi <ebassi@linux.intel.com>
775 Date: Fri Jul 17 17:51:26 2009 +0100
777 Post-release bump to 0.9.9
780 1 file changed, 1 insertion(+), 1 deletion(-)
782 commit 3dc3d46967aea8714b23ed31cb51e2085a8b78e7
783 Author: Emmanuele Bassi <ebassi@linux.intel.com>
784 Date: Fri Jul 17 17:32:45 2009 +0100
789 1 file changed, 1 insertion(+), 1 deletion(-)
791 commit 6b30b76b6845cc100e16fd5ada7ed12f784b40c3
792 Author: Emmanuele Bassi <ebassi@linux.intel.com>
793 Date: Fri Jul 17 17:32:20 2009 +0100
797 NEWS | 38 ++++++++++++++++++++++++++++++++++++++
798 1 file changed, 38 insertions(+)
800 commit f0ec828188519e69944509584c4e925f572720ec
801 Author: Emmanuele Bassi <ebassi@linux.intel.com>
802 Date: Mon Jul 13 17:27:01 2009 +0100
804 Fix comments inside configure.ac
806 configure.ac | 8 +++++---
807 1 file changed, 5 insertions(+), 3 deletions(-)
809 commit 7b811f8be4be0529b50a24397cee86e8ecf02f3a
810 Author: Neil Roberts <neil@linux.intel.com>
811 Date: Fri Jul 17 12:43:52 2009 +0100
813 [stage] Force an allocation before showing the stage
815 A lot of applications change the size of the stage from the default
816 before the stage is initially shown. The size change won't take affect
817 until the first allocation run. However we want the window to be at
818 the correct size when we first map it so we should force an allocation
819 run before showing the stage.
821 There was an explicit call to XResizeWindow in
822 clutter_stage_x11_show. This is not needed anymore because
823 XResizeWindow will already have been called by the allocate method.
825 clutter/clutter-stage.c | 4 ++++
826 clutter/x11/clutter-stage-x11.c | 15 ---------------
827 2 files changed, 4 insertions(+), 15 deletions(-)
829 commit 8f9f6aaf4178266b38709bb7f7d6f118cc2d6de2
830 Author: Marcos <marcos.e.carranza@intel.com>
831 Date: Mon Jul 13 17:04:05 2009 +0100
833 [win32] Compilation fixes
835 Remove the usage of the old CLUTTER_UNITS_* macros and put back a
838 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
840 clutter/win32/clutter-stage-win32.c | 14 +++++++-------
841 1 file changed, 7 insertions(+), 7 deletions(-)
843 commit 7a8895944b373a99023bc21998a48079debcc544
844 Author: Emmanuele Bassi <ebassi@linux.intel.com>
845 Date: Mon Jul 13 16:56:47 2009 +0100
847 [osx] Enable motion event dispatch
849 By default NSWindow does not listen to mousemoved events and hence the
850 default behaviour for Actors using the "motion-event" signal differs
851 from backend to backend.
853 Using setAcceptsMouseMovedEvents seems to fix it; unfortunately, I
854 cannot verify it, but since nobody is currently working on the Quartz
855 backend I guess it cannot get more broken than how currently is.
857 Thanks to: Michael <michael@f3k.org>
861 http://bugzilla.openedhand.com/show_bug.cgi?id=1687
863 clutter/osx/clutter-stage-osx.c | 1 +
864 1 file changed, 1 insertion(+)
866 commit d59b9333a19842e559f9f161d26d0c1d623eafa2
867 Author: Emmanuele Bassi <ebassi@linux.intel.com>
868 Date: Mon Jul 13 16:53:06 2009 +0100
870 [osx] Remove old units macros
872 Remove the usage of CLUTTER_UNITS_* macros and at least get the
873 chance to make the OSX backend compile.
875 Hopefully, since I can't currently test it.
877 clutter/osx/clutter-stage-osx.c | 24 ++++++++++++------------
878 1 file changed, 12 insertions(+), 12 deletions(-)
880 commit af5e432ba9bf56ccd376d52e73e0e23d5bc9b37c
881 Author: Emmanuele Bassi <ebassi@linux.intel.com>
882 Date: Mon Jul 13 16:18:27 2009 +0100
884 [actor] Allow querying whether we are painted by a Clone
886 It would be useful inside a custom actor's paint function to be able to
887 tell if this is a primary paint call, or if we are in fact painting on
890 In Mutter we have an optimization not to paint occluded windows; this is
891 desirable for the windows per se, to conserve bandwith to the card, but
892 if something like an application switcher is using clones of these windows,
893 they will not get painted either; currently we have no way of
894 differentiating between the two.
898 http://bugzilla.openedhand.com/show_bug.cgi?id=1685
900 clutter/clutter-actor.c | 32 ++++++++++++++++++++++++++++
901 clutter/clutter-actor.h | 2 ++
902 doc/reference/clutter/clutter-sections.txt | 1 +
903 3 files changed, 35 insertions(+)
905 commit 43d394ebae027e5af963d5f3f459ed57bbc9617f
906 Author: Emmanuele Bassi <ebassi@linux.intel.com>
907 Date: Mon Jul 13 16:16:38 2009 +0100
909 Remove unused TEXTURE_IN_CLONE_PAINT private flag
911 The CLUTTER_TEXTURE_IN_CLONE_PAINT was used with the old CloneTexture
912 actor; now that we have ClutterClone nothing sets the private flag
913 anymore, and the flag itself is not needed.
915 clutter/clutter-private.h | 9 ++++-----
916 clutter/clutter-texture.c | 7 -------
917 2 files changed, 4 insertions(+), 12 deletions(-)
919 commit 13f31d83190be1a0e47c1aedf0570f8e6ad8f0b8
920 Author: Xu Li <xu.li@intel.com>
921 Date: Mon Jul 13 16:06:13 2009 +0800
923 [x11] update_wm_hints after unsetting WITHDRAWN
925 Updating the WM hints on the stage window shortcircuits if the stage
926 is in WITHDRAWN state, so we need to move the update_wm_hints() call
927 after the flag has been unset.
929 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
931 clutter/x11/clutter-stage-x11.c | 4 ++--
932 1 file changed, 2 insertions(+), 2 deletions(-)
934 commit 07453a5861073fabdf64fe394c1caa71fc39d45c
935 Author: Emmanuele Bassi <ebassi@linux.intel.com>
936 Date: Mon Jul 13 15:31:38 2009 +0100
938 [glx] Make the wait_for_vblank function private
940 Nobody should be using the function to wait for the vblank outside
943 clutter/glx/clutter-backend-glx.c | 120 ++++++++++++++++++-------------------
944 clutter/glx/clutter-backend-glx.h | 10 +---
945 2 files changed, 63 insertions(+), 67 deletions(-)
947 commit 5425a6e311e12da044687ac17ce387b939b71547
948 Author: Owen W. Taylor <otaylor@fishsoup.net>
949 Date: Sat Jun 6 15:47:57 2009 -0400
951 Call glFinish() before manually waiting for VBLANK
953 If we manually wait for the VBLANK with:
956 - Direct usage of the DRM ioctl
958 Then we should call glFinish() first, or otherwise the swap-buffers
959 may be delayed by pending drawing and cause a tear.
961 http://bugzilla.openedhand.com/show_bug.cgi?id=1636
963 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
965 clutter/glx/clutter-backend-glx.c | 31 +++++++++++++++++++++++++++----
966 1 file changed, 27 insertions(+), 4 deletions(-)
968 commit b08bbcccad7fffc4b7c829f963c3130a34ed8ae9
969 Author: Emmanuele Bassi <ebassi@linux.intel.com>
970 Date: Sun Jul 12 01:43:41 2009 +0100
972 [tests] Remove test-perspective
974 The perspective test was used essentially to determine whether the
975 perspective set up in COGL worked correctly. The perspective code
976 has been changed a lot since Clutter 0.3: we rely on client-side
977 matrices and we use floating point; so, all the conditions the test
978 was supposed to verify do not exist anymore.
980 tests/interactive/Makefile.am | 1 -
981 tests/interactive/test-perspective.c | 51 ----------------------------------
982 2 files changed, 52 deletions(-)
984 commit ea56a5e7a802a46f9ad6fe12480e16dc587c09b2
985 Author: Evan Martin <martine@danga.com>
986 Date: Sun Jul 12 01:38:40 2009 +0100
988 [docs] Fix typos and remove mentions of SVN
990 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
993 clutter/cogl/cogl-path.h | 2 +-
995 3 files changed, 4 insertions(+), 3 deletions(-)
997 commit efc16a4d90c48d41376769bca93cd2091d40665c
998 Author: Jakub Higersberger <ramarren@gmail.com>
999 Date: Fri Jul 3 14:51:17 2009 +0200
1001 Use correct signal detail
1003 The Animation should connect to the notify::alpha signal, not to
1004 the non-existing notify::value signal.
1008 http://bugzilla.openedhand.com/show_bug.cgi?id=1674
1009 http://bugzilla.openedhand.com/show_bug.cgi?id=1688
1011 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
1013 clutter/clutter-animation.c | 2 +-
1014 1 file changed, 1 insertion(+), 1 deletion(-)
1016 commit 5a554bf063a3b673bd7f30d9a92be218e4e810c7
1017 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1018 Date: Sun Jul 12 01:27:31 2009 +0100
1022 Make ClutterTexture slightly more similar to the rest of the code base.
1024 clutter/clutter-texture.c | 38 ++++++++++++++++++++++++--------------
1025 1 file changed, 24 insertions(+), 14 deletions(-)
1027 commit 1920b03381e9b44aab9f6a5a64e8bb4c0cec1b20
1028 Author: Robert Bragg <robert@linux.intel.com>
1029 Date: Tue Jul 7 16:16:56 2009 +0100
1031 [cogl] Fix more brokeness with _cogl_material_equal
1033 commit e2c4a2a9f83 fixed one thing but broke many others things :-/
1034 hopfully this fixes that.
1036 It turned out that the journal was mistakenly setting the OVERRIDE_LAYER0
1037 flush option for all entries, but some other logic errors were also
1038 uncovered in _cogl_material_equal.
1040 clutter/cogl/common/cogl-material.c | 73 ++++++++++++++++++++++++---------
1041 clutter/cogl/common/cogl-primitives.c | 7 +++-
1042 2 files changed, 58 insertions(+), 22 deletions(-)
1044 commit 8fb3a48ae2b6c9a87f17a874fad12d8f1199c29e
1045 Author: pippin <pippin@localhost.localdomain>
1046 Date: Thu Jul 9 15:45:08 2009 -0400
1048 serialize upload of asyncronously loaded textures
1050 Rate limit the uploading of textures to stop if it uses more than 5ms
1051 during one master clock iteration.
1053 clutter/clutter-texture.c | 74 +++++++++++++++++++++++++++++++++++++++------
1054 1 file changed, 65 insertions(+), 9 deletions(-)
1056 commit 211bf798544f76af7fe9e7c9893f66a0f84e02b0
1057 Author: Robert Bragg <robert@linux.intel.com>
1058 Date: Thu Jul 9 20:03:01 2009 +0100
1060 ensure next iteration
1062 Added an internal clutter function, _clutter_master_clock_ensure_next_iteration
1063 that ensures another iteration of the master clock, can be called from repaint
1064 functions as well as other threads.
1066 clutter/clutter-master-clock.c | 23 +++++++++++++++++++++++
1067 clutter/clutter-master-clock.h | 15 ++++++++-------
1068 2 files changed, 31 insertions(+), 7 deletions(-)
1070 commit e2c4a2a9f8324a3a17104a15034a40279b4910bb
1071 Author: Robert Bragg <robert@linux.intel.com>
1072 Date: Sat Jul 4 00:15:49 2009 +0100
1074 [cogl] Fix drawing with sliced textures using material layer0 overrides
1076 To help us handle sliced textures; When flushing materials there is an
1077 override option that can be given to replace the texture name for layer0
1078 so we may iterate the slices without needing to modify the material
1081 Since improving the journal's ability to batch state changes we added a
1082 _cogl_material_equals function that is used by the journal to compare
1083 materials and identify when a state change is required, but this wasn't
1084 correctly considering the layer0 override resulting in false positives that
1085 meant the journal wouldn't update the GL state and the first texture name
1086 was used for all slices.
1088 clutter/cogl/common/cogl-material-private.h | 3 +-
1089 clutter/cogl/common/cogl-material.c | 208 ++++++++++++++++++---------
1090 clutter/cogl/common/cogl-primitives.c | 3 +-
1091 3 files changed, 144 insertions(+), 70 deletions(-)
1093 commit df4429462fa495e44d3a8431ab27771426f7ba42
1094 Author: Robert Bragg <robert@linux.intel.com>
1095 Date: Fri Jul 3 00:34:10 2009 +0100
1097 [cogl matrix stack] Create a client side matrix stack for the projection matrix
1099 The cost of glGetFloatv with Mesa is still representing a majority of our
1100 time in OpenGL for some applications, and the last thing left using this is
1101 the current-matrix API when getting the projection matrix.
1103 This adds a matrix stack for the projection matrix, so all getting, setting
1104 and modification of the projection matrix is now managed by Cogl and it's only
1105 when we come to draw that we flush changes to the matrix to OpenGL.
1107 This also brings us closer to being able to drop internal use of the
1108 deprecated OpenGL matrix functions, re: commit 54159f5a1d02
1110 clutter/cogl/common/cogl-current-matrix.c | 105 ++++++++++++++++++-----------
1111 clutter/cogl/common/cogl-current-matrix.h | 2 +
1112 clutter/cogl/common/cogl-matrix-stack.c | 8 +--
1113 clutter/cogl/common/cogl-matrix.c | 1 +
1114 clutter/cogl/common/cogl-primitives.c | 10 ++-
1115 clutter/cogl/common/cogl-vertex-buffer.c | 4 +-
1116 clutter/cogl/common/cogl.c | 7 +-
1117 clutter/cogl/gl/cogl-context.h | 1 +
1118 clutter/cogl/gl/cogl-primitives.c | 6 +-
1119 9 files changed, 85 insertions(+), 59 deletions(-)
1121 commit c3cc553c4991100b456e96ea14fc17c85311d6e2
1122 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1123 Date: Thu Jul 2 14:21:16 2009 +0100
1125 Add more (allow-none) annotations
1127 clutter/clutter-actor.c | 91 ++++++++++++++++++++++++++++-------------------
1128 1 file changed, 54 insertions(+), 37 deletions(-)
1130 commit f1044a279c45e8f4f48cc81a5c1c0fa720835d1d
1131 Author: Colin Walters <walters@verbum.org>
1132 Date: Thu Jul 2 13:15:42 2009 +0100
1134 Use the (allow-none) annotation for clutter_init*
1136 We accept NULL for some parameters in the initialization functions.
1138 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
1140 clutter/clutter-main.c | 18 ++++++++++--------
1141 1 file changed, 10 insertions(+), 8 deletions(-)
1143 commit d1232509a21a7ce05aa8c85b2c14872ffc4df5cb
1144 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1145 Date: Wed Jul 1 15:59:13 2009 +0100
1147 Post-release bump to 0.9.7
1150 1 file changed, 1 insertion(+), 1 deletion(-)
1152 commit 9ce88d86b484bcc4a15decfb95b97294e4cce292
1153 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1154 Date: Wed Jul 1 15:28:33 2009 +0100
1159 1 file changed, 1 insertion(+), 1 deletion(-)
1161 commit a373bbb819462b6baa62f0ecfff9716c8dbc8fa8
1162 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1163 Date: Wed Jul 1 14:56:13 2009 +0100
1165 [docs] Update the NEWS and README files
1167 NEWS | 40 ++++++++++++++++++++++++++++++++++++++++
1169 2 files changed, 45 insertions(+)
1171 commit 45c85c4213c85d0dbbbe0e7eb8f93e290d5ffff2
1172 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1173 Date: Wed Jul 1 15:15:52 2009 +0100
1175 [actor] Remove the unused get_allocation_coords()
1177 The clutter_actor_get_allocation_coords() is not used, and since
1178 the switch to floats in the Actor's API, it returns exactly what
1179 the get_allocation_box() returns.
1181 clutter/clutter-actor.c | 62 +++++++-----------------------------------
1182 clutter/clutter-actor.h | 5 ----
1183 clutter/clutter-deprecated.h | 2 ++
1184 3 files changed, 12 insertions(+), 57 deletions(-)
1186 commit 37bd35f592e13dfa8ded884fcf668409dec119f3
1187 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1188 Date: Wed Jul 1 13:59:13 2009 +0100
1190 [actor] Allow changing the transformations matrix
1192 Currently, the transformation matrix for an actor is constructed
1193 from scenegraph-related accessors. An actor, though, can call COGL
1194 API to add new transformations inside the paint() implementation,
1198 my_foo_paint (ClutterActor *a)
1201 cogl_translate (-scroll_x, -scroll_y, 0);
1205 Unfortunately these transformations will be completely ignored by
1206 the scenegraph machinery; for instance, getting the actor-relative
1207 coordinates from event coordinates is going to break badly because
1210 In order to make the scenegraph aware of the potential of additional
1211 transformations, we need a ::apply_transform() virtual function. This
1212 vfunc will pass a CoglMatrix which can be used to apply additional
1216 my_foo_apply_transform (ClutterActor *a, CoglMatrix *m)
1218 CLUTTER_ACTOR_CLASS (my_foo_parent_class)->apply_transform (a, m);
1220 cogl_matrix_translate (m, -scroll_x, -scroll_y, 0);
1224 The ::paint() implementation will be called with the actor already
1225 using the newly applied transformation matrix, as expected:
1228 my_foo_paint (ClutterActor *a)
1233 The ::apply_transform() implementations *must* chain up, so that the
1234 various transformations of each class are preserved. The default
1235 implementation inside ClutterActor applies all the transformations
1236 defined by the scenegraph-related accessors.
1238 Actors performing transformations inside the paint() function will
1239 continue to work as previously.
1241 clutter/clutter-actor.c | 104 ++++++++++++++++++++--------
1242 clutter/clutter-actor.h | 15 +++-
1243 doc/reference/clutter/clutter-sections.txt | 1 +
1244 3 files changed, 89 insertions(+), 31 deletions(-)
1246 commit 0414daf0fb64433cb168799bfec79d5996b05ddf
1247 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1248 Date: Wed Jul 1 12:34:54 2009 +0100
1250 Split the typdef to avoid confusing scanners
1252 Scanners like gtk-doc and g-ir-scanner get confused by:
1254 typedef struct _Foo {
1260 typedef struct _Foo Foo;
1266 CoglMatrix definition should be changed to avoid the former type.
1268 clutter/cogl/cogl-matrix.h | 6 ++++--
1269 1 file changed, 4 insertions(+), 2 deletions(-)
1271 commit 250b775926da40a5e4b96565b413c4a2c57d4a8d
1272 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1273 Date: Thu Jun 25 14:41:25 2009 +0100
1275 [x11] Fix the race between resize and glViewport calls
1277 The race we were experiencing in the X11 backends is apparently
1278 back after the fix in commit 00a3c698.
1280 This time, just delaying the setting of the SYNC_MATRICES flag
1281 is not enough, so we can resume the use of a STAGE_IN_RESIZE
1284 This should also fix bug:
1286 http://bugzilla.openedhand.com/show_bug.cgi?id=1668
1288 clutter/clutter-main.c | 7 +++++--
1289 clutter/clutter-private.h | 3 ++-
1290 clutter/x11/clutter-event-x11.c | 6 ++++--
1291 clutter/x11/clutter-stage-x11.c | 35 +++++++++++++++++++++++++++--------
1292 4 files changed, 38 insertions(+), 13 deletions(-)
1294 commit 3726213291ad513e09ec7e8b3776cc2d2b9d9cb9
1295 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1296 Date: Thu Jun 25 14:39:57 2009 +0100
1298 Add debug notes for calls to glViewport()
1300 In order to validate the sequence of:
1306 that should happen on X11 we need to add debug annotations to the
1307 calls to glViewport() done through COGL.
1309 clutter/cogl/common/cogl.c | 1 +
1310 1 file changed, 1 insertion(+)
1312 commit 3bab7871030d8ad6be6dc730e5902d256dea28a2
1313 Author: Robert Bragg <robert@linux.intel.com>
1314 Date: Wed Jul 1 12:57:30 2009 +0100
1316 [cogl] cache the viewport width and height
1318 This avoids some calls to glGetFloatv, which have at least proven to be very
1319 in-efficient in mesa at this point in time, since it always updates all derived
1320 state even when it may not relate to the state being requested.
1322 clutter/cogl/common/cogl.c | 30 ++++++++++++++++--------------
1323 clutter/cogl/gl/cogl-context.c | 3 +++
1324 clutter/cogl/gl/cogl-context.h | 3 +++
1325 clutter/cogl/gl/cogl-fbo.c | 2 +-
1326 4 files changed, 23 insertions(+), 15 deletions(-)
1328 commit 358d7c30dcb6e50b8dc1208d7b602b74cc198f10
1329 Author: Robert Bragg <robert@linux.intel.com>
1330 Date: Fri Jun 19 12:15:12 2009 +0100
1332 [cogl] Ensure well defined semantics for COGL_INVALID_HANDLE material layers
1334 Fixes and adds a unit test for creating and drawing using materials with
1335 COGL_INVALID_HANDLE texture layers.
1337 This may be valid if for example the user has set a texture combine string
1338 that only references a constant color.
1340 _cogl_material_flush_layers_gl_state will bind the fallback texture for any
1341 COGL_INVALID_HANDLE layer, later though we could explicitly check when the
1342 current blend mode does't actually reference a texture source in which case
1343 binding the fallback texture is redundant.
1345 This tests drawing using cogl_rectangle, cogl_polygon and
1346 cogl_vertex_buffer_draw.
1348 clutter/cogl/common/cogl-material.c | 8 +-
1349 clutter/cogl/common/cogl-primitives.c | 35 ++++--
1350 clutter/cogl/common/cogl-vertex-buffer.c | 10 +-
1351 tests/conform/Makefile.am | 1 +
1352 tests/conform/test-conform-main.c | 1 +
1353 tests/conform/test-materials.c | 195 ++++++++++++++++++++++++++++++
1354 6 files changed, 240 insertions(+), 10 deletions(-)
1356 commit fce406f1b88794d35d8fb0c04c6bf690b990bd0d
1357 Merge: 04bb789 33400c0
1358 Author: Robert Bragg <robert@linux.intel.com>
1359 Date: Tue Jun 30 17:17:30 2009 +0100
1361 Merge branch 'cogl-journal-batching'
1363 [cogl] Improve ability to break out into raw OpenGL via begin/end mechanism
1364 Adds a cogl_flush() to give developers breaking into raw GL a fighting chance
1365 [cogl-material] Be more carefull about flushing in cogl_material_remove_layer
1366 Revert "[rectangle] Avoid modifying materials mid scene"
1367 Revert "[actor] Avoid modifying materials mid-scene to improve journal batching"
1368 [cogl-vertex-buffer] Disable unused client tex coord arrays
1369 [cogl] disable all client tex coord arrays in _cogl_add_path_to_stencil_buffer
1370 [cogl] flush matrices in _cogl_add_path_to_stencil_buffer
1371 [journal] Don't resize a singlton VBO; create and destroy a VBO each flush
1372 [cogl] avoid using the journal in _cogl_add_path_to_stencil_buffer
1373 [pango-display-list] Use the Cogl journal for short runs of text
1374 [material] _cogl_material_equal: catch the simplest case of matching handles
1375 [material] avoid flushing the journal when just changing the color
1376 [cogl journal] Perform software modelview transform on logged quads.
1377 [Cogl journal] use G_UNLIKLEY around runtime debugging conditions
1378 [cogl journal] Adds a --cogl-debug=batching option to trace batching
1379 [Cogl journal] Adds a --cogl-debug=journal option for tracing the journal
1380 [cogl] Adds a debug option for disabling use of VBOs --cogl-debug=disable-vbos
1381 [cogl] Force Cogl to always use the client side matrix stack
1382 [cogl-debug] Adds a "client-side-matrices" Cogl debug option
1383 [cogl-color] Adds a cogl_color_equal() function
1384 [cogl material] optimize logging of material colors in the journal
1385 [rectangle] Avoid modifying materials mid scene
1386 [actor] Avoid modifying materials mid-scene to improve journal batching
1387 [journal] Always pad our vertex data as if at least 2 layers are enabled
1388 [cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
1390 The Cogl journal is a mechanism Cogl uses to batch geometry resulting from
1391 any of the cogl_rectangle* functions before sending it to OpenGL. This aims
1392 to improve the Cogl journal so that it can reduce the number of state
1393 changes and draw calls we issue to the OpenGL driver and hopfully improve
1396 Previously each call to any of the cogl_rectangle* functions would imply an
1397 immediate GL draw call, as well as a corresponding modelview change;
1398 material state changes and gl{Vertex,Color,TexCoord}Pointer calls. Now
1399 though we have tried to open the scope for batching up as much as possible
1400 so we only have to flush the geometry either before calling glXSwapBuffers,
1401 or when we change state that isn't tracked by the journal.
1403 As a basic example, it's now possible for us to batch typical picking
1404 renders into a single draw call for the whole scene.
1406 Some key points about this change:
1407 - We now perform transformations of quads in software (except for long runs of
1408 text which continue to use VBOs)
1409 * It might seem surprising at first, but when you consider that so many
1410 Clutter actors are little more than textured quads and each actor
1411 typically implies a modelview matrix change; the costs involved in
1412 setting up the GPU with the new modelview can easily out weigh the cost
1413 of simply transforming 4 vertices.
1414 - We always use Cogl's own client side matrix API now.
1415 * We found the performance of querying the OpenGL driver for matrix state
1416 was often worse than using the client matrix code, and also - discussing
1417 with Mesa developers - agreed that since khronos has essentially
1418 deprecated the GL matrix API (by removing it from OpenGL 3 and
1419 OpenGL-ES 2) it was appropriate to take full responsibility for all our
1420 matrix manipulation.
1421 - Developers should avoid modifying materials mid-scene.
1422 * With the exception of material color changes, if you try and modify a
1423 material that is referenced in the journal we will currently force a
1424 journal flush. Note: you can assume that re-setting the same value for
1425 a material property won't require a flush though.
1426 - Several new --cogl-debug options have been added
1427 * "disable-batching" can be used to identify bugs in the way that the
1428 journal does its batching; of could this shouldn't ever be needed :-)
1429 * "disable-vbos" can be used to test the VBO fallback paths where we
1430 simply use malloc()'d buffers instead.
1431 * "batching" lets you get an overview of how the journal is batching
1432 your geometry and may help you identify ways to improve your
1433 application performance.
1434 * "journal" lets you trace all the geometry as it gets logged in the
1435 journal, and all the geometry as its flushed from the journal.
1436 Obviously an inconsistency can identify a bug, but the numbers may
1437 help you verify application logic too.
1438 * "disable-software-transform" as implied will instead use the driver
1439 /GPU to transform quads by the modelview matrix.
1440 Although committed separately a --clutter-debug=nop-picking option was
1441 also added that lets you remove picking from the equation, which can
1442 sometimes help make problem analysis more deterministic.
1444 commit 33400c0aae58468107be8a9e4572a37dd890ec81
1445 Author: Robert Bragg <robert@linux.intel.com>
1446 Date: Mon Jun 29 22:32:05 2009 +0100
1448 [cogl] Improve ability to break out into raw OpenGL via begin/end mechanism
1450 Although we wouldn't recommend developers try and interleve OpenGL drawing
1451 with Cogl drawing - we would prefer patches that improve Cogl to avoid this
1452 if possible - we are providing a simple mechanism that will at least give
1453 developers a fighting chance if they find it necissary.
1455 Note: we aren't helping developers change OpenGL state to modify the
1456 behaviour of Cogl drawing functions - it's unlikley that can ever be
1457 reliably supported - but if they are trying to do something like:
1459 - setup some OpenGL state.
1460 - draw using OpenGL (e.g. glDrawArrays() )
1461 - reset modified OpenGL state.
1462 - continue using Cogl to draw
1464 They should surround their blocks of raw OpenGL with cogl_begin_gl() and
1468 - setup some OpenGL state.
1469 - draw using OpenGL (e.g. glDrawArrays() )
1470 - reset modified OpenGL state.
1472 - continue using Cogl to draw
1474 Again; we aren't supporting code like this:
1475 - setup some OpenGL state.
1477 - reset modified OpenGL state.
1478 When the internals of Cogl evolves, this is very liable to break.
1480 cogl_begin_gl() will flush all internally batched Cogl primitives, and emit
1481 all internal Cogl state to OpenGL as if it were going to draw something
1484 The result is that the OpenGL modelview matrix will be setup; the state
1485 corresponding to the current source material will be setup and other world
1486 state such as backface culling, depth and fogging enabledness will be also
1489 Note: no special material state is flushed, so if developers want Cogl to setup
1490 a simplified material state it is the their responsibility to set a simple
1491 source material before calling cogl_begin_gl. E.g. by calling
1492 cogl_set_source_color4ub().
1494 Note: It is the developers responsibility to restore any OpenGL state that they
1495 modify to how it was after calling cogl_begin_gl() if they don't do this then
1496 the result of further Cogl calls is undefined.
1498 clutter/cogl/cogl.h.in | 79 ++++++++++++++++++++++++++++++++++
1499 clutter/cogl/common/cogl.c | 75 ++++++++++++++++++++++++++++++++
1500 clutter/cogl/gl/cogl-context.c | 2 +
1501 clutter/cogl/gl/cogl-context.h | 2 +
1502 doc/reference/cogl/cogl-sections.txt | 2 +
1503 5 files changed, 160 insertions(+)
1505 commit 6d9498da7cbe180ddc4b68ae3a48985631db46a0
1506 Author: Robert Bragg <robert@linux.intel.com>
1507 Date: Mon Jun 29 17:10:34 2009 +0100
1509 Adds a cogl_flush() to give developers breaking into raw GL a fighting chance
1511 This function should only need to be called in exceptional circumstances
1512 since Cogl can normally determine internally when a flush is necessary.
1514 As an optimization Cogl drawing functions may batch up primitives
1515 internally, so if you are trying to use raw GL outside of Cogl you stand a
1516 better chance of being successful if you ask Cogl to flush any batched
1517 geometry before making your state changes.
1519 cogl_flush() ensures that the underlying driver is issued all the commands
1520 necessary to draw the batched primitives. It provides no guarantees about
1521 when the driver will complete the rendering.
1523 This provides no guarantees about the GL state upon returning and to avoid
1524 confusing Cogl you should aim to restore any changes you make before
1525 resuming use of Cogl.
1527 If you are making state changes with the intention of affecting Cogl drawing
1528 primitives you are 100% on your own since you stand a good chance of
1529 conflicting with Cogl internals. For example clutter-gst which currently
1530 uses direct GL calls to bind ARBfp programs will very likely break when Cogl
1531 starts to use ARBfb programs internally for the material API, but for now it
1532 can use cogl_flush() to at least ensure that the ARBfp program isn't applied
1533 to additional primitives.
1535 This does not provide a robust generalized solution supporting safe use of
1536 raw GL, its use is very much discouraged.
1538 clutter/clutter-main.c | 2 +-
1539 clutter/cogl/cogl.h.in | 42 ++++++++++++++++++++-----------
1540 clutter/cogl/common/cogl.c | 4 +--
1541 clutter/eglnative/clutter-backend-egl.c | 2 +-
1542 clutter/eglx/clutter-backend-egl.c | 2 +-
1543 clutter/fruity/clutter-backend-fruity.c | 2 +-
1544 clutter/glx/clutter-backend-glx.c | 2 +-
1545 clutter/osx/clutter-stage-osx.c | 2 +-
1546 clutter/sdl/clutter-backend-sdl.c | 2 +-
1547 clutter/win32/clutter-backend-win32.c | 2 +-
1548 doc/reference/cogl/cogl-sections.txt | 3 +++
1549 11 files changed, 41 insertions(+), 24 deletions(-)
1551 commit 87f99e214a6f60c06cc34f844e02ecb0f63c953f
1552 Author: Robert Bragg <robert@linux.intel.com>
1553 Date: Wed Jun 24 18:34:06 2009 +0100
1555 [cogl-material] Be more carefull about flushing in cogl_material_remove_layer
1557 Previously we would call _cogl_material_pre_change_notify unconditionally, but
1558 now we wait until we really know we are removing a layer before notifying the
1559 change, which will require a journal flush.
1561 Since the convenience functions cogl_set_source_color4ub and
1562 cogl_set_source_texture share a single material, cogl_set_source_color4ub
1563 always calls cogl_material_remove_layer. Often this is a NOP though and
1564 shouldn't require a journal flush.
1566 This gets performance back to where it was before reverting the per-actor
1569 clutter/cogl/common/cogl-material.c | 12 +++++++++---
1570 1 file changed, 9 insertions(+), 3 deletions(-)
1572 commit 6ee8e1565475d75d343682e4d4eed2f68e0c26eb
1573 Author: Robert Bragg <robert@linux.intel.com>
1574 Date: Wed Jun 24 18:24:58 2009 +0100
1576 Revert "[rectangle] Avoid modifying materials mid scene"
1578 This reverts commit 8cf42ea8ac5c05f6b443c453f9c6c2a3cd75acfa.
1580 Since the journal puts material colors in the vertex array accumulated for
1581 drawing we don't need to flush the journal simply due to color changes which
1582 means using cogl_set_source_color4ub is no longer a concern.
1584 clutter/clutter-rectangle.c | 89 +++++++++++++++++--------------------------
1585 1 file changed, 34 insertions(+), 55 deletions(-)
1587 commit 5ffbe052480cb06e44f1a317ac729553ddd2dc96
1588 Author: Robert Bragg <robert@linux.intel.com>
1589 Date: Wed Jun 24 18:20:45 2009 +0100
1591 Revert "[actor] Avoid modifying materials mid-scene to improve journal batching"
1593 This reverts commit 85243da382025bd516937c76a61b8381f6e74689.
1595 Since the journal puts material colors in the vertex array accumulated for
1596 drawing we don't need to flush the journal simply due to color changes
1597 which means using cogl_set_source_color4ub is no longer a concern.
1599 clutter/clutter-actor.c | 14 ++++----------
1600 1 file changed, 4 insertions(+), 10 deletions(-)
1602 commit 8b67916cc1e2aed7861214205fc0d68c0c6d67f1
1603 Author: Robert Bragg <robert@linux.intel.com>
1604 Date: Wed Jun 24 18:10:50 2009 +0100
1606 [cogl-vertex-buffer] Disable unused client tex coord arrays
1608 Before any cogl vertex buffer drawing we call
1609 enable_state_for_drawing_buffer which sets up the GL state, but we weren't
1610 disabling unsed client texture coord arrays.
1612 clutter/cogl/common/cogl-vertex-buffer.c | 7 +++++++
1613 1 file changed, 7 insertions(+)
1615 commit 8873c6a11a4668e737e4dc75d1d2a2c14904482f
1616 Author: Robert Bragg <robert@linux.intel.com>
1617 Date: Mon Jun 22 01:29:39 2009 +0100
1619 [cogl] disable all client tex coord arrays in _cogl_add_path_to_stencil_buffer
1621 After flushing the journal an unknown number of client side texture arrays
1622 may be left enabled. Disable them all before using glDrawArrays.
1624 clutter/cogl/gl/cogl-primitives.c | 8 ++++++++
1625 1 file changed, 8 insertions(+)
1627 commit ca0a0e9dac23219709a1c365a070ea9d4d517909
1628 Author: Robert Bragg <robert@linux.intel.com>
1629 Date: Mon Jun 22 00:49:20 2009 +0100
1631 [cogl] flush matrices in _cogl_add_path_to_stencil_buffer
1633 Before calling glRectf we need to ensure we flush the modelview and
1634 projection matrices.
1636 clutter/cogl/gl/cogl-primitives.c | 2 ++
1637 1 file changed, 2 insertions(+)
1639 commit f386b1f002f111210e87e6f72eb1795ad2befc1e
1640 Author: Robert Bragg <robert@linux.intel.com>
1641 Date: Mon Jun 22 00:11:41 2009 +0100
1643 [journal] Don't resize a singlton VBO; create and destroy a VBO each flush
1645 This simplifies the vertex data uploading in the journal, and could improve
1646 performance. Modifying a VBO mid-scene could reqire synchronizing with the
1647 GPU or some form of shadowing/copying to avoid modifying data that the GPU
1648 is currently processing; the buffer was also being marked as GL_STATIC_DRAW
1649 which could have made things worse.
1651 Now we simply create a GL_STATIC_DRAW VBO for each flush and and delete it
1652 when we are finished.
1654 clutter/cogl/common/cogl-primitives.c | 40 ++++++++++-----------------------
1655 1 file changed, 12 insertions(+), 28 deletions(-)
1657 commit 7b7787b050a1dd245dea396335ddf96662c6a570
1658 Author: Robert Bragg <robert@linux.intel.com>
1659 Date: Mon Jun 22 00:05:02 2009 +0100
1661 [cogl] avoid using the journal in _cogl_add_path_to_stencil_buffer
1663 Using cogl_rectangle (and thus the journal) in
1664 _cogl_add_path_to_stencil_buffer means we have to consider all the state
1665 that the journal may change in case it may interfer with the direct GL calls
1666 used. This has proven to be error prone and in this case the journal is an
1667 unnecissary overhead. We now simply call glRectf instead of using
1670 clutter/cogl/gl/cogl-primitives.c | 16 ++++++----------
1671 1 file changed, 6 insertions(+), 10 deletions(-)
1673 commit 6562f3224a558b224b9076fe794547bfc9bb2af5
1674 Author: Robert Bragg <robert@linux.intel.com>
1675 Date: Wed Jun 17 23:35:49 2009 +0100
1677 [pango-display-list] Use the Cogl journal for short runs of text
1679 For small runs of text like icon labels, we can get better performance
1680 going through the Cogl journal since text may then be batched together
1681 with other geometry.
1683 For larger runs of text though we still use VBOs since the cost of logging
1684 the quads becomes too expensive, including the software transform which
1685 isn't at all optimized at this point. VBOs also have the further advantage
1686 of avoiding repeated validation of vertices by the driver and repeated
1687 mapping of data into the GPU so long as the text doesn't change.
1689 Currently the threshold is 100 vertices/25 quads. This number was plucked
1690 out of thin air and should be tuned later.
1692 With this change I see ~180% fps improvment for test-text. (x61s + i965 +
1695 clutter/pango/cogl-pango-display-list.c | 33 +++++++++++++++++++++++++++++++
1696 1 file changed, 33 insertions(+)
1698 commit 6ac3b5a564608862fdf4e9b8887b882ebe497f4b
1699 Author: Robert Bragg <robert@linux.intel.com>
1700 Date: Wed Jun 17 23:31:40 2009 +0100
1702 [material] _cogl_material_equal: catch the simplest case of matching handles
1704 We were missing the simplest test of all: are the two CoglHandles equal and
1705 are the flush option flags for each material equal? This should improve
1706 batching for some common cases.
1708 clutter/cogl/common/cogl-material.c | 4 ++++
1709 1 file changed, 4 insertions(+)
1711 commit 9afa52f056b58bbd35274fec3fe21ff483949321
1712 Author: Robert Bragg <robert@linux.intel.com>
1713 Date: Wed Jun 17 23:31:11 2009 +0100
1715 [material] avoid flushing the journal when just changing the color
1717 Whenever we modify a material we call _cogl_material_pre_change_notify which
1718 checks to see if the material is referenced by the journal and if so flushes
1719 if before we modify the material.
1721 Since the journal logs material colors directly into a vertex array (to
1722 avoid us repeatedly calling glColor) then we know we never need to flush
1723 the journal when material colors change.
1725 clutter/cogl/common/cogl-material.c | 80 +++++++++++++++++++++++------------
1726 1 file changed, 52 insertions(+), 28 deletions(-)
1728 commit efbf483d8cdd448b20ddcfedc518509f907b2ac6
1729 Author: Robert Bragg <robert@linux.intel.com>
1730 Date: Wed Jun 17 01:31:36 2009 +0100
1732 [cogl journal] Perform software modelview transform on logged quads.
1734 Since most Clutter actors aren't much more than textured quads; flushing the
1735 journal typically involves lots of 'change modelview; draw quad' sequences.
1737 The amount of overhead involved in uploading a new modelview and queuing
1738 that primitive is huge in comparison to simply transforming 4 vertices by
1739 the current modelview when logging quads. (Note if your GPU supports HW
1740 vertex transform, then it still does the projective and viewport transforms)
1742 At the same time a --cogl-debug=disable-software-transform option has been
1743 added for comparison and debugging.
1745 This change allows typical pick scenes to be batched into a single draw call
1746 and I'm seeing test-pick run over 200% faster with this. (i965 + Mesa
1749 clutter/cogl/cogl-debug.h | 3 +-
1750 clutter/cogl/common/cogl-debug.c | 3 +-
1751 clutter/cogl/common/cogl-primitives.c | 158 ++++++++++++++++++++++++---------
1752 3 files changed, 120 insertions(+), 44 deletions(-)
1754 commit 612a1e2dea5599a30e3c922dee288d72e890c415
1755 Author: Robert Bragg <robert@linux.intel.com>
1756 Date: Wed Jun 17 01:30:24 2009 +0100
1758 [Cogl journal] use G_UNLIKLEY around runtime debugging conditions
1760 May as well improve the branch prediction around runtime debugging code.
1762 clutter/cogl/common/cogl-primitives.c | 16 ++++++++--------
1763 1 file changed, 8 insertions(+), 8 deletions(-)
1765 commit 7d1876fd261f5039e25d468e0cc7dcbf63229912
1766 Author: Robert Bragg <robert@linux.intel.com>
1767 Date: Thu Jun 11 11:54:01 2009 +0100
1769 [cogl journal] Adds a --cogl-debug=batching option to trace batching
1771 Enabling this option makes Cogl trace how the journal is managing to batch
1772 your rectangles. The journal staggers how it emmits state to the GL driver
1773 and the batches will normally get smaller for each stage, but ideally you
1774 don't want to be in a situation where Cogl is only able to draw one quad per
1775 modelview change and draw call.
1777 E.g. this is a fairly ideal example:
1778 BATCHING: journal len = 101
1779 BATCHING: vbo offset batch len = 101
1780 BATCHING: material batch len = 101
1781 BATCHING: modelview batch len = 101
1784 BATCHING: journal len = 1
1785 BATCHING: vbo offset batch len = 1
1786 BATCHING: material batch len = 1
1787 BATCHING: modelview batch len = 1
1788 BATCHING: journal len = 1
1789 BATCHING: vbo offset batch len = 1
1790 BATCHING: material batch len = 1
1791 BATCHING: modelview batch len = 1
1794 clutter/cogl/cogl-debug.h | 5 +++--
1795 clutter/cogl/common/cogl-debug.c | 3 ++-
1796 clutter/cogl/common/cogl-primitives.c | 17 ++++++++++++-----
1797 3 files changed, 17 insertions(+), 8 deletions(-)
1799 commit d03e6cfb2c1ea47fdcf8db7d471666bd380c93aa
1800 Author: Robert Bragg <robert@linux.intel.com>
1801 Date: Wed Jun 17 01:59:28 2009 +0100
1803 [Cogl journal] Adds a --cogl-debug=journal option for tracing the journal
1805 When this option is used Cogl will print a trace of all quads that get
1806 logged into the journal, and a trace of quads as they get flushed.
1808 If you are seeing a bug with the geometry being drawn by Cogl this may give
1809 some clues by letting you sanity check the numbers being logged vs the
1810 numbers being emitted.
1812 clutter/cogl/cogl-debug.h | 3 ++-
1813 clutter/cogl/common/cogl-debug.c | 3 ++-
1814 clutter/cogl/common/cogl-primitives.c | 36 +++++++++++++++++++++------------
1815 3 files changed, 27 insertions(+), 15 deletions(-)
1817 commit 3ea7816499996c3bb918b27c6f44c987b90d2e9c
1818 Author: Robert Bragg <robert@linux.intel.com>
1819 Date: Wed Jun 17 01:46:06 2009 +0100
1821 [cogl] Adds a debug option for disabling use of VBOs --cogl-debug=disable-vbos
1823 For testing the VBO fallback paths it helps to be able to disable the
1824 COGL_FEATURE_VBOS feature flag. When VBOs aren't available Cogl should use
1825 client side malloc()'d buffers instead.
1827 clutter/cogl/cogl-debug.h | 3 ++-
1828 clutter/cogl/common/cogl-debug.c | 3 ++-
1829 clutter/cogl/common/cogl.c | 3 +++
1830 3 files changed, 7 insertions(+), 2 deletions(-)
1832 commit 54159f5a1d029dbfff19711f5397fc9b99556ed4
1833 Author: Robert Bragg <robert@linux.intel.com>
1834 Date: Wed Jun 17 01:37:39 2009 +0100
1836 [cogl] Force Cogl to always use the client side matrix stack
1838 Previously we only used the Cogl matrix stack API for indirect contexts, but
1839 it's too costly to keep on requesting modelview matrices from GL (for
1840 logging in the journal) even for direct rendering.
1842 I also experimented with a patch for mesa to improve performance and
1843 discussed this with upstream, but we agreed to consider the GL matrix API
1844 essentially deprecated. (For reference the GLES 2 and GL 3 specs have
1845 removed the matrix APIs)
1847 clutter/cogl/common/cogl-current-matrix.c | 2 ++
1848 1 file changed, 2 insertions(+)
1850 commit 713af6535de11f27e1da9c1e233e8402d2864ab9
1851 Author: Robert Bragg <robert@linux.intel.com>
1852 Date: Fri Jun 5 13:50:00 2009 +0100
1854 [cogl-debug] Adds a "client-side-matrices" Cogl debug option
1856 This allows us to force Cogl to use the client side matrix stack even when
1859 clutter/cogl/cogl-debug.h | 3 ++-
1860 clutter/cogl/common/cogl-current-matrix.c | 3 ++-
1861 clutter/cogl/common/cogl-debug.c | 3 ++-
1862 3 files changed, 6 insertions(+), 3 deletions(-)
1864 commit a8be68c83cb97a8bafc93f5304e177e1b265bca1
1865 Author: Robert Bragg <robert@linux.intel.com>
1866 Date: Fri Jun 5 12:58:31 2009 +0100
1868 [cogl-color] Adds a cogl_color_equal() function
1870 CoglColors shouldn't be compared using memcmp since they may contain
1871 uninitialized padding bytes.
1873 The prototype is also suitable for passing to g_hash_table_new as the
1876 _cogl_pango_display_list_add_texture now uses this instead of memcmp.
1878 clutter/cogl/cogl-color.h | 16 ++++++++++++++++
1879 clutter/cogl/common/cogl-color.c | 15 +++++++++++++++
1880 clutter/pango/cogl-pango-display-list.c | 3 +--
1881 3 files changed, 32 insertions(+), 2 deletions(-)
1883 commit aca1bf4329481cedfd8ffa65591338662c6d626a
1884 Author: Robert Bragg <robert@linux.intel.com>
1885 Date: Thu Jun 4 14:23:16 2009 +0100
1887 [cogl material] optimize logging of material colors in the journal
1889 We now put the color of materials into the vertex array used by the journal
1890 instead of calling glColor() but the number of requests for the material
1891 color were quite expensive so we have changed the material color to
1892 internally be byte components instead of floats to avoid repeat conversions
1893 and added _cogl_material_get_colorubv as a fast-path for the journal to
1894 copy data into the vertex array.
1896 clutter/cogl/common/cogl-material-private.h | 21 ++++-------
1897 clutter/cogl/common/cogl-material.c | 51 ++++++++++++++++-----------
1898 clutter/cogl/common/cogl-primitives.c | 26 ++++++--------
1899 clutter/cogl/gles/cogl-gles2-wrapper.c | 7 ++++
1900 clutter/cogl/gles/cogl-gles2-wrapper.h | 2 ++
1901 5 files changed, 56 insertions(+), 51 deletions(-)
1903 commit 938452f1b1109e7c8daff8f49c4f0a45a13be25f
1904 Author: Robert Bragg <robert@linux.intel.com>
1905 Date: Fri Jun 5 13:03:14 2009 +0100
1907 [rectangle] Avoid modifying materials mid scene
1909 To improve batching of geometry in the Cogl journal we need to avoid modifying
1912 Currently cogl_set_source_color and cogl_set_source_texture simply modify a
1913 single shared material. In the future we can improve this so they use a pool
1914 of materials that gets recycled as the journal is flushed, but for now we
1915 give all ClutterRectangles their own private materials for painting with.
1917 clutter/clutter-rectangle.c | 89 ++++++++++++++++++++++++++-----------------
1918 1 file changed, 55 insertions(+), 34 deletions(-)
1920 commit dc1ca79398e343d06918cf1c38b72771f476f0a6
1921 Author: Robert Bragg <robert@linux.intel.com>
1922 Date: Wed Jun 17 18:36:27 2009 +0100
1924 [actor] Avoid modifying materials mid-scene to improve journal batching
1926 Currently cogl_set_source_color uses a single shared material which means
1927 each actor that uses it causes the journal to flush if the color changes.
1928 Until we improve cogl_set_source_color to use a pool of materials that can
1929 be recycled as the journal is flushed we avoid mid-scene material changes by
1930 giving all actors a private material instead.
1932 clutter/clutter-actor.c | 14 ++++++++++----
1933 1 file changed, 10 insertions(+), 4 deletions(-)
1935 commit 40cfaeaffc9b744d99c21c1e6cd5b57e358ff37a
1936 Author: Robert Bragg <robert@linux.intel.com>
1937 Date: Wed Jun 10 13:59:45 2009 +0100
1939 [journal] Always pad our vertex data as if at least 2 layers are enabled
1941 The number of material layers enabled when logging a quad in the journal
1942 determines the stride of the corresponding vertex data (since we need a set
1943 of texture coordinates for each layer.) By padding data in the case where we
1944 have only one layer we can avoid a change in stride if we are mixing single
1945 and double layer primitives in a scene (e.g. relevent for a composite
1946 manager that may use 2 layers for all shaped windows) Avoiding stride
1947 changes means we can minimize calls to gl{Vertex,Color}Pointer when flushing
1950 Since we need to update the texcoord pointers when the actual number of
1951 layers changes, this adds another batch_and_call() stage to deal with
1952 glTexCoordPointer and enabling/disabling the client arrays.
1954 clutter/cogl/common/cogl-primitives.c | 108 ++++++++++++++++++++++++---------
1955 1 file changed, 78 insertions(+), 30 deletions(-)
1957 commit 845ff67301da767926f96c56026a8dd9c7964f01
1958 Author: Robert Bragg <robert@linux.intel.com>
1959 Date: Wed Jun 17 18:46:42 2009 +0100
1961 [cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
1963 Previously the journal was always flushed at the end of
1964 _cogl_rectangles_with_multitexture_coords, (i.e. the end of any
1965 cogl_rectangle* calls) but now we have broadened the potential for batching
1966 geometry. In ideal circumstances we will only flush once per scene.
1968 In summary the journal works like this:
1970 When you use any of the cogl_rectangle* APIs then nothing is emitted to the
1971 GPU at this point, we just log one or more quads into the journal. A
1972 journal entry consists of the quad coordinates, an associated material
1973 reference, and a modelview matrix. Ideally the journal only gets flushed
1974 once at the end of a scene, but in fact there are things to consider that
1975 may cause unwanted flushing, including:
1977 - modifying materials mid-scene
1978 This is because each quad in the journal has an associated material
1979 reference (i.e. not copy), so if you try and modify a material that is
1980 already referenced in the journal we force a flush first)
1982 NOTE: For now this means you should avoid using cogl_set_source_color()
1983 since that currently uses a single shared material. Later we
1984 should change it to use a pool of materials that is recycled
1985 when the journal is flushed.
1987 - modifying any state that isn't currently logged, such as depth, fog and
1988 backface culling enables.
1990 The first thing that happens when flushing, is to upload all the vertex data
1991 associated with the journal into a single VBO.
1993 We then go through a process of splitting up the journal into batches that
1994 have compatible state so they can be emitted to the GPU together. This is
1995 currently broken up into 3 levels so we can stagger the state changes:
1997 1) we break the journal up according to changes in the number of material layers
1998 associated with logged quads. The number of layers in a material determines
1999 the stride of the associated vertices, so we have to update our vertex
2000 array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2001 2) we further split batches up according to material compatability. (e.g.
2002 materials with different textures) We flush material state at this level.
2003 3) Finally we split batches up according to modelview changes. At this level
2004 we update the modelview matrix and actually emit the actual draw command.
2006 This commit is largely about putting the initial design in-place; this will be
2007 followed by other changes that take advantage of the extended batching.
2009 clutter/clutter-main.c | 3 +
2010 clutter/cogl/cogl-debug.h | 21 +-
2011 clutter/cogl/cogl-material.h | 19 +-
2012 clutter/cogl/cogl.h.in | 14 +
2013 clutter/cogl/common/cogl-clip-stack.c | 4 +
2014 clutter/cogl/common/cogl-debug.c | 3 +-
2015 clutter/cogl/common/cogl-material-private.h | 99 ++--
2016 clutter/cogl/common/cogl-material.c | 318 +++++++++++--
2017 clutter/cogl/common/cogl-primitives.c | 667 +++++++++++++++++++--------
2018 clutter/cogl/common/cogl-primitives.h | 2 +
2019 clutter/cogl/common/cogl-vertex-buffer.c | 28 +-
2020 clutter/cogl/common/cogl.c | 38 +-
2021 clutter/cogl/gl/cogl-context.c | 4 +
2022 clutter/cogl/gl/cogl-context.h | 4 +
2023 clutter/cogl/gl/cogl-fbo.c | 2 +
2024 clutter/cogl/gl/cogl-primitives.c | 44 +-
2025 clutter/cogl/gl/cogl-program.c | 5 +
2026 clutter/cogl/gl/cogl-texture-private.h | 12 +-
2027 clutter/cogl/gl/cogl-texture.c | 3 +-
2028 clutter/eglnative/clutter-backend-egl.c | 1 +
2029 clutter/eglx/clutter-backend-egl.c | 1 +
2030 clutter/fruity/clutter-backend-fruity.c | 1 +
2031 clutter/glx/clutter-backend-glx.c | 1 +
2032 clutter/osx/clutter-stage-osx.c | 1 +
2033 clutter/sdl/clutter-backend-sdl.c | 3 +-
2034 clutter/win32/clutter-backend-win32.c | 1 +
2035 26 files changed, 1003 insertions(+), 296 deletions(-)
2037 commit 04bb7899416063994af8730866f390e68ecc4d65
2038 Author: Øyvind Kolås <pippin@linux.intel.com>
2039 Date: Tue Jun 30 16:48:53 2009 +0100
2041 [texture] fix load-async and load-data-async properties.
2043 Removed the G_PARAM_CONSTRUCT from the property registration of
2044 "load-async" and "load-data-async". It made it impossible to use only
2045 load-data-async, as the async loading state would be unset when
2046 load-async got set it's default FALSE value.
2048 clutter/clutter-texture.c | 4 ++--
2049 1 file changed, 2 insertions(+), 2 deletions(-)
2051 commit 722360774ca4628c1589f5d6f09932faa0c8b711
2052 Author: Robert Bragg <robert@linux.intel.com>
2053 Date: Mon Jun 22 00:58:32 2009 +0100
2055 [clip-stack] Use signed integers while combining window space clip rectangles
2057 Use signed integers while combining window space clip rectangles, so we avoid
2058 arithmatic errors later resulting in glScissor getting negative width and
2061 clutter/cogl/common/cogl-clip-stack.c | 10 +++++-----
2062 1 file changed, 5 insertions(+), 5 deletions(-)
2064 commit d63cda3b7620daa4e081e7023ce5d0afb5783b54
2065 Author: Robert Bragg <robert@linux.intel.com>
2066 Date: Mon Jun 22 00:00:04 2009 +0100
2068 [cogl] Remove unused ctx->polygon_vertices array
2070 This array used to be used by cogl_polygon but was changed to use
2071 ctx->logged_vertices some time ago.
2073 clutter/cogl/gl/cogl-context.c | 4 ----
2074 clutter/cogl/gl/cogl-context.h | 1 -
2075 2 files changed, 5 deletions(-)
2077 commit 30f13cafc5fff69c7e31f3ead2df5d6c0282ec07
2078 Author: Robert Bragg <robert@linux.intel.com>
2079 Date: Tue Jun 23 15:24:42 2009 +0100
2081 [cogl] Give the default (fallback) texture a format of RGBA_8888_PRE
2083 Previously this was RGBA_8888. It souldn't really make a difference but for
2084 consistency we expect almost all textures in use to have an internaly
2085 premultiplied pixel format.
2087 clutter/cogl/gl/cogl-context.c | 8 ++++----
2088 1 file changed, 4 insertions(+), 4 deletions(-)
2090 commit 4680b34046aba7adfb958d2995d7e56fdcb3d473
2091 Author: Robert Bragg <robert@linux.intel.com>
2092 Date: Fri Jun 19 16:39:37 2009 +0100
2094 [cogl-texture] use the right format when downloading sliced textures from GL
2096 _cogl_texture_download_from_gl needs to create transient CoglBitmaps when
2097 downloading sliced textures from GL, and then copies these as subregions
2098 into the final target_bitmap. _cogl_texture_download_from_gl also supports
2099 target_bitmaps with a different format to the source CoglTexture being
2102 The problem was that in the case of slice textures we were always looking
2103 at the format of the CoglTexture, not of the target_bitmap when setting
2104 up the transient slice bitmap.
2106 clutter/cogl/gl/cogl-texture.c | 2 +-
2107 1 file changed, 1 insertion(+), 1 deletion(-)
2109 commit 24ca92951f739278697990fb25f351045d6ece9c
2110 Author: Robert Bragg <robert@linux.intel.com>
2111 Date: Wed Jun 17 14:30:44 2009 +0100
2113 [cogl] Adds cogl_read_pixels to replace direct use of glReadPixels
2115 To allow for flushing of batched geometry within Cogl we can't support users
2116 directly calling glReadPixels. glReadPixels is also awkward, not least
2117 because it returns upside down image data.
2119 All the unit tests have been swithed over and clutter_stage_read_pixels now
2120 sits on top of this too.
2122 clutter/clutter-stage.c | 44 +++----------------
2123 clutter/cogl/cogl.h.in | 33 +++++++++++++++
2124 clutter/cogl/common/cogl.c | 56 +++++++++++++++++++++++++
2125 doc/reference/cogl/cogl-sections.txt | 4 ++
2126 tests/conform/test-blend-strings.c | 16 ++++---
2127 tests/conform/test-premult.c | 14 ++++---
2128 tests/conform/test-vertex-buffer-contiguous.c | 28 +++++++++----
2129 tests/conform/test-vertex-buffer-interleved.c | 9 ++--
2130 tests/conform/test-vertex-buffer-mutability.c | 13 ++++--
2131 9 files changed, 151 insertions(+), 66 deletions(-)
2133 commit 27fff12a6a880241002cec3705da7af9905a20bf
2134 Author: Robert Bragg <robert@linux.intel.com>
2135 Date: Wed Jun 17 02:08:31 2009 +0100
2137 [cogl matrix] Adds ability to dirty state cached by the client matrix apis
2139 To be able to load matrices to GL manually within Cogl we need a way to
2140 dirty the state cached by the client matrix stack API.
2142 clutter/cogl/common/cogl-current-matrix.c | 15 +++++++++++++++
2143 clutter/cogl/common/cogl-current-matrix.h | 1 +
2144 clutter/cogl/common/cogl-matrix-stack.c | 7 +++++++
2145 clutter/cogl/common/cogl-matrix-stack.h | 1 +
2146 4 files changed, 24 insertions(+)
2148 commit 26d5afd203ba393255fdc98cd980f65d014967c3
2149 Author: Robert Bragg <robert@linux.intel.com>
2150 Date: Thu Jun 11 00:34:00 2009 +0100
2152 [debug] Adds a "nop-picking" clutter debug option to NOP _clutter_do_pick()
2154 I've found this is something I do quite often when debugging rendering
2155 problems since its a simple way to wipe out lots of geometry and removes a
2156 lot of unpredictable noise when logging geometry passing through the Cogl
2159 clutter/clutter-debug.h | 3 ++-
2160 clutter/clutter-main.c | 6 +++++-
2161 2 files changed, 7 insertions(+), 2 deletions(-)
2163 commit 56bc54d2426e7ea4a092d4cae1792a124ce55600
2164 Author: Robert Bragg <robert@linux.intel.com>
2165 Date: Tue Jun 16 22:48:21 2009 +0100
2167 [cogl_polygon] fixes a buffer overrun and color format bug
2169 We were calculating our vertex stride and allocating our vertex array
2170 differently depending on whether the user passed TRUE for use_color or not.
2171 The problem was that we were always writting color data to the array
2172 regardless of use_color.
2174 There was also a bug with _cogl_texture_sliced_polygon in that it was
2175 writing byte color components but we were expecting float components. We
2176 now use byte components in _cogl_multitexture_unsliced_polygon too and pass
2177 GL_UNSIGNED_BYTE to glColorPointer.
2179 clutter/cogl/common/cogl-primitives.c | 40 +++++++++++++++++++--------------
2180 1 file changed, 23 insertions(+), 17 deletions(-)
2182 commit 060f1488e043c31b5c6841a719a5bc0cb7e8c30b
2183 Author: Robert Bragg <robert@linux.intel.com>
2184 Date: Tue Jun 16 00:45:44 2009 +0100
2186 [test-cogl-tex-getset] Assume a premultiplied pixel format
2188 test-cogl-tex-getset was assuming it was dealing with
2189 COGL_PIXEL_FORMAT_RGBA_8888 but since merging the premultiplcation branch
2190 the pixel format is actually COGL_PIXEL_FORMAT_RGBA_8888_PRE
2192 tests/interactive/test-cogl-tex-getset.c | 6 +++---
2193 1 file changed, 3 insertions(+), 3 deletions(-)
2195 commit 8f734ccbb48effa1b9f3057e26ac5eb40ef54930
2196 Author: Robert Bragg <robert@linux.intel.com>
2197 Date: Wed Jun 17 15:03:33 2009 +0100
2199 [vertex-buffer] Add cogl_vertex_buffer_indices_get_type API
2201 cogl_vertex_buffer_indices lets you query back the data type used for the
2202 given indices handle.
2204 clutter/cogl/cogl-vertex-buffer.h | 11 +++++++++++
2205 clutter/cogl/common/cogl-vertex-buffer.c | 21 +++++++++++++++++++++
2206 2 files changed, 32 insertions(+)
2208 commit 555159776b9146d86b0be8b224c4712cf67dcaa7
2209 Author: Robert Bragg <robert@linux.intel.com>
2210 Date: Wed Jun 17 15:02:56 2009 +0100
2212 [vertex-buffer] Remove the COGL_INDICES_TYPE_UNSIGNED_INT indicies type
2214 Since some embedded GPUs may not support 32bit integer indices we wont
2215 include it until there is a particular need.
2217 clutter/cogl/cogl-vertex-buffer.h | 2 --
2218 1 file changed, 2 deletions(-)
2220 commit a66f027c61c9dfd545c3ba4d9d104679bef2ec43
2221 Author: Damien Lespiau <damien.lespiau@intel.com>
2222 Date: Thu Jun 25 16:06:41 2009 +0200
2224 [cogl] Add COGL_HAS_GL and COGL_HAS_GLES
2226 Cogl already add similar defines but with the CLUTTER namespace
2227 (CLUTTER_COGL_HAS_GL and CLUTTER_COGL_HAS_GLES). Let's just add two
2228 similar defines with the COGL namespace. Removing the CLUTTER_COGL ones
2229 could break applications silently for no real good reason.
2231 clutter/cogl/gl/cogl-defines.h.in | 1 +
2232 clutter/cogl/gles/cogl-defines.h.in | 1 +
2233 2 files changed, 2 insertions(+)
2235 commit 30b5dac7c319ecedee7492b126bcb6e0c4b5928c
2236 Author: Damien Lespiau <damien.lespiau@intel.com>
2237 Date: Thu Jun 25 15:59:11 2009 +0200
2239 [misc] Update headers #endif comments
2241 While grepping through the public headers looking for invalid use of
2242 private HAVE_* defines, I stumbled upon two out of sync comments. Yes
2243 it's a very minor trivial change.
2245 clutter/clutter-actor.h | 2 +-
2246 clutter/clutter-color.h | 2 +-
2247 2 files changed, 2 insertions(+), 2 deletions(-)
2249 commit 81bc2b4cc7c755b825f55424be261a5120f4fc0c
2250 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2251 Date: Mon Jun 29 16:34:49 2009 +0100
2253 [actor] Remove unused clutter_actor_pick()
2255 The clutter_actor_pick() function just emits the ::pick signal
2256 on the actor. Nobody should be using it, since the paint() method
2257 is already context sensitive and will result in a ::pick emission
2258 by itself. The clutter_actor_pick() is just confusing things.
2260 clutter/clutter-actor.c | 29 ----------------------------
2261 clutter/clutter-actor.h | 2 --
2262 clutter/clutter-deprecated.h | 2 ++
2263 doc/reference/clutter/clutter-sections.txt | 1 -
2264 4 files changed, 2 insertions(+), 32 deletions(-)
2266 commit bd668cf156bf54d2ad1cee8ea7cd0c13b02ea95f
2267 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2268 Date: Mon Jun 29 16:33:07 2009 +0100
2270 Add more debug notes inside the master clock
2272 clutter/clutter-master-clock.c | 20 +++++++++++++++-----
2273 1 file changed, 15 insertions(+), 5 deletions(-)
2275 commit 9e84e5203421c8a358fbcfe6f1eb6c70f95fd160
2276 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2277 Date: Tue Jun 23 15:45:42 2009 +0100
2279 [docs] Update after the Input API changes
2281 doc/reference/clutter/clutter-sections.txt | 3 +--
2282 1 file changed, 1 insertion(+), 2 deletions(-)
2284 commit 537ccc3cd94cb43740c622d5e65d62cbae062579
2285 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2286 Date: Tue Jun 23 15:25:16 2009 +0100
2288 [docs] Add an initial porting guide
2290 The Clutter API reference should have a section on how to port
2291 applications from older version of Clutter to the new API.
2293 The first guide deals on how to port animations created with
2294 ClutterEffect to clutter_actor_animate().
2296 doc/reference/clutter/Makefile.am | 6 +-
2297 doc/reference/clutter/clutter-docs.xml.in | 16 ++-
2298 doc/reference/clutter/migrating-ClutterEffect.xml | 137 +++++++++++++++++++++
2299 3 files changed, 154 insertions(+), 5 deletions(-)
2301 commit de745e93c99951baae16151c373ebc06a2571b59
2302 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2303 Date: Tue Jun 23 15:23:53 2009 +0100
2305 [docs] Fix the ActorBox annotations
2307 The ClutterActorBox API is incorrectly annotated and gtk-doc is unable
2310 clutter/clutter-actor.c | 10 +++++-----
2311 1 file changed, 5 insertions(+), 5 deletions(-)
2313 commit 20f3c173fe10bee6d04814d08bfe21e23c294cf8
2314 Author: Neil Roberts <neil@linux.intel.com>
2315 Date: Wed Jun 24 12:04:55 2009 +0100
2317 [test-shader] Fix some of the shaders to use premultiplied colors
2319 Texture data is now in premultiplied format and the shader should
2320 output a premultiplied color if the default blend mode is being
2321 used. Shaders that directly manipulate the rgb values now
2322 unpremultiply and premultiply again afterwards.
2324 tests/interactive/test-shader.c | 6 ++++++
2325 1 file changed, 6 insertions(+)
2327 commit e9d277609d81bd5198638b9565e1668ff8391235
2328 Author: Tim Horton <hortont@svn.gnome.org>
2329 Date: Thu Jun 18 22:46:48 2009 -0400
2331 Add element-type annotations for animate*v functions
2335 http://bugzilla.openedhand.com/show_bug.cgi?id=1653
2337 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2339 clutter/clutter-animation.c | 12 ++++++------
2340 1 file changed, 6 insertions(+), 6 deletions(-)
2342 commit c272a7b2a2a9817b3b4f67fafcefeb2b241b7eb0
2343 Author: Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>
2344 Date: Thu Jun 18 23:53:46 2009 +0200
2346 [master clock] Fix MT safety issues
2348 Fix MT issues when enabling threading in Clutter.
2352 http://bugzilla.openedhand.com/show_bug.cgi?id=1655
2354 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2356 clutter/clutter-master-clock.c | 8 ++++++++
2357 1 file changed, 8 insertions(+)
2359 commit ba6c0c27f9b796bbf6f81de1deab10877a287f37
2360 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2361 Date: Mon Jun 22 12:07:08 2009 +0100
2363 [texture] Revert to integer parameters in ::size-change
2365 In the int-to-float switch for actor properties, the ::size-change signal
2366 was moved to use floats instead of integers. Sub-pixel precision for image
2367 size is meaningless, though, so we should revert it back to ints.
2371 http://bugzilla.openedhand.com/show_bug.cgi?id=1659
2373 clutter/clutter-texture.c | 96 +++++++++++++++++++++++++--------------------
2374 1 file changed, 53 insertions(+), 43 deletions(-)
2376 commit 8a1cf0cff4320b61cbede38b39e5b7ece6d24b08
2377 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2378 Date: Fri Jun 19 18:25:25 2009 +0100
2380 Post-release bump to 0.9.5
2383 1 file changed, 1 insertion(+), 1 deletion(-)
2385 commit fdaaa8b6d701d2b43fd2750de1b018b5af5577ea
2386 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2387 Date: Fri Jun 19 17:50:31 2009 +0100
2392 1 file changed, 1 insertion(+), 1 deletion(-)
2394 commit b833ed3c0d678e0fa65da8c602d946446d225f5d
2395 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2396 Date: Tue Jun 16 16:42:41 2009 +0100
2398 Update the NEWS file
2400 NEWS | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2401 1 file changed, 78 insertions(+)
2403 commit 3d49edad85dd4756b4845b619abdfa76ecd4e469
2404 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2405 Date: Fri Jun 19 18:06:02 2009 +0100
2407 [docs] Add new input-related accessors
2409 Add the ClutterEvent accessors for the device pointer and type, and
2410 the ClutterInputDevice accessors for the id and type.
2412 doc/reference/clutter/clutter-sections.txt | 4 ++++
2413 1 file changed, 4 insertions(+)
2415 commit a79d6228aa75e5d27f4229c32950494629c81126
2416 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2417 Date: Fri Jun 19 16:38:35 2009 +0100
2419 Remove the last few fixed-point entry points
2421 The last fixed-point entry points are just a few, and trivial. The
2422 end user is expected to do the conversion using the CoglFixed type
2425 clutter/clutter-behaviour-ellipse.c | 275 ++--------------------------
2426 clutter/clutter-behaviour-ellipse.h | 136 +++++---------
2427 clutter/clutter-behaviour-rotate.c | 96 ----------
2428 clutter/clutter-behaviour-rotate.h | 11 --
2429 clutter/clutter-behaviour-scale.c | 104 -----------
2430 clutter/clutter-behaviour-scale.h | 47 ++---
2431 clutter/clutter-deprecated.h | 20 ++
2432 clutter/clutter-timeline.c | 16 --
2433 clutter/clutter-timeline.h | 1 -
2434 doc/reference/clutter/clutter-sections.txt | 16 --
2435 10 files changed, 94 insertions(+), 628 deletions(-)
2437 commit cb4e5c90835e218247d3787c9df310b1fbdc7726
2438 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2439 Date: Fri Jun 19 15:12:32 2009 +0100
2441 [x11] Simplify the XInput support
2443 Instead of using a specific function to check whether the X
2444 server supports the XInput extension we can use the generic
2445 Xlib function XQueryExtension(). This cuts down the extra
2446 checks inside the configure.ac and simplifies the code inside
2447 clutter_x11_register_xinput().
2449 clutter/x11/clutter-backend-x11.c | 54 +++++++++++++++++--------------------
2450 configure.ac | 41 ----------------------------
2451 2 files changed, 25 insertions(+), 70 deletions(-)
2453 commit 21608fe5f7c7a7750b09a1cbd10d68027a425085
2454 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2455 Date: Fri Jun 19 14:32:37 2009 +0100
2457 [x11] Add a command line switch for enabling XInput
2459 Currently, XInput support requires a function call. In order to
2460 make it easier for people to test it, we can also add a command
2461 line switch that moves the pointer device detection and handling
2462 to XInput. This should ensure that, at least for people building
2463 Clutter with --enable-xinput, applications can be easily migrated
2464 and regressions can be caught.
2466 clutter/x11/clutter-backend-x11.c | 18 +++++++++++++-----
2467 1 file changed, 13 insertions(+), 5 deletions(-)
2469 commit 0ec541282acf7b9ea08217b154524013c93b7d95
2470 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2471 Date: Fri Jun 19 14:20:50 2009 +0100
2473 [tests] Remove unneeded g_type_init()
2475 Now that we can safely check for an uninitialized Clutter we
2476 don't have side effects in calling one of the functions like
2477 clutter_x11_enable_xinput(), which require to be called before
2478 any other Clutter function.
2480 tests/interactive/test-devices.c | 4 ++--
2481 1 file changed, 2 insertions(+), 2 deletions(-)
2483 commit a6b469736770d2c2ea25b582196bd221ce85721e
2484 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2485 Date: Fri Jun 19 14:19:39 2009 +0100
2487 [backend] Do not store the stage manager singleton
2489 The StageManager singleton instance is already kept around
2490 by the clutter_stage_manager_get_default() function; there is
2491 no need to have it inside the main Clutter context as well.
2493 clutter/clutter-backend.c | 9 +++------
2494 clutter/clutter-private.h | 1 -
2495 clutter/x11/clutter-backend-x11.c | 5 +----
2496 3 files changed, 4 insertions(+), 11 deletions(-)
2498 commit b6e404a40605bc94ad429e5d64325286a381275e
2499 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2500 Date: Fri Jun 19 14:12:36 2009 +0100
2502 [x11] Use _clutter_context_is_initialized()
2504 Instead of using _clutter_context_get_default() and checking the
2505 is_initialized flag, we should use the newly added private function
2506 that does not cause side effects, especially for functions that have
2507 to be called before any other Clutter function.
2509 clutter/x11/clutter-backend-x11.c | 22 ++++++++--------------
2510 1 file changed, 8 insertions(+), 14 deletions(-)
2512 commit b5f4befeaa2d1944c7623a31f8a8ccaae200b640
2513 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2514 Date: Fri Jun 19 14:09:42 2009 +0100
2516 Allow checking initialization without side-effects
2518 The _clutter_context_get_default() function will automatically
2519 create the main Clutter context; if we just want to check whether
2520 Clutter has been initialized this will complicate matters, by
2521 requiring a call to g_type_init() inside the client code.
2523 Instead, we should simply provide an internal API that checks
2524 whether the main Clutter context exists and if it has been
2525 initialized, without any side effect.
2527 clutter/clutter-main.c | 13 +++++++++++--
2528 clutter/clutter-private.h | 1 +
2529 2 files changed, 12 insertions(+), 2 deletions(-)
2531 commit 184df2a5fa34375cff8cde5318ba46bdbd7c3026
2532 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2533 Date: Fri Jun 19 13:07:20 2009 +0100
2535 [input] Rework input device API
2537 The input device API is split halfway thorugh the backends in a very
2538 weird way. The data structures are private, as they should, but most
2539 of the information should be available in the main API since it's
2542 The device type enumeration, for instance, should be common across
2543 every backend; the accessors for device type and id should live in the
2544 core API. The internal API should always use ClutterInputDevice and
2545 not the private X11 implementation when dealing with public structures
2548 By adding accessors for the device type and id, and by moving the
2549 device type enumeration into the core API we can cut down the amount
2550 of symbols private and/or visible only to the X11 backends; this way
2551 when other backends start implementing multi-pointer support we can
2552 share the same API across the code.
2554 clutter/clutter-event.c | 147 +++++++++++++++++++++-
2555 clutter/clutter-event.h | 95 +++++++++-----
2556 clutter/clutter-main.c | 35 ------
2557 clutter/clutter-private.h | 3 +
2558 clutter/x11/clutter-backend-x11.c | 252 ++++++++++++++++++-------------------
2559 clutter/x11/clutter-backend-x11.h | 2 +-
2560 clutter/x11/clutter-event-x11.c | 39 +++---
2561 clutter/x11/clutter-x11.h | 10 +-
2562 tests/interactive/test-devices.c | 60 +++++----
2563 9 files changed, 392 insertions(+), 251 deletions(-)
2565 commit 3653a9a64d1666f05a256d96ef5741144459b686
2566 Author: Damien Lespiau <damien.lespiau@intel.com>
2567 Date: Mon Jun 15 14:15:27 2009 +0100
2569 Public headers should not have #ifdefs relying on private defines
2571 HAVE_COGL_GLES2 is defined in config.h through the configure script and
2572 should not be used in public headers.
2574 The patch makes configure generate the right define that can be used
2575 later in the header.
2577 clutter/cogl/gles/cogl-defines.h.in | 6 ++++--
2578 configure.ac | 3 +++
2579 2 files changed, 7 insertions(+), 2 deletions(-)
2581 commit c6fba47a5229b7d52f2ff7e78c6cff52ce2069c2
2582 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2583 Date: Wed Jun 17 17:59:54 2009 +0100
2585 Hide clutter_context_get_default()
2587 The clutter_context_get_default() function is private, but shared
2588 across Clutter. For this reason, it should be prefixed by '_' so
2589 that the symbol is hidden from the shared object.
2591 clutter/clutter-actor.c | 13 +++----
2592 clutter/clutter-backend.c | 8 ++--
2593 clutter/clutter-event.c | 10 ++---
2594 clutter/clutter-feature.c | 4 +-
2595 clutter/clutter-main.c | 61 ++++++++++++++++---------------
2596 clutter/clutter-private.h | 4 +-
2597 clutter/clutter-stage.c | 5 ++-
2598 clutter/clutter-texture.c | 2 +-
2599 clutter/eglnative/clutter-event-egl.c | 2 +-
2600 clutter/fruity/clutter-backend-fruity.c | 8 ++--
2601 clutter/fruity/clutter-fruity.c | 2 +-
2602 clutter/sdl/clutter-event-sdl.c | 2 +-
2603 clutter/win32/clutter-backend-win32.c | 4 +-
2604 clutter/win32/clutter-event-win32.c | 6 +--
2605 clutter/win32/clutter-stage-win32.c | 10 +++--
2606 clutter/x11/clutter-backend-x11.c | 16 ++++----
2607 clutter/x11/clutter-event-x11.c | 4 +-
2608 clutter/x11/clutter-stage-x11.c | 14 +++----
2609 18 files changed, 87 insertions(+), 88 deletions(-)
2611 commit 8c676ebd872b65e84896f5390b7642416fcb1040
2612 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2613 Date: Wed Jun 17 15:43:53 2009 +0100
2615 Remove an unusued member from MainContext
2617 The MainContext structure has a field for the master clock, but
2618 clutter_master_clock_get_default() will return the same instance
2621 clutter/clutter-main.c | 2 --
2622 clutter/clutter-private.h | 1 -
2623 2 files changed, 3 deletions(-)
2625 commit 1aa8c89f2c18e01e9f36338c0609f58caaa90c3a
2626 Author: Matthew Allum <mallum@openedhand.com>
2627 Date: Wed Jun 17 15:09:16 2009 +0100
2629 [XInput] Get XInput working again.
2631 Check for distros shipping out of sync header vs libXi,
2632 call in g_type_init() in test-devices, fix ifdef so
2633 XInput events get correctly selected.
2635 clutter/glx/clutter-stage-glx.c | 2 +-
2636 configure.ac | 13 ++++++++++---
2637 tests/interactive/test-devices.c | 2 ++
2638 3 files changed, 13 insertions(+), 4 deletions(-)
2640 commit 3035092edba837593ff753817b3d8807a83555aa
2641 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2642 Date: Tue Jun 16 18:08:52 2009 +0100
2644 Do not use the --pkd switch for g-ir-scanner
2646 Revert commit 8aacff0e0f38d2cdfae841f6a154baa793ea7739
2648 clutter/Makefile.am | 1 -
2649 1 file changed, 1 deletion(-)
2651 commit c4716d78d0ee874115e970666ba7739f1829b90e
2652 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2653 Date: Tue Jun 16 16:42:07 2009 +0100
2655 [docs] Update the backends hacking reference
2657 HACKING.backends | 2 --
2658 1 file changed, 2 deletions(-)
2660 commit 29ab2691166a2417733fef527845e9877e627186
2661 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2662 Date: Tue Jun 16 16:41:46 2009 +0100
2664 [docs] Update the release notes
2666 README | 40 ++++++++++++++++++++++++++++++++++++----
2667 1 file changed, 36 insertions(+), 4 deletions(-)
2669 commit 5e098c388668fe3ee3f08b28e73a9a4120216993
2670 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2671 Date: Tue Jun 16 16:41:29 2009 +0100
2673 [docs] Update the HACKING file
2675 HACKING | 52 +++++++---------------------------------------------
2676 1 file changed, 7 insertions(+), 45 deletions(-)
2678 commit 8aacff0e0f38d2cdfae841f6a154baa793ea7739
2679 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2680 Date: Tue Jun 16 16:40:36 2009 +0100
2682 [introspection] Add --pkg switch pointing at Clutter
2684 Add a <package/> element pointing to Clutter's pkg-config
2687 clutter/Makefile.am | 1 +
2688 1 file changed, 1 insertion(+)
2690 commit 9f83e7dc2ee855dbbb8cb7de8b7a42d43dd485b0
2691 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2692 Date: Tue Jun 16 16:38:01 2009 +0100
2694 [stage] Remove an assertion
2696 We might get a size request on destruction, so it should be safe
2697 to avoid an assertion failure because we don't have the stage
2698 implementation anymore.
2700 clutter/clutter-stage.c | 9 ++++++---
2701 1 file changed, 6 insertions(+), 3 deletions(-)
2703 commit 4bed539b215d2504977aa6cee739854b7ca612d8
2704 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2705 Date: Tue Jun 16 16:30:41 2009 +0100
2707 Add more ActorBox utility methods
2709 ActorBox should have methods for easily extracting the X and Y
2710 coordinates of the origin, and the width and height separately.
2712 These methods will make it easier for high-level language bindings
2713 to manipulate ActorBox instances and avoid the Geometry type.
2715 clutter/clutter-actor.c | 72 ++++++++++++++++++++++++++++
2716 clutter/clutter-types.h | 4 ++
2717 doc/reference/clutter/clutter-sections.txt | 4 ++
2718 3 files changed, 80 insertions(+)
2720 commit 9ed2a47db1818322c8ef8a93aa8654c1ab1e7ef6
2721 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2722 Date: Tue Jun 16 13:48:11 2009 +0100
2724 [doap] Add branches for past releases
2726 clutter.doap | 8 ++++----
2727 1 file changed, 4 insertions(+), 4 deletions(-)
2729 commit 275f292ab9ac2961695d0596d9fe5b172f7470c7
2730 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2731 Date: Tue Jun 16 12:47:19 2009 +0100
2733 Add accessors for the boxed types
2735 The Vertex and ActorBox boxed types are meant to be used across
2736 the API, but are fairly difficult to bind. Their memory management
2737 is also unclear, and has to go through the indirection of
2738 g_boxed_copy() and g_boxed_free().
2740 clutter/clutter-actor.c | 391 +++++++++++++++++++++++-----
2741 clutter/clutter-actor.h | 47 +---
2742 clutter/clutter-deprecated.h | 2 +
2743 clutter/clutter-types.h | 90 +++++--
2744 doc/reference/clutter/clutter-sections.txt | 24 +-
2745 5 files changed, 417 insertions(+), 137 deletions(-)
2747 commit 63c84c46f8c4e2c1e0c6654d016912dc3bbaefc5
2748 Author: Colin Walters <walters@verbum.org>
2749 Date: Tue Jun 16 10:34:13 2009 -0400
2751 Plug minor memory leak in cogl_vertex_buffer_submit_real
2753 Free a temporary list.
2755 clutter/cogl/common/cogl-vertex-buffer.c | 1 +
2756 1 file changed, 1 insertion(+)
2758 commit f8e956548235116de18558c86470b16555149122
2759 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2760 Date: Mon Jun 15 15:08:59 2009 +0100
2762 [tests] Beautify the bouncing actor
2764 The test-easing interactive demo for the high-level animation API
2765 is a bit "flat". Instead of using a Rectangle actor we should
2766 probably be using something more "interesting" -- like a CairoTexture
2769 tests/interactive/test-easing.c | 72 ++++++++++++++++++++++++++++++---------
2770 1 file changed, 56 insertions(+), 16 deletions(-)
2772 commit f95f4ba3cb02b0f4d0aefcd19d18a1af0ba81707
2773 Author: Neil Roberts <neil@linux.intel.com>
2774 Date: Mon Jun 15 12:41:13 2009 +0100
2776 [ClutterCairoTexture] Use the right component ordering when uploading data
2778 Cairo stores the image data in ARGB native byte order so we need to
2779 upload this as BGRA on little endian architectures and ARGB on big
2780 endian. ClutterTexture doesn't currently expose any flags to describe
2781 ARGB format so until we can fix the Clutter API it now uses the Cogl
2784 clutter/clutter-cairo-texture.c | 46 +++++++++++++++++++++++++--------------
2785 1 file changed, 30 insertions(+), 16 deletions(-)
2787 commit c6b4ea8b442af4e6bfa0e5961685b58c23595e32
2788 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2789 Date: Mon Jun 15 11:50:23 2009 +0100
2791 [cairo-texture] Clean up and whitespace fixes
2793 Simple clean up of the CairoTexture to remove unneeded checks,
2794 redundant variables and white space.
2796 clutter/clutter-cairo-texture.c | 34 ++++++++++++++++------------------
2797 1 file changed, 16 insertions(+), 18 deletions(-)
2799 commit 9799750c0338218a542334c9f4dbf2177beafa4f
2800 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2801 Date: Mon Jun 15 10:53:43 2009 +0100
2803 [animation] Rework animation chaining
2805 In order to chain up animations using clutter_actor_animate() and
2806 friends you have to use an idle handler that guarantees that the
2807 main loop spins at least once after the animation pointer has been
2808 detached from the actor.
2810 This has several drawbacks, first and foremost the fact that the
2811 slice of the main loop for the idle handler might be starved by
2812 other operations, like redrawing. This inevitably leads to tricks
2813 with priorities and the like, contributing to the overall complexity.
2815 Instead, we should guarantee that the animation instance created by
2816 clutter_actor_animate() is valid for the ::completed signal until
2817 it reaches its default handler; after that, the animation is detached
2818 from the actor and destroyed. This means that it's possible to
2819 create a new animation after the first is complete by simply using
2820 g_signal_connect_after().
2822 This unfortunately makes it impossible to keep a reference to the
2823 animation pointer attached to the actor by using g_object_ref(); a
2824 way to "fix" this would be to have a clutter_animation_attach()
2825 and a clutter_animation_detach() pair of methods that allow attaching
2826 any animation to an actor. This might overcomplicate what it is
2827 the simple animation API, though, so it's currently not implemented
2828 and left for future versions.
2830 The test-easing interactive demo has been modified to show how
2831 the animation queuing works by adding a command line switch that
2832 recenters the animated actor once the first animation has ended.
2834 clutter/clutter-animation.c | 252 ++++++++++++---------------------------
2835 tests/interactive/test-easing.c | 53 +++++++-
2836 2 files changed, 126 insertions(+), 179 deletions(-)
2838 commit 612d1cded77c07b6a4884e5ec3c0bf5b8929bff9
2839 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2840 Date: Mon Jun 15 11:24:54 2009 +0100
2842 [animation] Allow swapped/after signal variants
2844 Continuing in the tradition on making clutter_actor_animate() the
2845 next g_object_connect(), here's the addition of the signal-after::
2846 and signal-swapped:: modifiers for the automagic signal connection
2851 http://bugzilla.openedhand.com/show_bug.cgi?id=1646
2853 clutter/clutter-animation.c | 47 ++++++++++++++++++++++++++++++++++++++++---
2854 1 file changed, 44 insertions(+), 3 deletions(-)
2856 commit 0415d62d40b728e328042eb6c1c3f60c92dd2909
2857 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2858 Date: Mon Jun 15 10:48:56 2009 +0100
2860 Disable single header inclusion for GLib
2862 In order to be ready for the next major version of GLib we need to
2863 disable single header inclusion by using the G_DISABLE_SINGLE_INCLUDES
2864 define in the build process.
2866 clutter/Makefile.am | 1 +
2867 clutter/cogl/common/Makefile.am | 1 +
2868 clutter/cogl/gl/Makefile.am | 1 +
2869 clutter/cogl/gles/Makefile.am | 1 +
2870 clutter/json/Makefile.am | 1 +
2871 clutter/pango/Makefile.am | 1 +
2872 tests/conform/Makefile.am | 1 +
2873 tests/conform/test-clutter-rectangle.c | 2 +-
2874 tests/interactive/Makefile.am | 9 +++++++--
2875 tests/micro-bench/Makefile.am | 1 +
2876 10 files changed, 16 insertions(+), 3 deletions(-)
2878 commit e6a987d670cce4e6ce99529f1ef0b227dd237edd
2879 Author: Owen W. Taylor <otaylor@fishsoup.net>
2880 Date: Thu Jun 11 18:56:27 2009 -0400
2882 Fix redraw queueing in the presence of cloning
2884 We can't short-circuit the emission of ::queue-redraw for not-visible
2885 actors, since ClutterClone uses that signal to know when things need
2888 Calling clutter_actor_queue_redraw() out of clutter_actor_real_map() /
2889 clutter_actor_real_unmap() was causing the flag state to get set
2890 incorrectly from _clutter_actor_set_enable_paint_unmapped(), because
2891 a paint queueing a redraw was not expected.
2893 Moving queuing the redraw to clutter_actor_hide()/show() fixes this, and
2894 also fixes a problem where showing a child of a cloned actor wouldn't
2895 cause the clone to be repainted.
2897 http://bugzilla.openedhand.com/show_bug.cgi?id=1484
2899 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2901 clutter/clutter-actor.c | 25 +++++++++++++------------
2902 1 file changed, 13 insertions(+), 12 deletions(-)
2904 commit abac520f0c081c3c4c986d50ff42a297dd6e8ccd
2905 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2906 Date: Fri Jun 12 03:46:38 2009 +0100
2908 [tests] Add unit for Clone behaviour
2910 A clone actor should not modify the state of its source, so we need
2911 to check that it's not breaking any invariant.
2914 tests/conform/test-actor-invariants.c | 34 +++++++++++++++++++++++++++++++++
2915 tests/conform/test-conform-main.c | 1 +
2916 3 files changed, 37 insertions(+)
2918 commit 795e005566f2055999e226da8a34f50890c71c25
2919 Author: Owen W. Taylor <otaylor@fishsoup.net>
2920 Date: Thu Jun 11 18:46:44 2009 -0400
2922 Fix handling of not-visible texture pixmaps
2924 If we have an not-visible texture pixmap, we need to:
2926 - Still update it if it is realized, since it won't be
2927 updated when shown. And it might be also be cloned.
2929 - Queue a redraw if even if not visible, since it
2932 http://bugzilla.openedhand.com/show_bug.cgi?id=1647
2934 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2936 clutter/glx/clutter-glx-texture-pixmap.c | 2 --
2937 clutter/x11/clutter-x11-texture-pixmap.c | 3 ---
2938 2 files changed, 5 deletions(-)
2940 commit b9a53d379d3aaca4b09a90cd44d5a9d9736a2435
2941 Author: Damien Lespiau <damien.lespiau@intel.com>
2942 Date: Sun Jun 14 01:16:30 2009 +0100
2944 [gitignore] ignore TAGS and new test
2946 * ignore files generated by make tags
2947 * ignore the newly introduced premult test
2950 1 file changed, 2 insertions(+)
2952 commit 0dfc1dd284ea698ed6d3d814d12a5e5b7bff7095
2953 Author: Neil Roberts <neil@linux.intel.com>
2954 Date: Fri Jun 12 11:05:26 2009 +0100
2956 [test-cogl-tex-tile] Fix breakages from ClutterFixed removal and timelines
2958 The test has been broken since the change to use floats instead of
2959 fixed point because it was passing degrees to sin and cos but they
2962 It was further broken since the timeline changes because it was
2963 directly using the parameter of the new-frame signal as a frame number
2964 but it now represents the elapsed time.
2966 tests/interactive/test-cogl-tex-tile.c | 31 ++++++++++++++-----------------
2967 1 file changed, 14 insertions(+), 17 deletions(-)
2969 commit 9d829957737fc016033e80c33593d2cc8daa0f4c
2970 Author: Robert Bragg <robert@linux.intel.com>
2971 Date: Mon Jun 8 17:43:34 2009 +0100
2973 [_cogl_texture_bitmap_prepare] use bitmap format for FORMAT_ANY + no alpha
2975 My patch to choose a premultiplied format when the user gives
2976 COGL_PIXEL_FORMAT_ANY for the internal_format broke the case where the data
2977 in question doesn't have and alpha channel.
2979 This was accidentally missed when merging the premultiplication branch
2980 since I merged a local version of the branch that missed this commit.
2982 clutter/cogl/gl/cogl-texture.c | 2 ++
2983 clutter/cogl/gles/cogl-texture.c | 2 ++
2984 2 files changed, 4 insertions(+)
2986 commit 6414adbfeb696282c5e5ca0eb47a77caf3309d92
2987 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2988 Date: Thu Jun 11 16:59:50 2009 +0100
2990 [tests] Fix the cogl_polygon() interactive test
2992 We need to premultiply the alpha, and we also need to change the
2993 frame painting to use the frame-less Timeline.
2995 tests/interactive/test-cogl-tex-polygon.c | 6 ++++--
2996 1 file changed, 4 insertions(+), 2 deletions(-)
2998 commit a8fc4e1694a5faef75d3b962640c87b057bef322
2999 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3000 Date: Thu Jun 11 16:53:52 2009 +0100
3002 [tests] Fix the VBO interactive test
3004 We need to fix the VBO premultiplication; we also do not need to
3005 forcibly queue a redraw in an idle handler: the timeline and the
3006 master clock will do that for us.
3008 tests/interactive/test-cogl-vertex-buffer.c | 26 ++++++++------------------
3009 1 file changed, 8 insertions(+), 18 deletions(-)
3011 commit 19f112f9bca3077cc946acb828bd681b3ddf1b7c
3012 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3013 Date: Thu Jun 11 16:23:26 2009 +0100
3015 [tests] Update test-actors (and clones)
3017 The test-actors test (and its clones, test-actor-clone and
3018 test-paint-wrapper) was written a long time ago for a different API
3019 and has been tweaked to bits. We should probably have something a
3020 little bit more complicated, but at least we should not use semantics
3021 and coding patterns from Clutter 0.2, otherwise we won't be testing
3022 anything except that Clutter 0.2 worked.
3024 tests/interactive/test-actor-clone.c | 63 ++++----
3025 tests/interactive/test-actors.c | 56 ++++----
3026 tests/interactive/test-paint-wrapper.c | 247 +++++++++++++++++---------------
3027 3 files changed, 181 insertions(+), 185 deletions(-)
3029 commit 71b62e75d24eeee15c6522e6d67f6439fb1315c5
3030 Author: Robert Bragg <robert@linux.intel.com>
3031 Date: Mon Jun 8 12:18:34 2009 +0100
3033 [cogl] Don't allow calling cogl_set_source_texture with an INVALID_HANDLE
3035 Although the underlying materials should allow layers with INVALID_HANDLES
3036 it shouldn't be necissary to expose that via cogl_set_source_texture() and
3037 it's easier to resolve a warning/crash here than odd artefacts/crashes later
3040 clutter/cogl/common/cogl-material.c | 2 ++
3041 1 file changed, 2 insertions(+)
3043 commit 96827db74089054763c596e28aa180bc0fb1b7c5
3044 Merge: eb55397 ec77b91
3045 Author: Robert Bragg <robert@linux.intel.com>
3046 Date: Thu Jun 11 15:16:27 2009 +0100
3048 Bug 1406 - Handling of premultiplication in clutter
3050 Merge branch 'premultiplication'
3052 [cogl-texture docs] Improves the documentation of the internal_format args
3053 [test-premult] Adds a unit test for texture upload premultiplication semantics
3054 [fog] Document that fogging only works with opaque or unmultipled colors
3055 [test-blend-strings] Explicitly request RGBA_888 tex format for test textures
3056 [premultiplication] Be more conservative with what data gets premultiplied
3057 [bitmap] Fixes _cogl_bitmap_fallback_unpremult
3058 [cogl-bitmap] Fix minor copy and paste error in _cogl_bitmap_fallback_premult
3059 Avoid unnecesary unpremultiplication when saving to local data
3060 Don't unpremultiply Cairo data
3061 Default to a blend function that expects premultiplied colors
3062 Implement premultiplication for CoglBitmap
3063 Use correct texture format for pixmap textures and FBO's
3064 Add cogl_color_premultiply()
3066 commit ec77b9139820207962ba38b3cd2ecc491144592f
3067 Author: Robert Bragg <robert@linux.intel.com>
3068 Date: Thu Jun 11 14:31:01 2009 +0100
3070 [cogl-texture docs] Improves the documentation of the internal_format args
3072 Clarifies that if you give COGL_PIXEL_FORMAT_ANY as the internal format for
3073 cogl_texture_new_from_file or cogl_texture_new_from_data then Cogl will
3074 choose a premultiplied internal format.
3076 clutter/cogl/cogl-texture.h | 16 ++++++++++++++--
3077 1 file changed, 14 insertions(+), 2 deletions(-)
3079 commit 41579eb3c9d7243d41754e38d30f1d8ad20958fd
3080 Author: Robert Bragg <robert@linux.intel.com>
3081 Date: Sun Jun 7 16:31:12 2009 +0100
3083 [test-premult] Adds a unit test for texture upload premultiplication semantics
3085 cogl_texture_new_from_data lets you specify a source format for the users given
3086 data, and an internal format which the user wants the GPU to see. This unit
3087 test verifies that the users data is premultiplied, un-premultiplied or
3088 left alone for a number of (source format, internal format) pairs.
3090 cogl_texture_set_region allows specifying a source format, and the internal
3091 format is determined from the texture being updated. As above we test
3092 a number of format pairs and check Cogl is converting data correctly.
3094 The test verifies that if the user allows COGL_FORMAT_ANY for the
3095 internal_format then by default Cogl will choose a premultipled format for
3098 Note: Currently this only tests cogl_texture_new_from_data and
3099 cogl_texture_set_region, we should also test cogl_texture_new_from_file,
3100 cogl_texture_new_from_bitmap and cogl_texture_new_from_foreign.
3102 tests/conform/Makefile.am | 1 +
3103 tests/conform/test-conform-main.c | 1 +
3104 tests/conform/test-premult.c | 388 +++++++++++++++++++++++++++++++++++++
3105 3 files changed, 390 insertions(+)
3107 commit 70636b4815283136ca5d878b6e39e12337c4f9ed
3108 Author: Robert Bragg <robert@linux.intel.com>
3109 Date: Sun Jun 7 11:54:05 2009 +0100
3111 [fog] Document that fogging only works with opaque or unmultipled colors
3113 The fixed function fogging provided by OpenGL only works with unmultiplied
3114 colors (or if the color has an alpha of 1.0) so since we now premultiply
3115 textures and colors by default a note to this affect has been added to
3116 clutter_stage_set_fog and cogl_set_fog.
3118 test-depth.c no longer uses clutter_stage_set_fog for this reason.
3120 In the future when we can depend on fragment shaders we should also be
3121 able to support fogging of premultiplied primitives.
3123 clutter/clutter-stage.c | 10 ++++++++++
3124 clutter/cogl/cogl.h.in | 23 ++++++++++++++++-------
3125 tests/interactive/test-depth.c | 3 ---
3126 3 files changed, 26 insertions(+), 10 deletions(-)
3128 commit 80aceda9bb3fde41827cb35bec98ba523a095b0f
3129 Author: Robert Bragg <robert@linux.intel.com>
3130 Date: Sat Jun 6 21:55:05 2009 +0100
3132 [test-blend-strings] Explicitly request RGBA_888 tex format for test textures
3134 This test assumes that the textures will be stored internally with exactly
3135 the color given so that specific texture combining arithmetic can be
3136 tested. Using COGL_PIXEL_FORMAT_ANY allows Cogl to internally premultiply
3137 the textures, so we have to explicitly request an unmultiplied format.
3139 tests/conform/test-blend-strings.c | 4 +++-
3140 1 file changed, 3 insertions(+), 1 deletion(-)
3142 commit a9b011f3edc9730f60280e38bf2164f1c2dd95a9
3143 Author: Robert Bragg <robert@linux.intel.com>
3144 Date: Sat Jun 6 21:45:05 2009 +0100
3146 [premultiplication] Be more conservative with what data gets premultiplied
3148 We don't want to force texture data to be premultipled if the user
3149 explicitly specifies a non premultiplied internal_format such as
3150 COGL_PIXEL_FORMAT_RGBA_8888. So now Cogl will only automatically
3151 premultiply data when COGL_PIXEL_FORMAT_ANY is given for the
3152 internal_format, or a premultiplied internal format such as
3153 COGL_PIXEL_FORMAT_RGBA_8888_PRE is requested but non-premultiplied source
3156 This approach is consistent with OpenVG image formats which have already
3157 influenced Cogl's pixel format semantics.
3159 clutter/cogl/gl/cogl-texture.c | 24 +++++++++++-------------
3160 clutter/cogl/gles/cogl-texture.c | 24 +++++++++++-------------
3161 2 files changed, 22 insertions(+), 26 deletions(-)
3163 commit 9d3aa576045ce0aea51ef767b74596bb4582570f
3164 Author: Robert Bragg <robert@linux.intel.com>
3165 Date: Sun Jun 7 15:58:56 2009 +0100
3167 [bitmap] Fixes _cogl_bitmap_fallback_unpremult
3169 The _cogl_unpremult_alpha_{first,last} functions which
3170 _cogl_bitmap_fallback_unpremult depends on were incorrectly casting each
3171 of the byte components of a texel to a gulong and performing shifts as
3172 if it were dealing with the whole texel.
3174 It now just uses array indexing to access the byte components without
3175 needing to cast or manually shift any bits around.
3177 Even though we used to depend on unpremult whenever we used a
3178 ClutterCairoTexture, clutter_cairo_texture_context_destroy had it's own
3179 unpremult code which worked which is why this bug wouldn't have been noticed
3182 clutter/cogl/common/cogl-bitmap-fallback.c | 60 ++++++++++++++--------------
3183 1 file changed, 30 insertions(+), 30 deletions(-)
3185 commit cb959ef457a670a5e827963d4a85f6c732993295
3186 Author: Robert Bragg <robert@linux.intel.com>
3187 Date: Sun Jun 7 20:29:13 2009 +0100
3189 [cogl-bitmap] Fix minor copy and paste error in _cogl_bitmap_fallback_premult
3191 The returned bitmap format should include the COGL_PREMULT_BIT flag not
3192 have it explicitly removed as for _cogl_bitmap_fallback_unpremult.
3194 clutter/cogl/common/cogl-bitmap-fallback.c | 2 +-
3195 1 file changed, 1 insertion(+), 1 deletion(-)
3197 commit 5e18cee77ab0167a000bb3af8a7c047357141177
3198 Author: Owen W. Taylor <otaylor@fishsoup.net>
3199 Date: Sat May 9 14:39:01 2009 -0400
3201 Avoid unnecesary unpremultiplication when saving to local data
3203 Now that we typically have premultiplied data stored in Cogl
3204 textures, when fetching a texture into local data for temporary
3205 storage, use a premultiplied format to avoid an unpremultiply/
3206 premultiply roundtrip.
3208 http://bugzilla.openedhand.com/show_bug.cgi?id=1406
3210 Signed-off-by: Robert Bragg <robert@linux.intel.com>
3212 clutter/clutter-texture.c | 4 ++--
3213 1 file changed, 2 insertions(+), 2 deletions(-)
3215 commit 1e5b5d10c5608efa411afcb8e032c5e956325249
3216 Author: Owen W. Taylor <otaylor@fishsoup.net>
3217 Date: Thu Jun 4 13:45:43 2009 -0400
3219 Don't unpremultiply Cairo data
3221 Instead of unpremultiplying the Cairo data, pass it directly to Cogl
3222 in premultiplied form; we now *prefer* premultiplied data.
3224 http://bugzilla.openedhand.com/show_bug.cgi?id=1406
3226 Signed-off-by: Robert Bragg <robert@linux.intel.com>
3228 clutter/clutter-cairo-texture.c | 58 ++++++---------------------------------
3229 1 file changed, 9 insertions(+), 49 deletions(-)
3231 commit c3448314d59a855a7dfaa47d68c3fa3531eee4ce
3232 Author: Owen W. Taylor <otaylor@fishsoup.net>
3233 Date: Sat May 9 14:39:01 2009 -0400
3235 Default to a blend function that expects premultiplied colors
3237 Many operations, like mixing two textures together or alpha-blending
3238 onto a destination with alpha, are done most logically if texture data
3239 is in premultiplied form. We also have many sources of premultiplied
3240 texture data, like X pixmaps, FBOs, cairo surfaces. Rather than trying
3241 to work with two different types of texture data, simplify things by
3242 always premultiplying texture data before uploading to GL.
3244 Because the default blend function is changed to accommodate this,
3245 uses of pure-color CoglMaterial need to be adapted to add
3248 gl/cogl-texture.c gles/cogl-texture.c: Always premultiply
3249 non-premultiplied texture data before uploading to GL.
3251 cogl-material.c cogl-material.h: Switch the default blend functions
3252 to ONE, ONE_MINUS_SRC_ALPHA so they work correctly with premultiplied
3255 cogl.c: Make cogl_set_source_color() premultiply the color.
3257 cogl.h.in color-material.h: Add some documentation about
3258 premultiplication and its interaction with color values.
3260 cogl-pango-render.c clutter-texture.c tests/interactive/test-cogl-offscreen.c:
3261 Use premultiplied colors.
3263 http://bugzilla.openedhand.com/show_bug.cgi?id=1406
3265 Signed-off-by: Robert Bragg <robert@linux.intel.com>
3267 clutter/clutter-texture.c | 3 ++-
3268 clutter/cogl/cogl-material.h | 10 ++++++++++
3269 clutter/cogl/cogl.h.in | 9 +++++++--
3270 clutter/cogl/common/cogl-material.c | 2 +-
3271 clutter/cogl/common/cogl.c | 7 ++++++-
3272 clutter/cogl/gl/cogl-texture.c | 22 ++++++++++++----------
3273 clutter/cogl/gles/cogl-texture.c | 23 +++++++++++++----------
3274 clutter/pango/cogl-pango-display-list.c | 5 ++++-
3275 clutter/pango/cogl-pango-render.c | 18 +++++++++++-------
3276 tests/interactive/test-cogl-offscreen.c | 2 +-
3277 10 files changed, 67 insertions(+), 34 deletions(-)
3279 commit 888a26199918f84d6f444910f49db8cc321296f3
3280 Author: Owen W. Taylor <otaylor@fishsoup.net>
3281 Date: Sat May 9 14:39:01 2009 -0400
3283 Implement premultiplication for CoglBitmap
3285 cogl-bitmap.c cogl-bitmap-pixbuf.c cogl-bitmap-fallback.c cogl-bitmap-private.h:
3286 Add _cogl_bitmap_can_premult(), _cogl_bitmap_premult() and implement
3287 a reasonably fast implementation in the "fallback" code.
3289 http://bugzilla.openedhand.com/show_bug.cgi?id=1406
3291 Signed-off-by: Robert Bragg <robert@linux.intel.com>
3293 clutter/cogl/common/cogl-bitmap-fallback.c | 93 ++++++++++++++++++++++++++++
3294 clutter/cogl/common/cogl-bitmap-pixbuf.c | 13 ++++
3295 clutter/cogl/common/cogl-bitmap-private.h | 14 +++++
3296 clutter/cogl/common/cogl-bitmap.c | 26 ++++++--
3297 4 files changed, 140 insertions(+), 6 deletions(-)
3299 commit 4dcd5f6134f62bf1d5988cea7479b14c896190fd
3300 Author: Owen W. Taylor <otaylor@fishsoup.net>
3301 Date: Sat May 9 14:39:01 2009 -0400
3303 Use correct texture format for pixmap textures and FBO's
3305 RGBA data in X pixmaps and in FBOs is already premultiplied; use
3306 the right format when creating cogl textures.
3308 http://bugzilla.openedhand.com/show_bug.cgi?id=1406
3310 Signed-off-by: Robert Bragg <robert@linux.intel.com>
3312 clutter/clutter-texture.c | 4 ++--
3313 clutter/glx/clutter-glx-texture-pixmap.c | 6 ++++--
3314 clutter/x11/clutter-x11-texture-pixmap.c | 6 ++++--
3315 3 files changed, 10 insertions(+), 6 deletions(-)
3317 commit f90017ab4ef69d1275f726f4a8a272bfae3cb5a7
3318 Author: Owen W. Taylor <otaylor@fishsoup.net>
3319 Date: Sat May 9 14:39:01 2009 -0400
3321 Add cogl_color_premultiply()
3323 Add a convenience function to convert an ARGB color from
3324 non-premultiplied to premultiplied form.
3326 http://bugzilla.openedhand.com/show_bug.cgi?id=1406
3328 Signed-off-by: Robert Bragg <robert@linux.intel.com>
3330 clutter/cogl/cogl-color.h | 12 ++++++++++++
3331 clutter/cogl/common/cogl-color.c | 8 ++++++++
3332 2 files changed, 20 insertions(+)
3334 commit eb55397423181272914c4bdb861eb55b72808dc6
3335 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3336 Date: Thu Jun 11 13:24:34 2009 +0100
3338 [build] Fix distcheck for the json-glib internal copy
3340 Since commit d743aeaa updated the internal copy of JSON-GLib and
3341 added a new private header file, we need to fix the build to avoid
3342 a distcheck failure.
3344 clutter/json/Makefile.am | 12 +++++++-----
3345 1 file changed, 7 insertions(+), 5 deletions(-)
3347 commit 61c45da90a489a619b6e99b6a93f12c5192d306a
3348 Merge: cd08dc6 e60584e
3349 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3350 Date: Thu Jun 11 13:01:34 2009 +0100
3352 Bug 1637 - Master clock improvements
3354 Merge branch 'master-clock-updates'
3356 * master-clock-updates: (22 commits)
3357 Change the paint forcing on the Text cache text
3358 [timelines] Improve marker hit check and don't fudge the delta
3359 Revert "[timeline] Don't clamp the elapsed time when a looping tl reaches the end"
3360 [tests] Don't add a newline to the end of g_test_message calls
3361 [test-timeline] Add a marker at the beginning of the timeline
3362 [timeline] Don't clamp the elapsed time when a looping tl reaches the end
3363 [master-clock] Throttle if no redraw was performed
3364 [docs] Update Clutter's API reference
3365 Force a paint instead of calling clutter_redraw()
3366 Fix clutter_redraw() to match the redraw cycle
3367 Run the repaint functions inside the redraw cycle
3368 Remove useless manual timeline ticking
3369 Move elapsed-time calculations into ClutterTimeline
3370 Limit the frame rate when not syncing to VBLANK
3371 Decrease the main-loop priority of the frame cycle
3372 Avoid motion-compression in test-picking test
3373 Compress events as part of the frame cycle
3374 Remove stage update idle and do updates from the master clock
3375 Call g_main_context_wakeup() when we start running timelines
3376 Remove unused msecs_delta member
3379 commit cd08dc6327d5c1eb5342c49b222ad00feaa9c449
3380 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3381 Date: Thu Jun 11 12:36:41 2009 +0100
3383 [tests] Fix a segfault in the binding-pool test
3385 The commit that moved all the properties to floats missed the
3386 test-binding-pool interactive test.
3388 tests/interactive/test-binding-pool.c | 24 ++++++++++++------------
3389 1 file changed, 12 insertions(+), 12 deletions(-)
3391 commit e60584ea6f7db76974b18789c9b90aaeeedf072a
3392 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3393 Date: Wed Jun 10 18:10:32 2009 +0100
3395 Change the paint forcing on the Text cache text
3397 The changes in the master clock and the repaint cycle have been
3398 changed, and broke the way the test for the Text actor cache of
3399 PangoLayouts forces a redraw.
3401 We have to call clutter_actor_paint() on the Stage embedding the
3402 Text actor we want to test; this is kinda fugly because if the
3403 Layout has changed it will end up causing a reallocation cycle
3404 in the middle of the Text actor paint. Since it's a test case,
3405 and since forcing redraws is a bit of a hack as well, we can
3406 close both our eyes on that.
3408 tests/conform/test-text-cache.c | 9 ++++++++-
3409 1 file changed, 8 insertions(+), 1 deletion(-)
3411 commit f1000db3caa450e4917b48d3c4f69bea5a255197
3412 Author: Neil Roberts <neil@linux.intel.com>
3413 Date: Thu Jun 11 12:14:53 2009 +0100
3415 [timelines] Improve marker hit check and don't fudge the delta
3417 Markers added at the start of the timeline need to be special cased
3418 because we effectively check whether the marker time is greater than
3419 the old frame time or less than or equal to the new frame time but we
3420 never actually emit a frame for the start of the timeline.
3422 If the timeline is looping then it adjusts the position to interpolate
3423 a wrapped around position. However we do not emit a new frame after
3424 setting this position so we need to check for markers again there.
3426 clutter_timeline_get_delta should return the actual wall clock time
3427 between emissions of the new-frame signal - even if the elapsed time
3428 has been fudged at the end of the timeline. To make this work it no
3429 longer directly manipulates priv->msecs_delta but instead passes a
3430 delta value to check_markers.
3432 clutter/clutter-timeline.c | 102 ++++++++++++++++++++++++++++++++++++--------
3433 1 file changed, 85 insertions(+), 17 deletions(-)
3435 commit bf0c21e0154a9666d5be2be18cf93f3a5119953c
3436 Author: Tommi Komulainen <tko@litl.com>
3437 Date: Fri Apr 24 16:43:39 2009 +0100
3439 stage: set key focus actor to NULL before emitting focus-out
3441 Someone might hide the previously focused actor in the focus-out signal
3442 handler and as key focus still appears to be on that actor we'd get
3443 re-entrant call and get glib critical from g_object_weak_unref
3445 This changes clutter_stage_get_key_focus() to return stage/NULL during
3446 focus-out signal emission. It used to be the actor focus-out was being
3451 http://bugzilla.openedhand.com/show_bug.cgi?id=1547
3453 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3455 clutter/clutter-stage.c | 18 +++++++++++++++++-
3456 1 file changed, 17 insertions(+), 1 deletion(-)
3458 commit 9021aa2909189becd9809d29ebf8c9a3c362ce5f
3459 Author: Neil Roberts <neil@linux.intel.com>
3460 Date: Thu Jun 11 10:55:52 2009 +0100
3462 Revert "[timeline] Don't clamp the elapsed time when a looping tl reaches the end"
3464 This reverts commit 9c5663d6717722d6d77162060f284355b5081174.
3466 The patch was causing problems for applications that expect the
3467 elapsed_time to be at either end of the timeline when the completed
3468 signal is fired. For example test-behave swaps the direction of the
3469 timeline in the completed handler but if the time has overflowed the
3470 end then the timeline would only take a short time to get back the
3471 beginning. This caused the animation to just vibrate around the
3474 clutter/clutter-timeline.c | 142 ++++++++++-------------------
3475 tests/conform/test-timeline-interpolate.c | 8 +-
3476 2 files changed, 54 insertions(+), 96 deletions(-)
3478 commit 6bb5b3a13e6dfe1934c9d2476f00ac2be86d33cd
3479 Author: Neil Roberts <neil@linux.intel.com>
3480 Date: Thu Jun 11 11:38:49 2009 +0100
3482 [tests] Don't add a newline to the end of g_test_message calls
3484 Two of the timeline tests were calling g_test_message and adding a \n
3485 so the output looked odd.
3487 tests/conform/test-timeline-interpolate.c | 14 +++++++-------
3488 tests/conform/test-timeline-rewind.c | 20 ++++++++++----------
3489 2 files changed, 17 insertions(+), 17 deletions(-)
3491 commit 19cbb307831234e5cfeb473802db77eb56328013
3492 Author: Neil Roberts <neil@linux.intel.com>
3493 Date: Thu Jun 11 11:23:45 2009 +0100
3495 [test-timeline] Add a marker at the beginning of the timeline
3497 The beginning of the timeline needs special treatment to detect a
3498 marker so it should have one in the conformance test.
3500 tests/conform/test-timeline.c | 4 ++++
3501 1 file changed, 4 insertions(+)
3503 commit 9c5663d6717722d6d77162060f284355b5081174
3504 Author: Neil Roberts <neil@linux.intel.com>
3505 Date: Wed Jun 10 17:41:16 2009 +0100
3507 [timeline] Don't clamp the elapsed time when a looping tl reaches the end
3509 The new-frame signal of a timeline was previously guaranteed to be
3510 emitted with the elapsed_time set to the end before it emits the
3511 completed signal. This doesn't necessarily make sense for looping
3512 timelines because it would cause the elapsed time to be clamped to a
3513 slightly off value whenever the timeline restarts. This patch makes it
3514 perform the wrap around before emitting the new-frame signal so that
3515 the elapsed time always corresponds to the time elapsed since the
3516 timeline was started.
3518 Additionally it no longer fudges the msecs_delta property to make the
3519 marker check work so clutter_timeline_get_delta will always return the
3520 wall clock time since the last frame.
3522 clutter/clutter-timeline.c | 142 +++++++++++++++++++----------
3523 tests/conform/test-timeline-interpolate.c | 8 +-
3524 2 files changed, 96 insertions(+), 54 deletions(-)
3526 commit df839e22e6c5e5e323168fd4b336ff2b4df0fbcc
3527 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3528 Date: Wed Jun 10 16:23:35 2009 +0100
3530 [text] Do not leak the effective attributes
3532 Thanks to Iain Holmes for catching the leak.
3534 clutter/clutter-text.c | 2 +-
3535 1 file changed, 1 insertion(+), 1 deletion(-)
3537 commit acf7722a41dc5c568f895166cc471f53f3546926
3538 Author: Neil Roberts <neil@linux.intel.com>
3539 Date: Wed Jun 10 15:50:27 2009 +0100
3541 [master-clock] Throttle if no redraw was performed
3543 A flag in the master clock is now set whenever the dispatch caused an
3544 actual redraw of a stage. If this flag is not set during the prepare
3545 and check functions then it will resort to limiting the redraw
3546 attempts to the default frame rate as if vblank syncing was
3547 disabled. Otherwise if a timeline is running that does not cause the
3548 scene to change then it would busy-wait with 100% CPU until the next
3551 This fix was suggested by Owen Taylor in:
3553 http://bugzilla.openedhand.com/show_bug.cgi?id=1637
3555 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3557 clutter/clutter-master-clock.c | 11 +++++++++--
3558 clutter/clutter-private.h | 2 +-
3559 clutter/clutter-stage.c | 12 ++++++++----
3560 3 files changed, 18 insertions(+), 7 deletions(-)
3562 commit eca73fe6c7cdc6657f6da2bdff19d635d0459792
3563 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3564 Date: Wed Jun 10 14:54:42 2009 +0100
3566 [docs] Annotate fixed sized arrays
3568 clutter/clutter-actor.c | 8 ++++----
3569 1 file changed, 4 insertions(+), 4 deletions(-)
3571 commit 7c08f554bc403938d90363fcba552d5121ad1449
3572 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3573 Date: Wed Jun 10 14:54:19 2009 +0100
3575 [docs] Update Clutter's API reference
3577 doc/reference/clutter/clutter-sections.txt | 5 +----
3578 1 file changed, 1 insertion(+), 4 deletions(-)
3580 commit 0f9dea0337aadc5c7218c93a592d83ae4828d6b4
3581 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3582 Date: Wed Jun 10 14:52:53 2009 +0100
3584 Force a paint instead of calling clutter_redraw()
3586 We do not need the whole redraw machinery inside
3587 clutter_stage_read_pixels(): instead, we want Clutter to drop everything,
3588 paint and call glReadPixels() with the current buffer.
3590 clutter/clutter-stage.c | 2 +-
3591 1 file changed, 1 insertion(+), 1 deletion(-)
3593 commit 92a7e23ec1c7fbbb8233bf7207630b5fc9992c08
3594 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3595 Date: Wed Jun 10 14:24:33 2009 +0100
3597 [build] Use top_srcdir instead of relative paths
3599 doc/reference/clutter/Makefile.am | 12 ++++++------
3600 1 file changed, 6 insertions(+), 6 deletions(-)
3602 commit 84d67bf1b3c39444efd2c85c90f9bbd7da5fc0ec
3603 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3604 Date: Wed Jun 10 14:23:45 2009 +0100
3608 Use the LINGUAS file to generate the contents of the ALL_LINGUAS
3613 2 files changed, 2 insertions(+), 1 deletion(-)
3615 commit bd3254c0f8ee775df9979deb46d2ac8dbfc92876
3616 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3617 Date: Wed Jun 10 12:50:45 2009 +0100
3619 [docs] Various gtk-doc fixes for COGL
3621 Try to keep the gtk-doc errors down to a minimum.
3623 clutter/cogl/cogl-bitmap.h | 8 ++--
3624 clutter/cogl/cogl-material.h | 24 ++++++----
3625 clutter/cogl/cogl-matrix.h | 32 +++++++------
3626 clutter/cogl/cogl-offscreen.h | 4 +-
3627 clutter/cogl/cogl-vertex-buffer.h | 9 ++--
3628 clutter/cogl/cogl.h.in | 6 +--
3629 doc/reference/cogl/Makefile.am | 2 -
3630 doc/reference/cogl/cogl-sections.txt | 83 ++++++++++++++++++++++++++++++++--
3631 8 files changed, 126 insertions(+), 42 deletions(-)
3633 commit e1cac4fece275c0e8428942a880ae5e5f4b3b13b
3634 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3635 Date: Tue Jun 9 16:29:29 2009 +0100
3637 Fix clutter_redraw() to match the redraw cycle
3639 The clutter_redraw() function is used by embedding toolkits to
3640 force a redraw on a stage. Since everything is performed by
3641 toggling a flag inside the Stage itself and then letting the
3642 master clock advance, we need a ClutterStage method to ensure
3643 that we start the master clock and redraw.
3645 clutter/clutter-main.c | 13 ++-----------
3646 clutter/clutter-stage.c | 27 +++++++++++++++++++++++++++
3647 clutter/clutter-stage.h | 1 +
3648 doc/reference/clutter/clutter-sections.txt | 1 +
3649 4 files changed, 31 insertions(+), 11 deletions(-)
3651 commit 7099d251c664752ef72c076d2b9cc45b70d58624
3652 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3653 Date: Tue Jun 9 16:28:25 2009 +0100
3655 Run the repaint functions inside the redraw cycle
3657 Now that every redraw is performed within the master clock we
3658 need to run the repaint functions inside it.
3660 clutter/clutter-master-clock.c | 3 ++-
3661 1 file changed, 2 insertions(+), 1 deletion(-)
3663 commit 287d4f76ecf0ccd2171eaf4a61c79ccea06e5f1d
3664 Author: Owen W. Taylor <otaylor@fishsoup.net>
3665 Date: Mon Jun 8 13:13:18 2009 -0400
3667 Remove useless manual timeline ticking
3669 The master clock now works fine whether or not there are any stages,
3670 so in the timeline conformance tests don't need to set up their
3673 Set CLUTTER_VBLANK=none for the conformance tests, which in addition
3674 to removing an test-environment dependency, will result in the ticking
3675 for timeline tests being throttled to the default frame rate.
3677 http://bugzilla.openedhand.com/show_bug.cgi?id=1637
3679 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3681 tests/conform/test-conform-main.c | 7 +++++
3682 tests/conform/test-timeline-interpolate.c | 19 -------------
3683 tests/conform/test-timeline-rewind.c | 19 -------------
3684 tests/conform/test-timeline.c | 44 -----------------------------
3685 4 files changed, 7 insertions(+), 82 deletions(-)
3687 commit 6705ce6c6a8c7b490714a15c697c1ad24c9bf8b0
3688 Author: Owen W. Taylor <otaylor@fishsoup.net>
3689 Date: Mon Jun 8 13:00:09 2009 -0400
3691 Move elapsed-time calculations into ClutterTimeline
3693 Instead of calculating a delta in the master clock, and passing that
3694 into each timeline, make each timeline individually responsible for
3695 remembering the last time and computing the delta.
3699 - Fixes a problem where we could spin infinitely processing
3700 timeline-only frames with < 1msec differences.
3701 - Makes timelines consistently start timing on the first frame;
3702 instead of doing different things for the first started timeline
3703 and other timelines.
3704 - Improves accuracy of elapsed time computations by avoiding
3705 accumulating microsecond => millisecond truncation errors.
3707 http://bugzilla.openedhand.com/show_bug.cgi?id=1637
3709 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3711 clutter/clutter-master-clock.c | 37 +++-----------------
3712 clutter/clutter-timeline.c | 53 +++++++++++++++++++++--------
3713 clutter/clutter-timeline.h | 4 +--
3714 tests/conform/test-timeline-interpolate.c | 17 +--------
3715 tests/conform/test-timeline-rewind.c | 17 +--------
3716 tests/conform/test-timeline.c | 15 +-------
3717 6 files changed, 48 insertions(+), 95 deletions(-)
3719 commit dcd8d2831455f1ae950cbab073f37d0ad36d2295
3720 Author: Owen W. Taylor <otaylor@fishsoup.net>
3721 Date: Sat Jun 6 22:48:15 2009 -0400
3723 Limit the frame rate when not syncing to VBLANK
3725 clutter-master-clock.c clutter-master-clock.h: When the
3726 SYNC_TO_VBLANK feature is not available, wait for 1/frame_rate
3727 seconds since the start of the last frame before drawing the next
3728 frame. Add _clutter_master_clock_start_running() to abstract
3729 the usage of g_main_context_wakeup()
3731 clutter-stage.c: Add _clutter_master_clock_start_running()
3733 clutter-main.c: Update docs for clutter_set_default_frame_rate()
3734 clutter_get_default_frame_rate() to no longer talk about timeline
3737 test-text-perf.c test-text.c: Set a frame rate of 1000fps so that
3738 frame-rate limiting doesn't affect the result.
3740 http://bugzilla.openedhand.com/show_bug.cgi?id=1637
3742 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3744 clutter/clutter-main.c | 9 +--
3745 clutter/clutter-master-clock.c | 131 ++++++++++++++++++++++++++++--------
3746 clutter/clutter-master-clock.h | 2 +
3747 clutter/clutter-stage.c | 18 +++--
3748 tests/micro-bench/test-text-perf.c | 1 +
3749 tests/micro-bench/test-text.c | 1 +
3750 6 files changed, 124 insertions(+), 38 deletions(-)
3752 commit 64bb2e694fde2656c26b3b0bf60edbab544ba7ee
3753 Author: Owen W. Taylor <otaylor@fishsoup.net>
3754 Date: Sat Jun 6 19:31:32 2009 -0400
3756 Decrease the main-loop priority of the frame cycle
3758 Change CLUTTER_PRIORITY_REDRAW to be lower than the GTK+ resize
3759 and relayout priorities to avoid starving GTK+ when run in the
3760 same process as clutter.
3761 Remove the unused CLUTTER_PRIORITY_TIMELINE
3763 http://bugzilla.openedhand.com/show_bug.cgi?id=1637
3765 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3767 clutter/clutter-main.h | 17 ++++++-----------
3768 1 file changed, 6 insertions(+), 11 deletions(-)
3770 commit fc83e364779431dd3a89733ad9e762440de8a001
3771 Author: Owen W. Taylor <otaylor@fishsoup.net>
3772 Date: Sat Jun 6 22:55:34 2009 -0400
3774 Avoid motion-compression in test-picking test
3776 Using clutter_stage_get_actor_at_pos() rather than synthesizing
3777 events; the synthesized events were being compressed, so we were
3778 only tesitng one pick per frame.
3780 http://bugzilla.openedhand.com/show_bug.cgi?id=1637
3782 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3784 tests/micro-bench/test-picking.c | 20 +++++++-------------
3785 1 file changed, 7 insertions(+), 13 deletions(-)
3787 commit 6e69692e22334d15e2d01d39439362bbf1ba8679
3788 Author: Owen W. Taylor <otaylor@fishsoup.net>
3789 Date: Sat Jun 6 19:10:41 2009 -0400
3791 Compress events as part of the frame cycle
3793 Instead of trying to guess about which motion events are
3794 extraneous, queue up all events until we process a frame.
3795 This allows us to look ahead and reliably compress consecutive
3796 sequence of motion events.
3798 clutter-main.c: Feed received events to the stage for queueing.
3799 Remove old compression code. Remove clutter_get_motion_events_frequency()
3800 clutter_set_motion_events_frequency()
3801 clutter-stage.c: Keep a queue of pending events.
3802 clutter-master-clock.c: Add processng of queued events to the
3803 clock source dispatch function.
3805 http://bugzilla.openedhand.com/show_bug.cgi?id=1637
3807 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3809 clutter/clutter-main.c | 129 +++++++---------------------------------
3810 clutter/clutter-main.h | 2 -
3811 clutter/clutter-master-clock.c | 19 +++++-
3812 clutter/clutter-private.h | 10 +++-
3813 clutter/clutter-stage.c | 90 +++++++++++++++++++++++++++-
3814 5 files changed, 136 insertions(+), 114 deletions(-)
3816 commit 89a8fd7755b7a12d579994f7cf0d0e66cf7f99b6
3817 Author: Owen W. Taylor <otaylor@fishsoup.net>
3818 Date: Sat Jun 6 18:22:51 2009 -0400
3820 Remove stage update idle and do updates from the master clock
3822 When a redraw is queued on a stage, simply set a flag; then in
3823 the check/prepare functions of the master clock source, check
3824 for stages that need redrawing.
3826 This avoids the complexity of having multiple competing sources
3827 at the same priority and makes the update ordering more reliable and
3830 http://bugzilla.openedhand.com/show_bug.cgi?id=1637
3832 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3834 clutter/clutter-master-clock.c | 27 ++++++++-----
3835 clutter/clutter-private.h | 2 +
3836 clutter/clutter-stage.c | 84 +++++++++++++++++++++-------------------
3837 3 files changed, 64 insertions(+), 49 deletions(-)
3839 commit 77cd4e2bc8ec4ad99ab2349fcb10dc5f0b57dca8
3840 Author: Owen W. Taylor <otaylor@fishsoup.net>
3841 Date: Sat Jun 6 18:12:26 2009 -0400
3843 Call g_main_context_wakeup() when we start running timelines
3845 If a timeline is added from a different thread, we need to
3846 call g_main_context_wakeup() to wake the main thread up to
3847 start updating the timeline.
3849 http://bugzilla.openedhand.com/show_bug.cgi?id=1637
3851 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3853 clutter/clutter-master-clock.c | 5 +++++
3854 1 file changed, 5 insertions(+)
3856 commit 4b63f9524e64f2c0a2f7baa4034f2a9657de7ddb
3857 Author: Owen W. Taylor <otaylor@fishsoup.net>
3858 Date: Sat Jun 6 18:11:19 2009 -0400
3860 Remove unused msecs_delta member
3862 msecs_delta member of ClutterMasterClock was set but not used.
3864 http://bugzilla.openedhand.com/show_bug.cgi?id=1637
3866 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3868 clutter/clutter-master-clock.c | 2 --
3869 1 file changed, 2 deletions(-)
3871 commit ebaec9798ed6790a559c96010e1074b74c1e260b
3872 Author: Owen W. Taylor <otaylor@fishsoup.net>
3873 Date: Sat Jun 6 17:44:40 2009 -0400
3875 Simplify timeout list handling for the master clock
3877 Instead of keeping a list of all timelines, and connecting to
3878 signals and weak notifies, simply keep a list of running timelines;
3879 this greatly simplifies both the book-keeping, and also determining
3880 if there are any running timelines.
3882 http://bugzilla.openedhand.com/show_bug.cgi?id=1637
3884 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3886 clutter/clutter-master-clock.c | 117 +++++++---------------------------------
3887 clutter/clutter-timeline.c | 39 ++++++++++----
3888 2 files changed, 48 insertions(+), 108 deletions(-)
3890 commit 3ab303b66234f633d03db660e4a780320dbfe423
3891 Author: Owen W. Taylor <otaylor@fishsoup.net>
3892 Date: Sat Jun 6 17:54:05 2009 -0400
3894 Only advance the master clock before drawing a frame
3896 Remove code to advance the master clock after drawing a frame; if
3897 there are any running timelines the master clock will do another
3898 frame by itself, and the clock will be advanced before running
3901 With this change, there is no point in queueing an extra frame
3902 redraw after completing a timeline, since we are always advancing
3903 the timeline *before* redrawing, so remove that code as well.
3904 (This does mean that calling clutter_timeline_stop() won't implicitly
3905 cause the stage to be redrawn; this doesn't seem like something
3906 an app should rely on in any case.)
3908 http://bugzilla.openedhand.com/show_bug.cgi?id=1637
3910 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3912 clutter/clutter-main.c | 5 ----
3913 clutter/clutter-master-clock.c | 63 ----------------------------------------
3914 2 files changed, 68 deletions(-)
3916 commit 19c2e66398280950d210a321beae5774a735fed4
3917 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3918 Date: Tue Jun 9 14:47:36 2009 +0100
3920 [docs] Various gtk-docs fixes
3922 clutter/clutter-event.c | 2 +-
3923 clutter/clutter-stage.c | 2 +-
3924 clutter/clutter-timeline.c | 50 +---------------------------
3925 clutter/clutter-units.c | 6 ++--
3926 clutter/clutter-units.h | 2 +-
3927 clutter/eglnative/clutter-egl.h | 7 ++++
3928 clutter/eglx/clutter-backend-egl.c | 2 +-
3929 clutter/eglx/clutter-eglx.h | 8 +++++
3930 doc/reference/clutter/clutter-sections.txt | 1 +
3931 9 files changed, 24 insertions(+), 56 deletions(-)
3933 commit 33f5fe73b3acfabd20dd867244005a6cf2609ab1
3934 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3935 Date: Tue Jun 9 14:05:03 2009 +0100
3937 [stage] Rename fullscreen methods
3939 The clutter_stage_fullscreen() and clutter_stage_unfullscreen() are
3940 a GDK-ism. The underlying implementation is already using an accessor
3941 with a boolean parameter.
3943 This should take the amount of collisions between properties, methods
3944 and signals to zero.
3946 clutter/clutter-deprecated.h | 3 +
3947 clutter/clutter-stage.c | 75 ++++++++++++------------
3948 clutter/clutter-stage.h | 5 +-
3949 doc/reference/clutter/clutter-sections.txt | 4 +-
3950 tests/interactive/test-clutter-cairo-flowers.c | 2 +-
3951 tests/interactive/test-events.c | 12 ++--
3952 tests/interactive/test-fullscreen.c | 4 +-
3953 tests/interactive/test-perspective.c | 2 +-
3954 8 files changed, 54 insertions(+), 53 deletions(-)
3956 commit 7c89a0ccfab2d597b306f8189c623cec3ee76580
3957 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3958 Date: Tue Jun 9 13:48:03 2009 +0100
3960 [stage] Rename :fullscreen to :fullscreen-set
3962 The :fullscreen property is very much confusing as it is implemented.
3963 It can be written to a value, but the whole process might fail. If we
3966 g_object_set (stage, "fullscreen", TRUE, NULL);
3968 and the fullscreen process fails or it is not implemented, the value
3969 will be reset to FALSE (if we're lucky) or left TRUE (most of the
3972 The writability is just a shorthand for invoking clutter_stage_fullscreen()
3973 or clutter_stage_unfullscreen() depending on a boolean value without
3976 The :fullscreen property also greatly confuses high level languages,
3977 since the same symbol is used:
3979 - for a method name (Clutter.Stage.fullscreen())
3980 - for a property name (Clutter.Stage.fullscreen)
3981 - for a signal (Clutter.Stage::fullscreen)
3983 For these reasons, the :fullscreen should be renamed to :fullscreen-set
3984 and be read-only. Implementations of the Stage should only emit the
3985 StageState event to change from normal to fullscreen, and the Stage
3986 will automatically update the value of the property and emit a notify
3989 clutter/clutter-stage.c | 127 ++++++++++++++++++----------------
3990 clutter/sdl/clutter-stage-sdl.c | 2 +-
3991 clutter/x11/clutter-stage-x11.c | 4 +-
3992 tests/interactive/test-events.c | 12 ++--
3993 tests/interactive/test-fullscreen.c | 2 +-
3994 tests/interactive/test-perspective.c | 3 +-
3995 6 files changed, 79 insertions(+), 71 deletions(-)
3997 commit ea82346e0df061e230d9ce27c2ff578558e54c5f
3998 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3999 Date: Tue Jun 9 12:43:57 2009 +0100
4001 [build] Update the experimental features checks
4003 Instead of blacklisting experimental features at the end we can
4004 explicitly mark backends and image backends near their checks and
4005 provide a summary at the end.
4007 configure.ac | 23 +++++++++++++++++------
4008 1 file changed, 17 insertions(+), 6 deletions(-)
4010 commit d743aeaa21b2c06ce9e673808e6f3ab2b05dd929
4011 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4012 Date: Tue Jun 9 12:42:19 2009 +0100
4014 [json] Update the internal JSON-GLib copy
4016 There have been changes in JSON-GLib upstream to clean up the
4017 data structures, and facilitate introspection.
4019 We still not use the updated JsonParser with the (private) JsonScanner
4020 code, since it's a fork of GLib's GScanner.
4022 clutter/clutter-script.c | 2 +-
4023 clutter/json/json-array.c | 479 ++++++++++++++++++++++++++-
4024 clutter/json/json-generator.c | 4 +-
4025 clutter/json/json-node.c | 163 ++++++++--
4026 clutter/json/json-object.c | 647 +++++++++++++++++++++++++++++++++++--
4027 clutter/json/json-parser.c | 8 +-
4028 clutter/json/json-types-private.h | 61 ++++
4029 clutter/json/json-types.h | 228 +++++++++----
4030 8 files changed, 1459 insertions(+), 133 deletions(-)
4032 commit 91856b1bed071b98a4d3eb22a4efae089faf6490
4033 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4034 Date: Tue Jun 9 12:40:06 2009 +0100
4036 [introspection] Add --c-include to g-ir-scanner
4038 Since Clutter has a single-include header policy we need to put
4039 the header to be included inside the GIR file.
4041 clutter/Makefile.am | 38 ++++++++++++++++++++------------------
4042 clutter/cogl/Makefile.am | 1 +
4043 2 files changed, 21 insertions(+), 18 deletions(-)
4045 commit 8728afa2ee8311a92021ee70ca5c4d09fe6c4966
4046 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4047 Date: Tue Jun 9 12:39:28 2009 +0100
4049 [build] Add as-compiler-flag.m4 to the dist
4051 build/autotools/Makefile.am | 1 +
4052 1 file changed, 1 insertion(+)
4054 commit 4b125d7fde86559baaf945943bbe5d9f81b45c9e
4055 Author: Neil Roberts <neil@linux.intel.com>
4056 Date: Tue Jun 9 11:13:11 2009 +0100
4058 [CoglTexture] Initialise tex->first_pixels to NULL in all constructors
4060 Otherwise if there is an error before the slices are created it will
4061 try to free the first_pixels array and crash.
4063 It now also checks whether first_pixels has been created before using
4064 it to update the mipmaps. This should only happen for
4065 cogl_texture_new_from_foreign and doesn't matter if the FBO extension
4066 is available. It would be better in this case to fetch the first pixel
4067 using glGetTexImage as Owen mentioned in the last commit.
4069 clutter/cogl/gl/cogl-texture.c | 6 +++++-
4070 clutter/cogl/gles/cogl-texture.c | 6 +++++-
4071 2 files changed, 10 insertions(+), 2 deletions(-)
4073 commit 1d7a7bf1e61a800e5ddeb738899f09a0009eabba
4074 Author: Owen W. Taylor <otaylor@fishsoup.net>
4075 Date: Mon Jun 8 16:45:43 2009 -0400
4077 Fix unitialized first_pixels for foreign textures
4079 tex->first_pixels was never set for foreign textures, leading
4080 to a crash when the texture object is freed.
4082 As a quick fix, simply set to NULL. A more complete fix would
4083 require remembering if we had ever seen the first pixel uploaded,
4084 and if not, doing a glReadPixel to get it before triggering the
4087 http://bugzilla.openedhand.com/show_bug.cgi?id=1645
4089 Signed-off-by: Neil Roberts <neil@linux.intel.com>
4091 clutter/cogl/gl/cogl-texture.c | 2 ++
4092 clutter/cogl/gles/cogl-texture.c | 2 ++
4093 2 files changed, 4 insertions(+)
4095 commit 08d580f68a02b7cd9eb4b8a93d9f32aa63db3a38
4096 Author: Owen W. Taylor <otaylor@fishsoup.net>
4097 Date: Mon Jun 8 09:26:57 2009 -0400
4099 On bad blend strings, print the error if not returning it
4101 It's very common that there's no reasonable fallback to do if the
4102 blend or combine string you set isn't supported. So, rather than
4103 requiring everybody to pass in a GError purely to catch syntax erorrs,
4104 automatically g_warning() if a parse error is encountered and @error
4107 http://bugzilla.openedhand.com/show_bug.cgi?id=1642
4109 Signed-off-by: Robert Bragg <robert@linux.intel.com>
4111 clutter/cogl/cogl-material.h | 5 ++++-
4112 clutter/cogl/common/cogl-material.c | 30 ++++++++++++++++++++++++++----
4113 2 files changed, 30 insertions(+), 5 deletions(-)
4115 commit d873a57ec90da7b5ae5b2cec62c1779316200177
4116 Author: Garry Bodsworth <gjb@camvine.com>
4117 Date: Mon Jun 8 11:56:59 2009 +0100
4119 Fix for new potential memory leak in ClutterGLXTexturePixmap.
4121 This fixes a new instance of glXDestroyGLXPixmap which should be
4124 Signed-off-by: Robert Bragg <robert@linux.intel.com>
4126 clutter/glx/clutter-glx-texture-pixmap.c | 2 +-
4127 1 file changed, 1 insertion(+), 1 deletion(-)
4129 commit fd0a490ced2a945eb19ed9d22b88efc7ade5f97c
4130 Author: Owen W. Taylor <otaylor@fishsoup.net>
4131 Date: Mon Jun 8 07:57:41 2009 -0400
4133 Properly adjust msecs_delta when clamping elapsed time
4135 When we complete a timeline, we clamp the elapsed_time variable
4136 to the range of the timeline. We need to adjust msecs_delta so that
4137 when we check for hit markers we have the correct interval.
4139 http://bugzilla.openedhand.com/show_bug.cgi?id=1641
4141 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4143 clutter/clutter-timeline.c | 14 +++++++++++---
4144 1 file changed, 11 insertions(+), 3 deletions(-)
4146 commit fd19d337461bd187a38e73edc3d620b97eac8bf8
4147 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4148 Date: Mon Jun 8 14:42:22 2009 +0100
4150 [animation] Keep a reference during notify::alpha
4152 The Animation should be referenced during the notification of the
4153 alpha value, since the callback is invoked depending on the Alpha
4154 and it won't vivify the Animation instance for us.
4158 http://bugzilla.openedhand.com/show_bug.cgi?id=1537
4160 clutter/clutter-animation.c | 9 ++++++++-
4161 1 file changed, 8 insertions(+), 1 deletion(-)
4163 commit 41e85f3073ab88cb5bfaeda479ed5ffa7db93264
4164 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4165 Date: Sat Jun 6 15:27:37 2009 +0100
4167 introspection-friendly ClutterEvent accessors
4169 ClutterEvent is not really gobject-introspection friendly because
4170 of the whole discriminated union thing. In particular, if you get
4171 a ClutterEvent in a signal handler, you probably can't access the
4172 event-type-specific fields, and you probably can't call methods
4173 like clutter_key_event_symbol() either, because you can't cast the
4174 ClutterEvent to a ClutterKeyEvent.
4176 The cleanest solution is to turn every accessor into ClutterEvent
4177 methods, accepting a ClutterEvent* and internally checking the event
4182 http://bugzilla.openedhand.com/show_bug.cgi?id=1585
4184 clutter/clutter-deprecated.h | 5 +
4185 clutter/clutter-event.c | 214 ++++++++++++++++++++--------
4186 clutter/clutter-event.h | 64 +++++----
4187 clutter/clutter-text.c | 11 +-
4188 doc/reference/clutter/clutter-sections.txt | 16 ++-
4189 tests/interactive/test-actor-clone.c | 8 +-
4190 tests/interactive/test-actors.c | 8 +-
4191 tests/interactive/test-layout.c | 8 +-
4192 tests/interactive/test-paint-wrapper.c | 6 +-
4193 tests/interactive/test-pixmap.c | 8 +-
4194 tests/interactive/test-threads.c | 18 ++-
4195 11 files changed, 245 insertions(+), 121 deletions(-)
4197 commit 04dc4106e5451da823d1141013d1653e4b909f19
4198 Author: Garry Bodsworth <gjb@camvine.com>
4199 Date: Mon Jun 8 08:46:33 2009 +0100
4201 [glx-texture-pixmap] Unref a cogl texture handle.
4203 According to clutter_texture_set_cogl_texture you should unref the handle as
4204 the texture takes its own.
4206 Signed-off-by: Robert Bragg <robert@linux.intel.com>
4208 clutter/glx/clutter-glx-texture-pixmap.c | 1 +
4209 1 file changed, 1 insertion(+)
4211 commit c968b06f15f994827f9dd77e7e9efb6e8e06db6b
4212 Author: Garry Bodsworth <gjb@camvine.com>
4213 Date: Mon Jun 8 08:38:50 2009 +0100
4215 Fix memory leak in ClutterGLXTexturePixmap.
4217 The OpenGL spec states that if you create a pixmap using glXCreatePixmap you
4218 should use glXDestroyPixmap to destroy it.
4220 Signed-off-by: Robert Bragg <robert@linux.intel.com>
4222 clutter/glx/clutter-glx-texture-pixmap.c | 4 ++--
4223 1 file changed, 2 insertions(+), 2 deletions(-)
4225 commit 1e6e41190b47c384d70216a09204f39808a3fd84
4226 Author: Owen W. Taylor <otaylor@fishsoup.net>
4227 Date: Sat Jun 6 12:07:42 2009 -0400
4229 Straighten out 'realize' handling for ClutterGLXTexturePixmap
4231 Setting the pixmap for an unrealized ClutterGLXTexturePixmap should
4232 not cause it to be realized, and certainly shouldn't cause the the
4233 REALIZED flag to be set without using clutter_actor_realize().
4235 This patch uses the simple approach that;
4237 - pixmap changes on an unrealized ClutterGLXTexturePixmap
4239 - when the ClutterGLXTexturePixmap is realized, we then create
4240 the GLXPixmap and the corresponding texture.
4242 The call to clutter_glx_texture_pixmap_update_area() is moved
4243 from create_cogl_texture() to
4244 clutter_glx_texture_pixmap_create_glx_pixmap() since
4245 create_cogl_texture() is only called from one place, and updating
4246 the area is really something we do *after* creating the texture,
4247 not part of creating the texture.
4249 clutter_glx_texture_pixmap_create_glx_pixmap() is reorganized a
4250 bit to avoid debug-logging confusingly if it's called before a pixmap
4251 has been set, and for readability.
4253 http://bugzilla.openedhand.com/show_bug.cgi?id=1635
4255 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4257 clutter/glx/clutter-glx-texture-pixmap.c | 80 ++++++++++++------------------
4258 1 file changed, 31 insertions(+), 49 deletions(-)
4260 commit d28c9e5db1c7dd7faab2fc9e718d70747d21dfb1
4261 Author: Owen W. Taylor <otaylor@fishsoup.net>
4262 Date: Sat Jun 6 09:55:00 2009 -0400
4264 Remove unnecessary setting of CLUTTER_ACTOR_REALIZED flag
4266 An implementaton of realize() never needs to set the
4267 CLUTTER_ACTOR_REALIZED flag, though it can unset the flag if
4268 things fail unexpectedly. (Previously, stage backend implementations
4269 had to do this since clutter_actor_realize() wasn't used; this
4270 is no longer the case.)
4272 http://bugzilla.openedhand.com/show_bug.cgi?id=1634
4274 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4276 clutter/clutter-stage.c | 5 +----
4277 clutter/eglnative/clutter-stage-egl.c | 3 +--
4278 clutter/eglx/clutter-stage-egl.c | 2 --
4279 clutter/fruity/clutter-stage-fruity.c | 3 +--
4280 clutter/glx/clutter-stage-glx.c | 6 ++----
4281 clutter/osx/clutter-stage-osx.c | 8 +-------
4282 clutter/sdl/clutter-stage-sdl.c | 2 --
4283 clutter/win32/clutter-stage-win32.c | 3 +--
4284 clutter/x11/clutter-x11-texture-pixmap.c | 2 --
4285 9 files changed, 7 insertions(+), 27 deletions(-)
4287 commit 2b7e98f4b3d48269dbfb2232af80cde92bcae306
4288 Author: Owen W. Taylor <otaylor@fishsoup.net>
4289 Date: Sat Jun 6 11:37:18 2009 -0400
4291 Be more tolerant about natural_width < min_width
4293 Due to the accumulation of floating point errors, natural_width
4294 and min_width can diverge significantly even if the math for
4295 computing them is correct. So just clamp natural_width to
4296 min_width instead of warning about it.
4298 http://bugzilla.openedhand.com/show_bug.cgi?id=1632
4300 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4302 clutter/clutter-actor.c | 28 ++++++++++------------------
4303 1 file changed, 10 insertions(+), 18 deletions(-)
4305 commit 583a86b537cd3b0d41c23949600c06515f5056bf
4306 Author: Owen W. Taylor <otaylor@fishsoup.net>
4307 Date: Sat Jun 6 11:28:02 2009 -0400
4309 Use double temporaries when computing group size
4311 If we use float temporaries when computing the bounds of
4312 a group, then, depending on what variables are kept in registers
4313 and what stored on the stack, the accumulated difference between
4314 natural_width and min_width can be more than FLOAT_EPSILON.
4316 Using double temporaries will eliminate the difference in most
4317 cases, or, very rarely, reduce it to a last-bit error.
4319 http://bugzilla.openedhand.com/show_bug.cgi?id=1632
4321 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4323 clutter/clutter-group.c | 8 ++++----
4324 1 file changed, 4 insertions(+), 4 deletions(-)
4326 commit 009eafb9ee1ea3b6e969b95f219e3f607c10f7e9
4327 Author: Owen W. Taylor <otaylor@fishsoup.net>
4328 Date: Sat Jun 6 11:56:08 2009 -0400
4330 Handle a clone of an actor with an unmapped parent
4332 If we are cloning an source actor with an unmapped parent, then when
4333 we temporarily map the source actor:
4335 - We need to skip the check that a mapped actor has a mapped
4337 - We need to realize the actor's parents before mapping it,
4338 or we'll get an assertion failure in clutter_actor_update_map_state()
4339 because an actor with an unmapped parent is !may_be_realized.
4341 http://bugzilla.openedhand.com/show_bug.cgi?id=1633
4343 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4345 clutter/clutter-actor.c | 26 ++++++++++++++++++--------
4346 1 file changed, 18 insertions(+), 8 deletions(-)
4348 commit d8459b0a32c95e0e6d59cc314d5d032c9f9c4edb
4349 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4350 Date: Mon Jun 8 10:59:22 2009 +0100
4352 [tests] Clarify the numbers
4354 tests/conform/test-timeline.c | 6 +++---
4355 1 file changed, 3 insertions(+), 3 deletions(-)
4357 commit 2ebe36cf0834ba6eca511a349aca95aa3777f87b
4358 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4359 Date: Mon Jun 8 10:58:20 2009 +0100
4361 [tests] The ::focus-in signal was renamed ::key-focus-in
4363 The test-events interactive test is still using the old name.
4365 tests/interactive/test-events.c | 10 +++++-----
4366 1 file changed, 5 insertions(+), 5 deletions(-)
4368 commit 54b5d076820cce3f69a699b34ca810204651bcc0
4369 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4370 Date: Mon Jun 8 02:22:26 2009 +0100
4372 [build] Add AS_COMPILER_FLAGS
4374 Use the AS_COMPILER_FLAGS to check whether the maintainer compiler flags
4375 we use are supported; this should fail gracefully and only use the ones
4376 that the compiler actually understands.
4380 http://bugzilla.openedhand.com/show_bug.cgi?id=1639
4382 build/autotools/as-compiler-flag.m4 | 62 +++++++++++++++++++++++++++++++++++
4383 configure.ac | 5 ++-
4384 2 files changed, 66 insertions(+), 1 deletion(-)
4386 commit 12b4e0400cfa85ab2c7d1544174747226d6b031a
4387 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4388 Date: Mon Jun 8 02:04:27 2009 +0100
4390 [x11] Do not forcibly set the stage size on fullscreen
4392 Setting the stage size using clutter_actor_set_size() is almost always
4393 wrong: the X11 stage implementation should save the size and queue a
4394 relayout -- like it does when receiving a ConfigureNotify. The same
4395 should happen when setting it to be full screen.
4397 clutter/x11/clutter-stage-x11.c | 34 +++++++++++++++++++++++-----------
4398 1 file changed, 23 insertions(+), 11 deletions(-)
4400 commit ca305d2a403a1e1f40cf9a606b590853863964f9
4401 Author: Owen W. Taylor <otaylor@fishsoup.net>
4402 Date: Mon Jun 8 01:51:02 2009 +0100
4404 [build] Search for Cogl GIR in the right place
4406 Since we build the Cogl GIR inside /clutter/cogl we should be looking
4407 there when building the Clutter GIR. Otherwise g-ir-scanner will look
4408 inside the gir directory -- and if you never built Clutter before it
4413 http://bugzilla.openedhand.com/show_bug.cgi?id=1638
4415 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4417 clutter/Makefile.am | 1 +
4418 1 file changed, 1 insertion(+)
4420 commit a87f6f32a6ce41623e893cc054591e9fe67d199f
4421 Author: Robert Bragg <robert@linux.intel.com>
4422 Date: Sat Jun 6 21:33:31 2009 +0100
4424 [test-blend-strings] Fix a silly off by one that meant the test couldn't fail
4426 The test was quiting after the 2nd frame but it should be the third frame because
4427 the test doesn't actually check results until the third frame due to the workaround
4428 for drivers with broken glReadPixels.
4430 (When first written the test would have been verified with the
4431 clutter_main_quit() commented out which gives visual feedback of what the
4432 test does, so the off by one would have snuck in just before uncommenting
4435 tests/conform/test-blend-strings.c | 2 +-
4436 1 file changed, 1 insertion(+), 1 deletion(-)
4438 commit 9691827b5b03886d6eb88e1aed5844514d59366f
4439 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4440 Date: Sat Jun 6 15:57:29 2009 +0100
4442 [texture] Fix error reporting on ::load-finished
4444 The load-finished signal has a GError* argument which is meant to
4445 signify whether the loading was successful. However many of the
4446 places in ClutterTexture that emit this signal directly pass their
4447 'error' variable which is a GError** and will be NULL or not
4448 completely independently of whether there was an error. If the
4449 argument was dereferenced it would probably crash.
4451 The test-texture-async interactive test case should also verify
4452 that the ::load-finished signal is correctly emitted.
4456 http://bugzilla.openedhand.com/show_bug.cgi?id=1622
4458 clutter/clutter-texture.c | 31 ++++++++++-------
4459 tests/interactive/test-texture-async.c | 60 ++++++++++++++++++++++++++++----
4460 2 files changed, 72 insertions(+), 19 deletions(-)
4462 commit ea9bd6761ad840c12c063a14d9334dd807473a9d
4463 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4464 Date: Sat Jun 6 14:39:21 2009 +0100
4466 [units] Always recompute pixels
4468 When asking for the pixels value we should always recompute it.
4470 The "pixel_set" guard can be left in place for future use.
4472 clutter/clutter-units.c | 3 ---
4473 1 file changed, 3 deletions(-)
4475 commit 7e5f7eb7902e9424bb223896ca0219e3032c416c
4476 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4477 Date: Sat Jun 6 14:38:10 2009 +0100
4479 [build] Remove -Werror for the maintainer cflags
4481 Now that we have Shave in place and don't risk losing warnings
4482 we can avoid -Werror in the anal-retentive maintainer compiler
4485 configure.ac | 5 ++---
4486 1 file changed, 2 insertions(+), 3 deletions(-)
4488 commit c3dc03997cf4a2b82f45c90ad855785f8ac86853
4489 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4490 Date: Sat Jun 6 14:37:41 2009 +0100
4492 Fixes for some compiler warnings
4494 clutter/clutter-actor.c | 2 ++
4495 clutter/clutter-texture.c | 1 +
4496 clutter/clutter-units.c | 8 ++++++--
4497 3 files changed, 9 insertions(+), 2 deletions(-)
4499 commit 5f0afa52187750c08be279a5ff840ef8b9a4f642
4500 Author: Owen W. Taylor <otaylor@fishsoup.net>
4501 Date: Fri Jun 5 17:53:57 2009 -0400
4503 [actor] get_transformed_position(): initialize Z value
4505 Initialize the Z value in the point we pass to
4506 clutter_actor_apply_transform_to_point().
4508 http://bugzilla.openedhand.com/show_bug.cgi?id=1630
4510 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4512 clutter/clutter-actor.c | 2 +-
4513 1 file changed, 1 insertion(+), 1 deletion(-)
4515 commit 276952d6f9c20e4a2be5fbf2ab381c263598f864
4516 Author: Owen W. Taylor <otaylor@fishsoup.net>
4517 Date: Fri Jun 5 16:52:18 2009 -0400
4519 Fix stopping a timeline
4521 Correctly apply De Morgan's laws to the short-circuit test in
4522 clutter_timeline_pause(); it was short-circuiting always and
4523 never actually pausing.
4525 http://bugzilla.openedhand.com/show_bug.cgi?id=1629
4527 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4529 clutter/clutter-timeline.c | 2 +-
4530 1 file changed, 1 insertion(+), 1 deletion(-)
4532 commit f87e10c02409b8c5fbdb4cf5b289109fbcc67e45
4533 Author: Johan Bilien <jobi@via.ecp.fr>
4534 Date: Wed Jun 3 22:08:17 2009 +0100
4536 Fix the leak of the GList of layers in CoglMaterial
4538 http://bugzilla.openedhand.com/show_bug.cgi?id=1624
4540 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4542 clutter/cogl/common/cogl-material.c | 1 +
4543 1 file changed, 1 insertion(+)
4545 commit 6f7afdf5536408885acb8f31a7dcf1bf0ab93114
4546 Author: Bastian Winkler <buz@netbuz.org>
4547 Date: Wed Jun 3 14:36:18 2009 +0200
4549 Broken fixed:: arguments
4551 The commit 2c95b378 prevents clutter_animation_setup_property from being
4552 called with fixed:: property names. This patch adds a additional
4553 parameter "is_fixed" to clutter_animation_setup_property instead of
4554 searching for "fixed::" in property_name.
4556 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4558 clutter/clutter-animation.c | 29 ++++++++++++++++-------------
4559 1 file changed, 16 insertions(+), 13 deletions(-)
4561 commit ca5473836bb41687640a7f2fcf538bfa3733f122
4562 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4563 Date: Sat Jun 6 12:34:00 2009 +0100
4565 [build] Check for libXext
4567 It seems GNU Gold (the new linker) either behaves as if with
4568 --no-undefined by default, or has some issue preventing it from not
4569 doing that when instructed to (I'm not sure if this actually
4570 happens). In any case, clutter uses the Xshm extensions, but does not
4571 link to libXext, which makes gold unhappy.
4573 Based on a patch by: Xan Lopez <xan@gnome.org>
4575 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4577 configure.ac | 15 +++++++++++++++
4578 1 file changed, 15 insertions(+)
4580 commit ea15e4c7f0476e1610e79a990616a467615358db
4581 Author: Neil Roberts <neil@linux.intel.com>
4582 Date: Fri Jun 5 18:00:22 2009 +0100
4584 [CoglPangoDisplayList] Don't store the base color in the display list
4586 It should be possible render a single PangoLayout with different
4587 colors without recalculating the layout. This was not working because
4588 the color used at the first edit was being stored in the display
4589 list. This broke changing the opacity on a ClutterText.
4591 Now each node in the display list has a 'color override' flag which
4592 marks whether it should use the base color or not. The base color is
4593 now passed in from _cogl_pango_display_list_render_texture. The alpha
4594 value is always taken from the base color.
4596 clutter/pango/cogl-pango-display-list.c | 44 ++++++++++++++++++++++++++-----
4597 clutter/pango/cogl-pango-display-list.h | 6 +++--
4598 clutter/pango/cogl-pango-render.c | 26 +++++++++---------
4599 3 files changed, 53 insertions(+), 23 deletions(-)
4601 commit 6fe22ac8505da2c9a0b7eb97c3a6ea5f3edea95c
4602 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4603 Date: Fri Jun 5 17:55:24 2009 +0100
4605 [repaint] Run the repaint functions in clutter_redraw()
4607 The clutter_redraw() function is used by libraries embedding
4608 Clutter inside another toolkit, instead of queueing a redraw
4609 on the embedded stage. This means that clutter_redraw() should
4610 perform the same sequence of actions done by the redraw idle
4613 clutter/clutter-main.c | 34 +++++++++++++++++++++++++++-------
4614 clutter/clutter-private.h | 3 +++
4615 clutter/clutter-stage.c | 4 ++--
4616 3 files changed, 32 insertions(+), 9 deletions(-)
4618 commit f66021825c191a7185e488086b4ef06e84f16061
4619 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4620 Date: Fri Jun 5 17:54:21 2009 +0100
4622 [docs] Update README
4624 * Remove mentions of Subversion
4626 * Update the configure command line switches
4628 README | 31 +++++++++++++++++++------------
4629 1 file changed, 19 insertions(+), 12 deletions(-)
4631 commit 01e1aae7dd7c65ef8f60d66f95cb335d609fdff4
4632 Author: Robert Bragg <robert@linux.intel.com>
4633 Date: Sat Apr 4 19:21:22 2009 +0100
4635 [cogl] cogl_material_set_layer does nothing if resetting the same texture
4637 This avoids dirtying the layer, and should avoid some uneeded state changes
4639 clutter/cogl/common/cogl-material.c | 3 +++
4640 1 file changed, 3 insertions(+)
4642 commit dea7f9b7d3fe36d398ade3f8e45ec4e31652dc48
4643 Author: Robert Bragg <robert@linux.intel.com>
4644 Date: Fri May 22 16:59:14 2009 +0100
4646 [test-conformance] we were calling clutter_init with un-initialized arguments
4648 This ensure we initialize shared_state->arg{c,v}_addr before calling
4651 tests/conform/test-conform-main.c | 6 +++---
4652 1 file changed, 3 insertions(+), 3 deletions(-)
4654 commit 6b92296e7f933a6d9798ba807fbd80ee2221144d
4655 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4656 Date: Fri Jun 5 16:46:12 2009 +0100
4658 [build] Fix compiler warnings
4662 clutter/cogl/common/cogl-blend-string.c | 4 ++--
4663 1 file changed, 2 insertions(+), 2 deletions(-)
4665 commit 02fa34f65b3efefaca4146e968c0f84a20061da1
4666 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4667 Date: Fri Jun 5 15:18:43 2009 +0100
4669 Fix a compiler warning
4671 clutter/cogl/common/cogl-vertex-buffer.c | 2 +-
4672 1 file changed, 1 insertion(+), 1 deletion(-)
4674 commit b061a00f4cde1bdf1406bbf94b87fb88e996987a
4675 Author: Neil Roberts <neil@linux.intel.com>
4676 Date: Fri Jun 5 16:25:39 2009 +0100
4678 [ClutterActor] Fix check for zero opacity when being painted from a clone
4680 Clutter short-circuits painting when an actor's opacity is
4681 zero. However if the actor is being painted from a ClutterClone then
4682 it will be painted using the clone's opacity instead so the test was
4685 clutter/clutter-actor.c | 4 +++-
4686 1 file changed, 3 insertions(+), 1 deletion(-)
4688 commit 03471daf50dae5baf906ba95ba200d77e40bb3fb
4689 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4690 Date: Fri Jun 5 12:46:37 2009 +0100
4692 [build] Add all dependencies for pkg-config
4694 A merge conflict gone bad: the IMAGE_PC_FILES variable was not appended
4695 to the CLUTTER_REQUIRES one, thus leading to Clutter depending on
4696 GdkPixbuf but never actually checking for it.
4698 configure.ac | 6 ++++--
4699 1 file changed, 4 insertions(+), 2 deletions(-)
4701 commit 7e33fe3175d17ff659705c24ac7865510b145528
4702 Merge: b5a7b3a cbb748f
4703 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4704 Date: Fri Jun 5 12:41:42 2009 +0100
4706 Merge branch '1.0-integration'
4708 * 1.0-integration: (138 commits)
4709 [x11] Disable XInput by default
4710 [xinput] Invert the XI extension version check
4711 [cogl-primitives] Fix an unused variable warning when building GLES
4712 [clutter-stage-egl] Pass -1,-1 to clutter_stage_x11_fix_window_size
4713 Update the GLES backend to have the layer filters in the material
4714 [gles/cogl-shader] Add a missing semicolon
4715 [cogl] Move the texture filters to be a property of the material layer
4716 [text] Fix Pango unit to pixels conversion
4717 [actor] Force unrealization on destroy only for non-toplevels
4718 [x11] Rework map/unmap and resizing
4719 [xinput] Check for the XInput entry points
4720 [units] Validate units against the ParamSpec
4721 [actor] Add the ::allocation-changed signal
4722 [actor] Use flags to control allocations
4723 [units] Rework Units into logical distance value
4724 Remove a stray g_value_get_int()
4725 Remove usage of Units and macros
4726 [cogl-material] Allow setting a layer with an invalid texture handle
4727 [timeline] Remove the concept of frames from timelines
4728 [gles/cogl-shader] Fix parameter spec for cogl_shader_get_info_log
4734 commit cbb748f7c042e250b9383c59236645966c5ad47e
4735 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4736 Date: Fri Jun 5 12:26:29 2009 +0100
4738 [x11] Disable XInput by default
4740 The XInput support in Clutter is still using XI 1.x. This will never
4741 work correctly, and we are all waiting for XInput 2 anyway. The changes
4742 internally should be minimal, so we can leave everything in place, but
4743 it's better to disable XInput support by default -- at least for the
4746 clutter/x11/clutter-backend-x11.c | 20 ++++++++++++--------
4747 clutter/x11/clutter-event-x11.c | 6 ++----
4749 3 files changed, 15 insertions(+), 13 deletions(-)
4751 commit 3ee093e356de19253f4a838553c8f31579a256ad
4752 Merge: 745ca8a 9c7afe0
4753 Author: Neil Roberts <neil@linux.intel.com>
4754 Date: Fri Jun 5 12:20:41 2009 +0100
4756 Merge branch 'timeline-no-fps' into 1.0-integration
4758 commit 745ca8a62ca52eedfad850e556f160f36eb32953
4759 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4760 Date: Fri Jun 5 12:06:09 2009 +0100
4762 [xinput] Invert the XI extension version check
4764 Since having XQueryInputVersion means also having XGetExtensionVersion
4765 we need to check the former first to avoid the deprecation warning.
4767 clutter/x11/clutter-backend-x11.c | 6 +++---
4768 1 file changed, 3 insertions(+), 3 deletions(-)
4770 commit fa3ed19db56db26cadd37ea73539f1bd59254ef4
4771 Author: Neil Roberts <neil@linux.intel.com>
4772 Date: Thu Jun 4 22:20:18 2009 +0100
4774 [cogl-primitives] Fix an unused variable warning when building GLES
4776 The 'tex' variable is only used if #ifdef'd GL code so it was throwing
4777 an error under GLES. The variable is now moved into a block inside the
4780 clutter/cogl/common/cogl-primitives.c | 14 ++++++++------
4781 1 file changed, 8 insertions(+), 6 deletions(-)
4783 commit 810e936164028043682b014a8e9b531fb373f317
4784 Author: Neil Roberts <neil@linux.intel.com>
4785 Date: Thu Jun 4 22:15:41 2009 +0100
4787 [clutter-stage-egl] Pass -1,-1 to clutter_stage_x11_fix_window_size
4789 This reflects the changes made to e4ff24bc for the egl stage.
4791 clutter/eglx/clutter-stage-egl.c | 2 +-
4792 1 file changed, 1 insertion(+), 1 deletion(-)
4794 commit 6efbb92c5899dfadac4f366bee709f5154180967
4795 Author: Neil Roberts <neil@linux.intel.com>
4796 Date: Thu Jun 4 22:12:33 2009 +0100
4798 Update the GLES backend to have the layer filters in the material
4800 This reflects the changes made in 54d8aadf1d86 for the GLES backend.
4802 clutter/cogl/gles/cogl-texture-private.h | 31 ++++-
4803 clutter/cogl/gles/cogl-texture.c | 182 +++++++++++++++++++-----------
4804 2 files changed, 142 insertions(+), 71 deletions(-)
4806 commit eff82a546d2ae6747ae32f639f07a6d182114016
4807 Author: Neil Roberts <neil@linux.intel.com>
4808 Date: Thu Jun 4 22:10:33 2009 +0100
4810 [gles/cogl-shader] Add a missing semicolon
4812 cogl_shader_get_info_log was missing a semicolon which broke the build
4815 clutter/cogl/gles/cogl-shader.c | 2 +-
4816 1 file changed, 1 insertion(+), 1 deletion(-)
4818 commit 54d8aadf1d86bf6cfacc5346c02a13f3a2577268
4819 Author: Neil Roberts <neil@linux.intel.com>
4820 Date: Thu Jun 4 16:04:57 2009 +0100
4822 [cogl] Move the texture filters to be a property of the material layer
4824 The texture filters are now a property of the material layer rather
4825 than the texture object. Whenever a texture is painted with a material
4826 it sets the filters on all of the GL textures in the Cogl texture. The
4827 filter is cached so that it won't be changed unnecessarily.
4829 The automatic mipmap generation has changed so that the mipmaps are
4830 only generated when the texture is painted instead of every time the
4831 data changes. Changing the texture sets a flag to mark that the
4832 mipmaps are dirty. This works better if the FBO extension is available
4833 because we can use glGenerateMipmap. If the extension is not available
4834 it will temporarily enable automatic mipmap generation and reupload
4835 the first pixel of each slice. This requires tracking the data for the
4838 The COGL_TEXTURE_AUTO_MIPMAP flag has been replaced with
4839 COGL_TEXTURE_NO_AUTO_MIPMAP so that it will default to
4840 auto-mipmapping. The mipmap generation is now effectively free if you
4841 are not using a mipmap filter mode so you would only want to disable
4842 it if you had some special reason to generate your own mipmaps.
4844 ClutterTexture no longer has to store its own copy of the filter
4845 mode. Instead it stores it in the material and the property is
4846 directly set and read from that. This fixes problems with the filters
4847 getting out of sync when a cogl handle is set on the texture
4848 directly. It also avoids the mess of having to rerealize the texture
4849 if the filter quality changes to HIGH because Cogl will take of
4850 generating the mipmaps if needed.
4852 clutter/clutter-texture.c | 132 +++++++-------------
4853 clutter/cogl/cogl-material.h | 80 ++++++++++++
4854 clutter/cogl/cogl-texture.h | 80 ------------
4855 clutter/cogl/cogl-types.h | 13 +-
4856 clutter/cogl/common/cogl-material-private.h | 3 +
4857 clutter/cogl/common/cogl-material.c | 59 +++++++++
4858 clutter/cogl/common/cogl-primitives.c | 3 +-
4859 clutter/cogl/gl/cogl-context.h | 1 +
4860 clutter/cogl/gl/cogl-defines.h.in | 4 +
4861 clutter/cogl/gl/cogl-texture-private.h | 31 ++++-
4862 clutter/cogl/gl/cogl-texture.c | 179 +++++++++++++++++----------
4863 clutter/cogl/gl/cogl.c | 7 +-
4864 clutter/glx/clutter-glx-texture-pixmap.c | 20 +--
4865 clutter/pango/cogl-pango-glyph-cache.c | 22 +---
4866 clutter/pango/cogl-pango-glyph-cache.h | 2 +-
4867 clutter/pango/cogl-pango-render.c | 40 +++---
4868 doc/reference/cogl/cogl-sections.txt | 7 +-
4869 tests/conform/test-backface-culling.c | 22 ++--
4870 tests/interactive/test-cogl-multitexture.c | 9 +-
4871 tests/interactive/test-cogl-tex-polygon.c | 21 ++--
4872 tests/interactive/test-cogl-tex-tile.c | 4 -
4873 21 files changed, 422 insertions(+), 317 deletions(-)
4875 commit c27f42981961eed79ef32e4b4fd7081098619844
4876 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4877 Date: Thu Jun 4 17:28:35 2009 +0100
4879 [text] Fix Pango unit to pixels conversion
4881 When going from Pango units to pixels we need to divide by 1024,
4882 and not multiply by 1024.
4884 clutter/clutter-text.c | 2 +-
4885 1 file changed, 1 insertion(+), 1 deletion(-)
4887 commit 5ea3b47144720dfa1692cc085537300e4d24d97c
4888 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4889 Date: Thu Jun 4 16:50:19 2009 +0100
4891 [actor] Force unrealization on destroy only for non-toplevels
4893 We cannot force unrealization on toplevels ourselves, so we need
4894 to check inside clutter_actor_destroy() if we want to avoid a
4897 clutter/clutter-actor.c | 3 ++-
4898 1 file changed, 2 insertions(+), 1 deletion(-)
4900 commit e4ff24bcff4881ddadaf3bb52d74ee71061504fc
4901 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4902 Date: Thu Jun 4 16:27:21 2009 +0100
4904 [x11] Rework map/unmap and resizing
4906 The mapping and unmapping of the X11 stage implementation is
4907 a bit bong. It's asynchronous, for starters, when it really
4908 can avoid it by tracking the state internally.
4910 The ordering of the map/unmap sequence is also broken with
4911 respect to the resizing.
4913 By tracking the state internally into StageX11 we can safely
4914 remove the MapNotify and UnmapNotify X event handling.
4916 In theory, we should use _NET_WM_STATE a lot more, and reuse
4917 the X11 state flags for fullscreening as well.
4919 clutter/clutter-actor.c | 5 +-
4920 clutter/clutter-stage-window.h | 4 +
4921 clutter/clutter-stage.c | 13 ++-
4922 clutter/glx/clutter-stage-glx.c | 2 +-
4923 clutter/x11/clutter-event-x11.c | 9 +-
4924 clutter/x11/clutter-stage-x11.c | 195 +++++++++++++++++++++++++--------------
4925 clutter/x11/clutter-stage-x11.h | 11 ++-
4926 7 files changed, 155 insertions(+), 84 deletions(-)
4928 commit 0a4a28a950ae5022684742d18144c1cb9b6a96d1
4929 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4930 Date: Thu Jun 4 13:41:32 2009 +0100
4932 [xinput] Check for the XInput entry points
4934 Apparently, the XInput extension is using the same pkg-config
4935 file ('xi') for both the 1.x and the 2.x API, so we need to
4936 check for both the 1.x XGetExtensionVersion and the 2.x
4939 clutter/x11/clutter-backend-x11.c | 36 ++++++++++++++++++++++++++----------
4940 clutter/x11/clutter-backend-x11.h | 12 ++----------
4941 clutter/x11/clutter-event-x11.c | 8 ++++----
4942 clutter/x11/clutter-stage-x11.h | 6 ++----
4943 configure.ac | 33 ++++++++++++++++++++++++++++++++-
4944 5 files changed, 66 insertions(+), 29 deletions(-)
4946 commit 876dc22633a62c3eb451d9f491d97cddadf6d3c0
4947 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4948 Date: Thu Jun 4 12:15:15 2009 +0100
4950 [units] Validate units against the ParamSpec
4952 When declaring a property using ClutterParamSpecUnits we pass a
4953 default type to limit the type of units we accept as valid values
4956 This means that we need to add the unit type check as part of the
4959 clutter/clutter-units.c | 38 ++++++++++++++++++++++++++++++++++++++
4960 1 file changed, 38 insertions(+)
4962 commit 5ebb59e6b0a11c156e1f246a852986f15080f297
4963 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4964 Date: Thu Jun 4 12:00:58 2009 +0100
4966 [actor] Add the ::allocation-changed signal
4968 Sometimes it is useful to be able to track changes in the allocation
4969 flags, like the absolute origin, inside children of a container.
4971 Using the notify::allocation signal is not enough, in these cases, so
4972 we need a specific signal that gives us both the allocation box and the
4975 clutter/clutter-actor.c | 43 +++++++++++++++++++++++++++++++++++++++++-
4976 clutter/clutter-marshal.list | 1 +
4977 2 files changed, 43 insertions(+), 1 deletion(-)
4979 commit 0187bb396524435fe32696176bcb234f36be326f
4980 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4981 Date: Wed Jun 3 14:02:06 2009 +0100
4983 [actor] Use flags to control allocations
4985 Instead of passing a boolean value, the ::allocate virtual function
4986 should use a bitmask and flags. This gives us room for expansion
4987 without breaking API/ABI, and allows to encode more information to
4988 the allocation process instead of just changes of absolute origin.
4990 clutter/clutter-actor.c | 64 +++++++++++++++++------------------
4991 clutter/clutter-actor.h | 46 +++++++++++++++++--------
4992 clutter/clutter-clone.c | 13 +++----
4993 clutter/clutter-group.c | 17 +++++-----
4994 clutter/clutter-main.c | 2 +-
4995 clutter/clutter-stage.c | 21 +++++++-----
4996 clutter/clutter-text.c | 8 ++---
4997 clutter/clutter-texture.c | 13 +++----
4998 clutter/osx/clutter-stage-osx.c | 8 ++---
4999 clutter/sdl/clutter-stage-sdl.c | 8 ++---
5000 clutter/win32/clutter-stage-win32.c | 16 ++++-----
5001 clutter/x11/clutter-stage-x11.c | 8 ++---
5002 tests/interactive/test-layout.c | 13 ++++---
5003 13 files changed, 128 insertions(+), 109 deletions(-)
5005 commit 0d5e17ecd12c680e52144e9f3493616cf96cbd05
5006 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5007 Date: Wed Jun 3 11:12:09 2009 +0100
5009 [units] Rework Units into logical distance value
5011 Units as they have been implemented since Clutter 0.4 have always been
5012 misdefined as "logical distance unit", while they were just pixels with
5015 Units should be reworked to be opaque structures to hold a value and
5016 its unit type, that can be then converted into pixels when Clutter needs
5017 to paint or compute size requisitions and perform allocations.
5019 The previous API should be completely removed to avoid collisions, and
5024 should be added; the ability to install GObject properties using
5025 ClutterUnits should be maintained.
5028 clutter/clutter-actor.c | 111 ++--
5029 clutter/clutter-units.c | 763 ++++++++++++++++++----------
5030 clutter/clutter-units.h | 271 +++-------
5031 doc/reference/clutter/clutter-sections.txt | 50 +-
5032 tests/conform/Makefile.am | 1 +
5033 tests/conform/test-clutter-units.c | 58 +++
5034 tests/conform/test-conform-main.c | 3 +
5035 tests/interactive/test-text-field.c | 22 +-
5036 9 files changed, 701 insertions(+), 580 deletions(-)
5038 commit 1580ffb884fa1864e9bd53934ae2d1258c3b7dbe
5039 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5040 Date: Wed Jun 3 10:09:56 2009 +0100
5042 Remove a stray g_value_get_int()
5044 Now that all properties are float, using g_value_get_int() to
5045 retrieve the value of the :anchor-x property is going to print
5048 clutter/clutter-actor.c | 2 +-
5049 1 file changed, 1 insertion(+), 1 deletion(-)
5051 commit 046e571bae28790cb4d3e59d83e838a553fe15f0
5052 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5053 Date: Tue Jun 2 18:44:30 2009 +0100
5055 Remove usage of Units and macros
5057 The ClutterUnit and relative macros should not be used when dealing
5058 with pixels -- which is to say, all the time when inside Clutter.
5060 clutter/clutter-backend.c | 4 +-
5061 clutter/clutter-interval.c | 15 +-----
5062 clutter/clutter-text.c | 90 +++++++++++++++------------------
5063 clutter/x11/clutter-stage-x11.c | 31 +++++-------
5064 tests/conform/test-anchors.c | 54 ++++++++++----------
5065 tests/conform/test-binding-pool.c | 16 +++---
5066 tests/interactive/test-animation.c | 5 +-
5067 tests/interactive/test-binding-pool.c | 16 +++---
5068 tests/interactive/test-layout.c | 68 ++++++++++++-------------
5069 tests/interactive/test-project.c | 18 +++----
5070 tests/interactive/test-text-field.c | 8 +--
5071 11 files changed, 142 insertions(+), 183 deletions(-)
5073 commit 26f07abc6566e88828a9d8ca9419b1de3bec7c46
5074 Author: Neil Roberts <neil@linux.intel.com>
5075 Date: Wed Jun 3 15:22:42 2009 +0100
5077 [cogl-material] Allow setting a layer with an invalid texture handle
5079 It was previously possible to create a material layer with no texture
5080 by setting some property on it such as the matrix. However it was not
5081 possible to get back to that state without removing the layer and
5082 recreating it. It is useful to be able to remove the texture to free
5083 resources without forgetting the state of the layer so we can put a
5084 different texture in later.
5086 clutter/cogl/common/cogl-material.c | 6 ++++--
5087 1 file changed, 4 insertions(+), 2 deletions(-)
5089 commit 9c7afe0c5bf99e38c6fd4584b8fa3b0ed02cf996
5090 Author: Neil Roberts <neil@linux.intel.com>
5091 Date: Thu Jun 4 13:05:12 2009 +0100
5093 [timeline] Remove the concept of frames from timelines
5095 Timelines no longer work in terms of a frame rate and a number of
5096 frames but instead just have a duration in milliseconds. This better
5097 matches the working of the master clock where if any timelines are
5098 running it will redraw as fast as possible rather than limiting to the
5099 lowest rated timeline.
5101 Most applications will just create animations and expect them to
5102 finish in a certain amount of time without caring about how many
5103 frames are drawn. If a frame is going to be drawn it might as well
5104 update all of the animations to some fraction of the total animation
5105 rather than rounding to the nearest whole frame.
5107 The 'frame_num' parameter of the new-frame signal is now 'msecs' which
5108 is a number of milliseconds progressed along the
5109 timeline. Applications should use clutter_timeline_get_progress
5110 instead of the frame number.
5112 Markers can now only be attached at a time value. The position is
5113 stored in milliseconds rather than at a frame number.
5115 test-timeline-smoothness and test-timeline-dup-frames have been
5116 removed because they no longer make sense.
5118 clutter/clutter-alpha.c | 116 +++--
5119 clutter/clutter-timeline.c | 638 ++++++++-------------------
5120 clutter/clutter-timeline.h | 24 +-
5121 doc/reference/clutter/clutter-sections.txt | 8 +-
5122 tests/conform/Makefile.am | 2 -
5123 tests/conform/test-conform-main.c | 3 -
5124 tests/conform/test-timeline-dup-frames.c | 134 ------
5125 tests/conform/test-timeline-interpolate.c | 19 +-
5126 tests/conform/test-timeline-rewind.c | 12 +-
5127 tests/conform/test-timeline-smoothness.c | 147 ------
5128 tests/conform/test-timeline.c | 48 +-
5129 tests/interactive/test-actor-clone.c | 7 +-
5130 tests/interactive/test-actors.c | 9 +-
5131 tests/interactive/test-behave.c | 2 +-
5132 tests/interactive/test-cogl-multitexture.c | 8 +-
5133 tests/interactive/test-cogl-primitives.c | 7 +-
5134 tests/interactive/test-cogl-tex-polygon.c | 2 +-
5135 tests/interactive/test-cogl-tex-tile.c | 2 +-
5136 tests/interactive/test-cogl-vertex-buffer.c | 5 +-
5137 tests/interactive/test-depth.c | 2 +-
5138 tests/interactive/test-layout.c | 2 +-
5139 tests/interactive/test-multistage.c | 2 +-
5140 tests/interactive/test-paint-wrapper.c | 13 +-
5141 tests/interactive/test-pixmap.c | 2 +-
5142 tests/interactive/test-rotate.c | 2 +-
5143 tests/interactive/test-scale.c | 2 +-
5144 tests/interactive/test-score.c | 10 +-
5145 tests/interactive/test-texture-async.c | 2 +-
5146 tests/interactive/test-texture-quality.c | 2 +-
5147 tests/interactive/test-threads.c | 2 +-
5148 tests/interactive/test-viewport.c | 2 +-
5149 31 files changed, 323 insertions(+), 913 deletions(-)
5151 commit c20886c5e36fa92a8bfa79a5c24d73d4c558b9ae
5152 Author: Neil Roberts <neil@linux.intel.com>
5153 Date: Thu Jun 4 12:04:47 2009 +0100
5155 [gles/cogl-shader] Fix parameter spec for cogl_shader_get_info_log
5157 The stub version of cogl_shader_get_info_log needed to be updated to
5158 match the changes to the function signature in 61deeafa.
5160 clutter/cogl/gles/cogl-shader.c | 7 +++----
5161 1 file changed, 3 insertions(+), 4 deletions(-)
5163 commit fa0b33ec30a0e95e6dc0731abe698e16135b19db
5164 Author: Neil Roberts <neil@linux.intel.com>
5165 Date: Thu Jun 4 11:59:17 2009 +0100
5167 [clutter-stage-win32] Call clutter_actor_map instead of setting the flags
5169 The clutter_actor_map and unmap functions need to be called to
5170 properly update the mapped state. This matches the changes to the X11
5173 clutter/win32/clutter-stage-win32.c | 8 ++++----
5174 1 file changed, 4 insertions(+), 4 deletions(-)
5176 commit af68945486ff20adb8d386af5dd0b76a50eca098
5177 Author: Neil Roberts <neil@linux.intel.com>
5178 Date: Thu Jun 4 11:50:52 2009 +0100
5180 [clutter-event-win32] Fix the argument types to clutter_actor_get_size
5182 clutter_actor_get_size now takes float pointers so it was issuing a
5185 clutter/win32/clutter-event-win32.c | 2 +-
5186 1 file changed, 1 insertion(+), 1 deletion(-)
5188 commit f89ff7f3835edab93de1c67895b6a754abffc5eb
5189 Author: Neil Roberts <neil@linux.intel.com>
5190 Date: Thu Jun 4 11:50:06 2009 +0100
5192 Load glBlendEquation and glBlendColor using cogl_get_proc_address
5194 These are defined since OpenGL 1.2 and since Windows doesn't export
5195 any functions defined after 1.1 we need to load them dynamically.
5197 clutter/cogl/common/cogl-material.c | 2 ++
5198 clutter/cogl/gl/cogl-context.h | 2 ++
5199 clutter/cogl/gl/cogl-defines.h.in | 11 +++++++++++
5200 clutter/cogl/gl/cogl.c | 7 +++++++
5201 4 files changed, 22 insertions(+)
5203 commit daa95b561e1dda0c13624fdbde602c36dc786842
5204 Author: Neil Roberts <neil@linux.intel.com>
5205 Date: Thu Jun 4 11:48:51 2009 +0100
5207 Rename 'near' and 'far' variables to 'z_near' and 'z_far'
5209 The Windows headers define near and far to be empty so it breaks the
5212 clutter/cogl/cogl-matrix.h | 12 ++++++------
5213 clutter/cogl/common/cogl-current-matrix.c | 18 +++++++++---------
5214 2 files changed, 15 insertions(+), 15 deletions(-)
5216 commit b5a7b3a004de7e0b237811dbf8c4feb025a09333
5217 Author: Neil Roberts <neil@linux.intel.com>
5218 Date: Thu Jun 4 11:03:34 2009 +0100
5220 [configure] Require pango 1.20 instead of 1.18
5222 Clutter now calls pango_layout_set_height which is only available
5227 2 files changed, 2 insertions(+), 2 deletions(-)
5229 commit 6825b9db1c1eaeab151d4ca9cc4f5ec923cbcde0
5230 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5231 Date: Wed Jun 3 12:59:16 2009 +0100
5233 [actor] Unrealize on destroy
5235 If the application code calls for destruction of an actor we need
5236 to make sure that the actor is unrealized before running the dispose
5237 sequence; otherwise, we might trigger an assertion failure on composite
5240 clutter/clutter-actor.c | 5 +++++
5241 1 file changed, 5 insertions(+)
5243 commit 181ba67114d8bd88c0b7091ad9033ebee6bff63c
5244 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5245 Date: Wed Jun 3 14:03:25 2009 +0100
5247 Revert commit 762873e7
5249 The commit 762873e79e501c949f3ef55cbac20276b6f6ed4e is completely
5250 and utterly wrong and I should have never pushed it.
5252 Serves me well for trying to work on three different branches and
5253 on three different things.
5255 clutter/clutter-master-clock.c | 21 +--------------------
5256 clutter/clutter-timeline.c | 10 +++-------
5257 clutter/clutter-timeline.h | 2 +-
5258 3 files changed, 5 insertions(+), 28 deletions(-)
5260 commit 762873e79e501c949f3ef55cbac20276b6f6ed4e
5261 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5262 Date: Wed Jun 3 12:02:56 2009 +0100
5264 [master clock] Avoid excessive redraws
5266 Currently, the clock source spins a redraw every time there is at
5267 least a timeline running. If the timelines were not advanced in
5268 the previous frame, though, because their interval is larger than
5269 the vblanking interval then this will lead to excessive redraws of
5270 the scenegraph even if nothing has changed.
5272 To avoid this a simple guard should be set by the MasterClock::advance
5273 method in case no timeline was effectively advanced, and checked
5274 before dispatching the stage redraws.
5276 clutter/clutter-master-clock.c | 21 ++++++++++++++++++++-
5277 clutter/clutter-timeline.c | 10 +++++++---
5278 clutter/clutter-timeline.h | 2 +-
5279 3 files changed, 28 insertions(+), 5 deletions(-)
5281 commit f4a431a947011aaa4101935691058a10cd80ff08
5282 Author: Neil Roberts <neil@linux.intel.com>
5283 Date: Tue Jun 2 18:01:18 2009 +0100
5285 [cogl-texture] Don't take ownership of the data in cogl_texture_new_from_bitmap
5287 When creating a Cogl texture from a Cogl bitmap it would steal the
5288 data by setting the bitmap_owner flag and clearing the data pointer
5289 from the bitmap. The data would be freed by the time the
5290 new_from_bitmap is finished. There is no reason to do this because the
5291 data will be freed when the Cogl bitmap is unref'd and it is confusing
5292 not to be able to reuse the bitmap for creating multiple textures.
5294 clutter/cogl/gl/cogl-texture.c | 3 +--
5295 1 file changed, 1 insertion(+), 2 deletions(-)
5297 commit b6f1322e07f0fd678a48f1128eae6cba8b8211d7
5298 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5299 Date: Mon Jun 1 18:43:47 2009 +0100
5301 [tests] Add ClutterColor conformance tests
5303 Add a conformance test unit for the to_string() and from_string()
5307 tests/conform/Makefile.am | 1 +
5308 tests/conform/test-color.c | 71 +++++++++++++++++++++++++++++++++++++
5309 tests/conform/test-conform-main.c | 3 ++
5310 4 files changed, 77 insertions(+)
5312 commit bd13a4ddc486586bc1051080cbe64c2d90ee853e
5313 Author: Robert Staudinger <robsta@gnome.org>
5314 Date: Mon Jun 1 18:54:46 2009 +0200
5316 [color] Add support for the "#rgba" color format
5318 clutter_color_from_string() only supported the "#rrggbbaa" format with
5319 alpha channel, this patch adds support for "#rgba".
5321 Colors in "#rrggbb" format were parsed manually, this is now left to
5322 the pango color parsing fallback, since that's handling it just fine.
5324 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
5326 clutter/clutter-color.c | 58 +++++++++++++++++++++++------------------------
5327 1 file changed, 28 insertions(+), 30 deletions(-)
5329 commit ffd5fb172b390f7fbdeadce3dda181a67a1e7916
5330 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5331 Date: Mon Jun 1 17:35:41 2009 +0100
5333 [docs] Rework the API reference version generation
5335 Clutter copies the gtk-doc from the usual gtk+ template, and
5336 has a version.xml.in containing only:
5340 Without a newline at the end. Unfortunately, it appears that
5341 autoconf has started adding a newline to the generated version.xml
5342 which then is used as the payload for the "version" XML entity.
5344 Instead of using a secondary file we can make configure generate
5345 the whole clutter-docs.xml and cogl-docs.xml files from a template;
5346 this way we also get the ability to substitute more autoconf variables
5347 into the documentation -- if needs be.
5351 doc/reference/clutter/Makefile.am | 2 -
5352 doc/reference/clutter/clutter-docs.xml | 245 -----------------------------
5353 doc/reference/clutter/clutter-docs.xml.in | 245 +++++++++++++++++++++++++++++
5354 doc/reference/clutter/version.xml.in | 1 -
5355 doc/reference/cogl/Makefile.am | 2 -
5356 doc/reference/cogl/cogl-docs.xml | 107 -------------
5357 doc/reference/cogl/cogl-docs.xml.in | 107 +++++++++++++
5358 doc/reference/cogl/version.xml.in | 1 -
5359 10 files changed, 356 insertions(+), 362 deletions(-)
5361 commit 61deeafa71a81384978bd199f0df6e88d0904a52
5362 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5363 Date: Mon Jun 1 16:31:32 2009 +0100
5365 [cogl-shader] Make get_info_log() slightly nicer
5367 The cogl_shader_get_info_log() function is very inconvenient for
5368 language bindings and for regular use, as it requires a static
5369 buffer to be filled -- basically just providing a wrapper around
5372 Since COGL aims to be a more convenient API than raw GL we should
5373 just make cogl_shader_get_info_log() return an allocated string
5374 with the GLSL compiler log.
5376 clutter/clutter-shader.c | 12 +++++++++---
5377 clutter/cogl/cogl-shader.h | 13 ++++++-------
5378 clutter/cogl/gl/cogl-shader.c | 15 ++++++++-------
5379 clutter/cogl/gles/cogl-shader.c | 15 ++++++++-------
5380 4 files changed, 31 insertions(+), 24 deletions(-)
5382 commit 5c26cc6ba7ab9b90bfe4aa2612a56c191c8b1204
5383 Author: Neil Roberts <neil@linux.intel.com>
5384 Date: Mon Jun 1 17:10:22 2009 +0100
5386 Use GL_QUADS for flushing a quad batch
5388 Instead of using GL_TRIANGLES and uploading the indices every time, it
5389 now uses GL_QUADS instead on OpenGL. Under GLES it still uses indices
5390 but it uses the new cogl_vertex_buffer_indices_get_for_quads function
5391 to avoid uploading the vertices every time.
5393 This requires the _cogl_vertex_buffer_indices_pointer_from_handle
5394 function to be exposed privately to the rest of Cogl.
5396 The static_indices array has been removed from the Cogl context.
5398 clutter/cogl/common/cogl-primitives.c | 79 +++++++---------------
5399 clutter/cogl/common/cogl-vertex-buffer-private.h | 4 ++
5400 clutter/cogl/gl/cogl-context.c | 3 -
5401 clutter/cogl/gl/cogl-context.h | 1 -
5402 clutter/cogl/gles/cogl-context.c | 3 -
5403 clutter/cogl/gles/cogl-context.h | 1 -
5404 6 files changed, 29 insertions(+), 62 deletions(-)
5406 commit 6cd1cb21cc0b629535994ad41e4fc78613fe0319
5407 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5408 Date: Mon Jun 1 15:51:59 2009 +0100
5410 [introspection] Remove Cogl symbols from Clutter GIR
5412 The GIR file for Clutter still contains symbols from COGL, even
5413 though we provide a Cogl GIR as well. The Clutter GIR should
5414 depend on the Cogl GIR instead.
5416 clutter/Makefile.am | 8 +-------
5417 1 file changed, 1 insertion(+), 7 deletions(-)
5419 commit 86230eb9fa134c3df50634e9196477c82d20a403
5420 Author: Marc-André Lureau <marcandre.lureau@gmail.com>
5421 Date: Sat May 30 23:58:03 2009 +0300
5423 build: don't double install clutter-version.h
5425 Automake 1.11 installs several files in one command, and it fails if
5426 the same file is installed two times.
5428 See NEWS for details:
5429 http://lists.gnu.org/archive/html/automake/2009-05/msg00093.html
5431 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
5433 clutter/Makefile.am | 1 -
5434 1 file changed, 1 deletion(-)
5436 commit 097400747e112d01cbd4ecb72401abcca41158f9
5437 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5438 Date: Mon Jun 1 12:51:23 2009 +0100
5440 [git ignore] Add report XML output file
5443 1 file changed, 1 insertion(+)
5445 commit c759aeb6a720043b8b74242d5e18da405be3825d
5446 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5447 Date: Sun May 31 15:15:46 2009 +0100
5449 Uniformly use floats in Actor properties
5451 All the underlying implementation and the public entry points have
5452 been switched to floats; the only missing bits are the Actor properties
5453 that deal with positioning and sizing.
5455 This usually means a major pain when dealing with GValues and varargs
5456 functions. While GValue will warn you when dealing with the wrong
5457 conversions, varags will simply die an horrible (and hard to debug)
5458 death via segfault. Nothing much to do here, except warn people in the
5459 release notes and hope for the best.
5461 clutter/clutter-actor.c | 353 ++++++++++++++----------
5462 clutter/clutter-interval.c | 12 +-
5463 tests/conform/Makefile.am | 3 +
5464 tests/conform/test-anchors.c | 145 +++++-----
5465 tests/conform/test-binding-pool.c | 18 +-
5466 tests/interactive/test-animation.c | 8 +-
5467 tests/interactive/test-clutter-cairo-flowers.c | 23 +-
5468 tests/interactive/test-cogl-multitexture.c | 2 +-
5469 tests/interactive/test-cogl-tex-polygon.c | 2 +-
5470 tests/interactive/test-cogl-tex-tile.c | 2 +-
5471 tests/interactive/test-easing.c | 4 +-
5472 tests/interactive/test-layout.c | 17 +-
5473 tests/interactive/test-multistage.c | 2 +-
5474 tests/interactive/test-paint-wrapper.c | 2 +-
5475 tests/interactive/test-rotate.c | 2 +-
5476 tests/interactive/test-shader.c | 3 +-
5477 16 files changed, 346 insertions(+), 252 deletions(-)
5479 commit bafa448666a73dd06b69b6167138c3c43e854482
5480 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5481 Date: Sun May 31 15:07:58 2009 +0100
5483 [texture] Increase verbosity of error messages
5485 The GError messages in set_from_rgb_data() and set_from_yuv_data()
5486 are a little bit too thin on details.
5488 clutter/clutter-texture.c | 15 ++++++++++++---
5489 1 file changed, 12 insertions(+), 3 deletions(-)
5491 commit 8b71fa1acbb8580e61ce30fd6a48a4bf0024ba97
5492 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5493 Date: Sun May 31 15:06:16 2009 +0100
5495 [docs] Remove misleading text
5497 The documentation for ClutterTexture's set_from_rgb_data() and
5498 set_from_yuv_data() says:
5500 Note: This function is likely to change in future versions.
5502 This is not true, since they'll remain for the whole 1.x API cycle.
5504 clutter/clutter-texture.c | 26 +++++++++++---------------
5505 1 file changed, 11 insertions(+), 15 deletions(-)
5507 commit 3b70e0b6b7a3c01c9e9d0c15f39b676877eee119
5508 Author: Neil Roberts <neil@linux.intel.com>
5509 Date: Fri May 29 11:52:21 2009 +0100
5511 [pango-display-list] Use the CoglAttributeType macros instead of GL_FLOAT
5513 Cogl now has an enum for the VBO attribute type so we should use that
5514 instead of the GL enums.
5516 clutter/pango/cogl-pango-display-list.c | 6 ++++--
5517 1 file changed, 4 insertions(+), 2 deletions(-)
5519 commit 97921a7d137bde2b73cfb2dabea89c14e30510a9
5520 Author: Neil Roberts <neil@linux.intel.com>
5521 Date: Fri May 29 11:38:03 2009 +0100
5523 [pango-display-list] Use indexed vertices on GLES
5525 Now that CoglVertexBuffers support indices we can use them with GLES
5526 to avoid duplicating vertices. Regular GL still uses GL_QUADS because
5527 it is shown to still have a performance benefit over indices with the
5530 clutter/pango/cogl-pango-display-list.c | 47 ++++++++++++++-----------------
5531 1 file changed, 21 insertions(+), 26 deletions(-)
5533 commit 67544f38d4dc93bd1be477656171681c5acf9721
5534 Author: Neil Roberts <neil@linux.intel.com>
5535 Date: Thu May 28 13:47:18 2009 +0100
5537 [cogl-vertex-buffer] Add cogl_vertex_buffer_indices_get_for_quads
5539 This function can be used as an efficient way of drawing groups of
5540 quads without using GL_QUADS. It generates a VBO containing the
5541 indices needed to render using pairs of GL_TRIANGLES. The VBO is
5542 globally cached so that it only needs to be uploaded whenever more
5543 indices are requested than ever before.
5545 clutter/cogl/cogl-vertex-buffer.h | 40 +++++++++++++++
5546 clutter/cogl/common/cogl-vertex-buffer.c | 80 ++++++++++++++++++++++++++++++
5547 clutter/cogl/gl/cogl-context.c | 9 ++++
5548 clutter/cogl/gl/cogl-context.h | 6 +++
5549 clutter/cogl/gles/cogl-context.c | 9 ++++
5550 clutter/cogl/gles/cogl-context.h | 7 ++-
5551 doc/reference/cogl/cogl-sections.txt | 1 +
5552 7 files changed, 151 insertions(+), 1 deletion(-)
5554 commit 4afe1e9a8b7822522e990989ad156df49bfc29e3
5555 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5556 Date: Fri May 29 17:53:19 2009 +0100
5558 [actor] Add allocate_available_size()
5560 The allocate_available_size() method is a convenience method in
5561 the same spirit as allocate_preferred_size(). While the latter
5562 will allocate the preferred size of an actor regardless of the
5563 available size provided by the actor's parent -- and thus it's
5564 suitable for simple fixed layout managers like ClutterGroup -- the
5565 former will take into account the available size provided by the
5566 parent and never allocate more than that; it is, thus, suitable
5567 for simple fluid layout managers.
5569 clutter/clutter-actor.c | 112 ++++++++++++++++++++++++++++
5570 clutter/clutter-actor.h | 6 ++
5571 doc/reference/clutter/clutter-sections.txt | 1 +
5572 3 files changed, 119 insertions(+)
5574 commit 293eeed507460ef6a9168264b04f119acf567eb7
5575 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5576 Date: Fri May 29 17:50:58 2009 +0100
5578 [build] Remove cogl-enum-types.h on distclean
5580 The cogl-enum-types.h file is created by glib-mkenums under
5581 /clutter/cogl/common, and then copied in /clutter/cogl in order
5582 to make the inclusion of that file work inside cogl.h.
5584 Since we're copying it in a different location, the Makefile
5585 for that location has to clean up the copy.
5587 clutter/cogl/Makefile.am | 4 ++++
5588 1 file changed, 4 insertions(+)
5590 commit 936f638a4234b0dd9f5122447bf09f8fcde1ac26
5591 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5592 Date: Fri May 29 17:10:27 2009 +0100
5594 [build] Fix dist issues
5596 * cogl-deprecated.h is not being installed
5598 * cogl-enum-types.c.in is not part of the dist
5600 clutter/cogl/Makefile.am | 1 +
5601 clutter/cogl/common/Makefile.am | 2 +-
5602 2 files changed, 2 insertions(+), 1 deletion(-)
5604 commit faec5c468ba77e61a3f724be49f031be65ef2011
5605 Author: Jonas Bonn <jonas@southpole.se>
5606 Date: Thu May 28 09:47:45 2009 +0200
5608 Freeze notifiers around property setters
5610 Notifications should be fired off from both the internal timeline and
5611 the wrapping animation here, so notifiers should be frozen around these
5614 Signed-off-by: Jonas Bonn <jonas@southpole.se>
5615 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
5617 clutter/clutter-animation.c | 8 ++++++++
5618 1 file changed, 8 insertions(+)
5620 commit 1187972e45b8c64ad25c2a243b0112bbde84e3e6
5621 Author: Jonas Bonn <jonas@southpole.se>
5622 Date: Thu May 28 09:40:09 2009 +0200
5624 [animation] Final cleanups to new Animation model
5626 Just a couple of final cleanups after the reimplementation of the
5629 i) _set_mode does not need to set the timeline on the alpha
5630 ii) freeze notifications around the setting of a new alpha
5632 Signed-off-by: Jonas Bonn <jonas@southpole.se>
5633 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
5635 clutter/clutter-animation.c | 11 ++++++-----
5636 1 file changed, 6 insertions(+), 5 deletions(-)
5638 commit c5e659d5922b406059c94545c1a5c773f61b2379
5639 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5640 Date: Fri May 29 14:52:49 2009 +0100
5642 [master clock] Use StageManager::peek_stages()
5644 Use the new StageManager::peek_stages() method to avoid a copy
5647 clutter/clutter-master-clock.c | 7 ++-----
5648 1 file changed, 2 insertions(+), 5 deletions(-)
5650 commit 5d4974ed365d9882945f211f1dadd067b4b2d8b1
5651 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5652 Date: Fri May 29 14:45:53 2009 +0100
5654 [stage manager] Add peek_stages()
5656 We need an method for StageManager that returns a const pointer
5657 to the internal list, to avoid the copy.
5659 clutter/clutter-stage-manager.c | 24 ++++++++++++++++++++++--
5660 clutter/clutter-stage-manager.h | 1 +
5661 2 files changed, 23 insertions(+), 2 deletions(-)
5663 commit 63c7cc0175461a08e5b1d3f3b78e37d581a03ffd
5664 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5665 Date: Fri May 29 14:25:19 2009 +0100
5667 [master clock] Handle Timeline::started signal correctly
5669 The "started" signal is sent first after the timeline has been set to the
5670 'running' state. For this reason, checking if the clock has any running
5671 timelines running will always return true in the "started" signal handler:
5672 the timeline that sent the signal is running.
5674 What needs to be checked in the signal handler is if there are any
5675 timelines running other than the one that emitted the ::started signal,
5676 which we know is running anyway.
5678 This prevents frames from being lost at the beginning of an animation when
5679 a timeline is started after a quiescent period.
5683 http://bugzilla.openedhand.com/show_bug.cgi?id=1617
5685 Signed-off-by: Jonas Bonn <jonas@southpole.se>
5686 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
5688 clutter/clutter-master-clock.c | 67 +++++++++++++++++++++++++++++++++++-----
5689 1 file changed, 60 insertions(+), 7 deletions(-)
5691 commit cbbc1a9ca36972ee0bf0612605c5176ce9b63b7f
5692 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5693 Date: Fri May 29 14:27:55 2009 +0100
5695 [build] Copy cogl-enum-types.h under the guard
5697 We avoid rebuilding cogl-enum-types.h and cogl-enum-types.c by
5698 using a "guard" -- a stamp file that will block Makefile. Since
5699 we need cogl-enum-types.h into /clutter/cogl as well for the
5700 cogl.h include to work, if we copy the cogl-enum-types.h
5701 unconditionally it will cause a rebuild of the whole COGL; which
5702 will cause a full rebuild.
5704 To solve this, we can copy the header file when generating it
5705 under the stamp file.
5707 clutter/cogl/common/Makefile.am | 4 ++--
5708 1 file changed, 2 insertions(+), 2 deletions(-)
5710 commit cfb95084651b0ea199eecef5993d7fc2da3586fa
5711 Author: Neil Roberts <neil@linux.intel.com>
5712 Date: Fri May 29 14:23:16 2009 +0100
5714 [configure] Always execute the AM_CONDITIONAL call for X11_TESTS
5716 Automake gets upset if an AM_CONDITIONAL call is itself conditionally
5719 configure.ac | 4 +++-
5720 1 file changed, 3 insertions(+), 1 deletion(-)
5722 commit e565c1f1dbfdb29fcaa7065d078f524c8432c12c
5723 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5724 Date: Fri May 29 12:50:48 2009 +0100
5726 [build] Encode the target into the backend library
5728 The libclutter-cogl internal object should be the only dependency
5729 for Clutter, since we are already copying it inside clutter/cogl
5730 for the introspection scanner. For this reason, the backend-specific,
5731 real internal object should be built with the backend encoded into
5732 the file name, like libclutter-common. This makes the build output
5733 a little bit more clear: instead of having two:
5735 LINK libclutter-cogl-common.la
5737 LINK libclutter-cogl.la
5738 LINK libclutter-cogl.la
5742 LINK libclutter-cogl-common.la
5744 LINK libclutter-cogl-gl.la
5745 LINK libclutter-cogl.la
5747 Same applies for the GLES backend.
5749 clutter/cogl/Makefile.am | 4 ++--
5750 clutter/cogl/gl/Makefile.am | 10 +++++-----
5751 clutter/cogl/gles/Makefile.am | 12 ++++++------
5752 3 files changed, 13 insertions(+), 13 deletions(-)
5754 commit b4861cbd21210b99294b93ea18bbfb4724a0aca6
5755 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5756 Date: Fri May 29 12:40:23 2009 +0100
5758 Use g_once when registering enumeration types
5760 Just like we do with GObject types and G_DEFINE_TYPE, we should
5761 use the g_once_init_enter/g_once_init_leave mechanism to make the
5762 GType registration of enumeration types thread safe.
5764 clutter/clutter-enum-types.c.in | 20 +++++++++++++++-----
5765 clutter/cogl/common/cogl-enum-types.c.in | 18 +++++++++++++-----
5766 2 files changed, 28 insertions(+), 10 deletions(-)
5768 commit 3248bb1b755ae23cfb1a2eabd7a72b803faa5a31
5769 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5770 Date: Fri May 29 12:31:47 2009 +0100
5772 [cogl] Generate enumeration GTypes
5774 COGL is starting to have more enumerations than I can handle
5775 by hand. Let's use glib-mkenums and be done with it.
5778 clutter/cogl/Makefile.am | 40 +++++---
5779 clutter/cogl/cogl-shader.h | 5 +-
5780 clutter/cogl/cogl-types.h | 83 +++-------------
5781 clutter/cogl/cogl.h.in | 11 ++-
5782 clutter/cogl/common/Makefile.am | 53 +++++++++-
5783 clutter/cogl/common/cogl-enum-types.c.in | 33 +++++++
5784 clutter/cogl/common/cogl-enum-types.h.in | 25 +++++
5785 clutter/cogl/common/cogl-util.c | 154 ------------------------------
5786 clutter/cogl/gl/Makefile.am | 5 -
5787 10 files changed, 161 insertions(+), 251 deletions(-)
5789 commit 7b75f93db1ad29ef4c81c20ee8434876d54aa358
5790 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5791 Date: Thu May 28 17:18:13 2009 +0100
5793 [docs] Fixes for the API reference
5795 * Add unused symbols
5797 * Document and sync argument names with their gtk-doc counterpart
5799 * Add missing descriptions
5801 clutter/clutter-actor.h | 4 ++++
5802 clutter/clutter-animation.c | 2 +-
5803 clutter/clutter-container.h | 5 ++++
5804 clutter/clutter-main.h | 2 +-
5805 clutter/clutter-texture.c | 2 +-
5806 clutter/cogl/cogl-material.h | 5 ++++
5807 clutter/cogl/cogl-shader.h | 14 ++++++++---
5808 clutter/cogl/cogl-vertex-buffer.h | 35 +++++++++++++++++-----------
5809 clutter/cogl/cogl.h.in | 4 ++++
5810 doc/reference/clutter/clutter-sections.txt | 7 ++++--
5811 doc/reference/cogl/cogl-sections.txt | 6 -----
5812 11 files changed, 59 insertions(+), 27 deletions(-)
5814 commit e51fbebd67e04182438c7f24d5db7b0f678c3f56
5815 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5816 Date: Thu May 28 17:18:10 2009 +0100
5818 [git ignore] Add blend strings test
5821 1 file changed, 1 insertion(+)
5823 commit 9557328e4ec61ed0c78c165135c8f4b216f26b7f
5824 Merge: 7252c14 d960ce4
5825 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5826 Date: Thu May 28 15:53:56 2009 +0100
5828 Merge branch 'master' into 1.0-integration
5831 [test-text-perf] Use queue_redraw instead of painting the stage directly
5832 [actor] In paint when opacity == 0, clear the queued_redraw flag
5834 commit d960ce46e5fe087bccae2aa9a023fa1a80b76e79
5835 Author: Neil Roberts <neil@linux.intel.com>
5836 Date: Thu May 28 15:27:09 2009 +0100
5838 [test-text-perf] Use queue_redraw instead of painting the stage directly
5840 If it doesn't queue a redraw and allow the backend to clear and swap
5841 the buffers then the results will be skewed because it is not
5842 predictable when the driver will actually render the scene.
5844 tests/micro-bench/test-text-perf.c | 16 +++++++++++-----
5845 1 file changed, 11 insertions(+), 5 deletions(-)
5847 commit 7252c141970eaa7c17214e9890b917221be70fd0
5848 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5849 Date: Thu May 28 13:03:19 2009 +0100
5851 [cogl] Make cogl_setup_viewport() a private function
5853 The setup_viewport() function should only be used by Clutter and
5854 not by application code.
5856 It can be emulated by changing the Stage size and perspective and
5857 requeueing a redraw after calling clutter_stage_ensure_viewport().
5859 clutter/clutter-main.c | 16 +++++++++-------
5860 clutter/clutter-texture.c | 10 +++++-----
5861 clutter/cogl/cogl.h.in | 10 ++++++----
5862 clutter/cogl/common/cogl.c | 16 ++++++++--------
5863 4 files changed, 28 insertions(+), 24 deletions(-)
5865 commit 32018584c0eda5bd29d4f3a773e7d243a740cbc4
5866 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5867 Date: Thu May 28 12:52:00 2009 +0100
5869 [cogl deprecated] Add backface culling deprecation
5871 The backface culling enabling function was split and renamed, just
5872 like the depth testing one, so we need to add the macro to the
5873 cogl-deprecated.h header.
5875 clutter/cogl/cogl-deprecated.h | 13 ++++++-------
5876 1 file changed, 6 insertions(+), 7 deletions(-)
5878 commit be826ed4e7b9e834da0055f4e5d253c22204b870
5879 Author: Robert Bragg <robert@linux.intel.com>
5880 Date: Thu May 28 12:49:29 2009 +0100
5882 [cogl vertex buffers] Give indices a CoglHandle so they are shareable
5884 Previously indices were tightly bound to a particular Cogl vertex buffer
5885 but we would like to be able to share indices so now we have
5886 cogl_vertex_buffer_indices_new () which returns a CoglHandle.
5888 In particular we could like to have a shared set of indices for drawing
5889 lists of quads that can be shared between the pango renderer and the
5892 clutter/cogl/cogl-vertex-buffer.h | 34 +++-----
5893 clutter/cogl/common/cogl-vertex-buffer-private.h | 7 +-
5894 clutter/cogl/common/cogl-vertex-buffer.c | 97 +++++-----------------
5895 tests/interactive/test-cogl-vertex-buffer.c | 16 ++--
5896 4 files changed, 46 insertions(+), 108 deletions(-)
5898 commit f0849fc3e25185e86464cadcc98a7bcdac1b0ab8
5899 Author: Robert Bragg <robert@linux.intel.com>
5900 Date: Thu May 28 02:03:16 2009 +0100
5902 [cogl journal] If we are only flushing one quad use a TRIANGLE_FAN
5904 At the moment Cogl doesn't do much batching of quads so most of the time we
5905 are flushing a single quad at a time. This patch simplifies how we submit
5906 those quads to OpenGL by using glDrawArrays with GL_TRIANGLE_FAN mode
5907 instead of sending indexed vertices using GL_TRIANGLES mode.
5909 Note: I hope to follow up soon with changes that improve our batching and
5910 also move the indices into a VBO so they don't need to be re-validated every
5911 time we call glDrawElements.
5913 clutter/cogl/common/cogl-primitives.c | 80 +++++++++++++++++++--------------
5914 1 file changed, 46 insertions(+), 34 deletions(-)
5916 commit 57cb20dc0685889b5eaa89d409a47d67d15450fb
5917 Author: Robert Bragg <robert@linux.intel.com>
5918 Date: Tue May 26 18:25:00 2009 +0100
5920 [deprecated defines] Adds some missing cogl_texture_* deprecated defines
5922 To assist people porting code from 0.8, the cogl_texture_* functions that
5923 have been replaced now have defines that give some hint as to how they
5926 clutter/cogl/cogl-deprecated.h | 8 ++++++++
5927 1 file changed, 8 insertions(+)
5929 commit 605243d95285ad57cf55dc7674884f3ed4b09524
5930 Author: Robert Bragg <robert@linux.intel.com>
5931 Date: Tue May 26 16:55:11 2009 +0100
5933 [cogl] renamed cogl_enable_* to cogl_set_*_enabled + added getters
5935 cogl_enable_depth_test and cogl_enable_backface_culling have been renamed
5936 and now have corresponding getters, the new functions are:
5937 cogl_set_depth_test_enabled
5938 cogl_get_depth_test_enabled
5939 cogl_set_backface_culling_enabled
5940 cogl_get_backface_culling_enabled
5943 clutter/cogl/cogl-deprecated.h | 1 +
5944 clutter/cogl/cogl.h.in | 27 +++++++++++++++++++++++----
5945 clutter/cogl/common/cogl.c | 25 +++++++++++++++++--------
5946 doc/reference/cogl/cogl-sections.txt | 6 ++++--
5947 tests/conform/test-backface-culling.c | 4 ++--
5948 6 files changed, 50 insertions(+), 16 deletions(-)
5950 commit 96188bab621d4a342d67a1e0a85dd1dcb3bdee68
5951 Author: Robert Bragg <robert@linux.intel.com>
5952 Date: Tue May 26 11:33:54 2009 +0100
5954 [cogl matrix] Support ortho and perspective projections.
5956 This adds cogl_matrix api for multiplying matrices either by a perspective
5957 or ortho projective transform. The internal matrix stack and current-matrix
5958 APIs also have corresponding support added.
5961 cogl_matrix_perspective
5964 cogl_set_modelview_matrix
5965 cogl_set_projection_matrix
5967 clutter/cogl/cogl-matrix.h | 70 ++++++++--
5968 clutter/cogl/cogl.h.in | 39 ++++++
5969 clutter/cogl/common/cogl-current-matrix.c | 215 +++++++++++++++++------------
5970 clutter/cogl/common/cogl-matrix-stack.c | 68 ++++++---
5971 clutter/cogl/common/cogl-matrix-stack.h | 20 ++-
5972 clutter/cogl/common/cogl-matrix.c | 87 ++++++++++--
5973 doc/reference/cogl/cogl-sections.txt | 19 +--
5974 7 files changed, 370 insertions(+), 148 deletions(-)
5976 commit 12c8ff8606c2fb6212e59c50842e04b634f7c4b2
5977 Author: Robert Bragg <robert@linux.intel.com>
5978 Date: Tue May 26 15:41:53 2009 +0100
5980 [cogl] Remove cogl_{create,destroy}_context from the public API
5982 cogl_create_context is dealt with internally when _cogl_get_default context
5983 is called, and cogl_destroy_context is currently never called.
5985 It might be nicer later to get an object back when creating a context so
5986 Cogl can support multiple contexts, so these functions are being removed
5987 from the API until we get a chance to address context management properly.
5989 For now cogl_destroy_context is still exported as _cogl_destroy_context so
5990 Clutter could at least install a library deinit handler to call it.
5992 clutter/cogl/cogl.h.in | 28 ++++++++++++----------------
5993 clutter/cogl/gl/cogl-context.c | 4 ++--
5994 clutter/cogl/gles/cogl-context.c | 4 ++--
5995 doc/reference/cogl/cogl-sections.txt | 3 ---
5996 4 files changed, 16 insertions(+), 23 deletions(-)
5998 commit 59bd824404c34b20defb2e8e76335185e714efc7
5999 Author: Robert Bragg <robert@linux.intel.com>
6000 Date: Tue May 26 16:27:36 2009 +0100
6002 [vbo indices] tweak add_indices api to return an id and add delete_indices api
6004 Originally cogl_vertex_buffer_add_indices let the user pass in their own unique
6005 ID for the indices; now the Id is generated internally and returned to the
6008 clutter/cogl/cogl-vertex-buffer.h | 30 +++++++++++-----
6009 clutter/cogl/common/cogl-vertex-buffer.c | 52 +++++++++++++++++----------
6010 doc/reference/cogl/cogl-sections.txt | 1 +
6011 tests/interactive/test-cogl-vertex-buffer.c | 19 +++++-----
6012 4 files changed, 67 insertions(+), 35 deletions(-)
6014 commit d51faed66095259f17467dceba0cc0cd02dcd042
6015 Author: Robert Bragg <robert@linux.intel.com>
6016 Date: Sun May 24 11:33:29 2009 +0100
6018 [cogl-vertex-buffer] Seal GL types from the public API
6020 We now have CoglAttributeType and CoglVerticesMode typedefs to replace the
6021 use of GLenum in the public API.
6023 clutter/cogl/cogl-vertex-buffer.h | 118 ++++++++++++++++-----------
6024 clutter/cogl/common/cogl-vertex-buffer.c | 48 +++++------
6025 tests/interactive/test-cogl-vertex-buffer.c | 6 +-
6026 3 files changed, 96 insertions(+), 76 deletions(-)
6028 commit 6bb66866660018e90c2c1663e02fca3f0b818050
6029 Author: Robert Bragg <robert@linux.intel.com>
6030 Date: Sun May 24 04:04:38 2009 +0100
6032 [cogl-vertex-buffers] Support putting index arrays into VBOS
6034 It's now possible to add arrays of indices to a Cogl vertex buffer and
6035 they will be put into an OpenGL vertex buffer object. Since it's quite
6036 common for index arrays to be static it saves the OpenGL driver from
6037 having to validate them repeatedly.
6039 This changes the cogl_vertex_buffer_draw_elements API: It's no longer
6040 possible to provide a pointer to an index array at draw time. So
6041 cogl_vertex_buffer_draw_elements now takes an indices identifier that
6042 should correspond to an idendifier returned when calling
6043 cogl_vertex_buffer_add_indices ()
6045 clutter/cogl/cogl-vertex-buffer.h | 79 ++++++++---
6046 clutter/cogl/common/cogl-vertex-buffer-private.h | 33 +++--
6047 clutter/cogl/common/cogl-vertex-buffer.c | 159 ++++++++++++++++++++--
6048 doc/reference/cogl/cogl-sections.txt | 2 +
6049 tests/interactive/test-cogl-vertex-buffer.c | 17 ++-
6050 5 files changed, 243 insertions(+), 47 deletions(-)
6052 commit 68214fe4b88603c73a77d5cc543f8688a0bde82c
6053 Author: Robert Bragg <robert@linux.intel.com>
6054 Date: Sat May 23 17:52:18 2009 +0100
6056 [cogl] Remove cogl_flush_gl_state from the API
6058 This is being removed before we release Clutter 1.0 since the implementation
6059 wasn't complete, and so we assume no one is using this yet. Util we have
6060 someone with a good usecase, we can't pretend to support breaking out into
6063 clutter/cogl/cogl.h.in | 8 +++++++-
6064 clutter/cogl/common/cogl.c | 2 ++
6065 2 files changed, 9 insertions(+), 1 deletion(-)
6067 commit f322da3794f6556648566ebcf6b83f59f88e7a5b
6068 Author: Robert Bragg <robert@linux.intel.com>
6069 Date: Sat May 23 17:42:10 2009 +0100
6071 [material] Reduce the material API in preperation for releasing Clutter 1.0
6073 There were a number of functions intended to support creating of new
6074 primitives using materials, but at this point they aren't used outside of
6075 Cogl so until someone has a usecase and we can get feedback on this
6076 API, it's being removed before we release Clutter 1.0.
6078 clutter/cogl/cogl-material.h | 129 ++++-----------------------
6079 clutter/cogl/common/cogl-handle.h | 17 ++--
6080 clutter/cogl/common/cogl-material-private.h | 86 ++++++++++++++++++
6081 clutter/cogl/common/cogl-material.c | 6 +-
6082 clutter/cogl/common/cogl-primitives.c | 50 +++++------
6083 clutter/cogl/common/cogl-vertex-buffer.c | 15 ++--
6084 clutter/cogl/common/cogl.c | 3 +-
6085 clutter/cogl/gl/cogl-context.c | 4 +-
6086 clutter/cogl/gl/cogl-primitives.c | 15 ++--
6087 clutter/cogl/gles/cogl-context.c | 4 +-
6088 clutter/cogl/gles/cogl-primitives.c | 15 ++--
6089 doc/reference/cogl/cogl-sections.txt | 3 +
6090 12 files changed, 174 insertions(+), 173 deletions(-)
6092 commit f28d5e481b7e01b241618a10e7fde834de3ac2b2
6093 Author: Robert Bragg <robert@linux.intel.com>
6094 Date: Sat May 23 16:23:00 2009 +0100
6096 [cogl-material] Removes all the API made redundant by the blend strings API
6098 This removes the following API:
6099 cogl_material_set_blend_factors
6100 cogl_material_set_layer_combine_function
6101 cogl_material_set_layer_combine_arg_src
6102 cogl_material_set_layer_combine_arg_op
6104 These were rather awkward to use, so since it's expected very few people are
6105 using them at this point and it should be straight forward to switch over
6106 to blend strings, the API is being removed before we release Clutter 1.0.
6108 clutter/cogl/cogl-material.h | 293 ---------------------------
6109 clutter/cogl/common/cogl-material-private.h | 20 +-
6110 clutter/cogl/common/cogl-material.c | 176 +++-------------
6111 clutter/pango/cogl-pango-render.c | 22 +-
6112 doc/reference/cogl/cogl-sections.txt | 11 -
6113 5 files changed, 38 insertions(+), 484 deletions(-)
6115 commit 33994caa71fea904a80971a15216e6d7fa48712c
6116 Author: Robert Bragg <robert@linux.intel.com>
6117 Date: Mon May 11 00:40:41 2009 +0100
6119 [cogl-material] Support string based blending and layer combine descriptions
6121 Setting up layer combine functions and blend modes is very awkward to do
6122 programatically. This adds a parser for string based descriptions which are
6123 more consise and readable.
6125 E.g. a material layer combine function could now be given as:
6126 "RGBA = ADD (TEXTURE[A], PREVIOUS[RGB])"
6128 "RGB = REPLACE (PREVIOUS)"
6129 "A = MODULATE (PREVIOUS, TEXTURE)"
6131 The simple syntax and grammar are only designed to expose standard fixed
6132 function hardware, more advanced combining must be done with shaders.
6134 This includes standalone documentation of blend strings covering the aspects
6135 that are common to blending and texture combining, and adds documentation
6136 with examples specific to the new cogl_material_set_blend() and
6137 cogl_material_layer_set_combine() functions.
6139 Note: The hope is to remove the now redundant bits of the material API
6142 clutter/cogl/cogl-debug.h | 20 +-
6143 clutter/cogl/cogl-material.h | 244 ++++++-
6144 clutter/cogl/common/Makefile.am | 2 +
6145 clutter/cogl/common/cogl-blend-string.c | 999 +++++++++++++++++++++++++++
6146 clutter/cogl/common/cogl-blend-string.h | 151 ++++
6147 clutter/cogl/common/cogl-debug.c | 3 +-
6148 clutter/cogl/common/cogl-material-private.h | 13 +-
6149 clutter/cogl/common/cogl-material.c | 406 ++++++++++-
6150 clutter/cogl/gl/cogl-context.c | 3 +
6151 clutter/cogl/gl/cogl-context.h | 3 +
6152 clutter/cogl/gl/cogl-defines.h.in | 12 +
6153 clutter/cogl/gl/cogl.c | 10 +
6154 clutter/cogl/gles/cogl-gles2-wrapper.c | 9 +-
6155 clutter/cogl/gles/cogl-gles2-wrapper.h | 5 +-
6156 clutter/cogl/gles/cogl-texture.c | 49 +-
6157 doc/reference/cogl/Makefile.am | 9 +-
6158 doc/reference/cogl/blend-strings.xml | 130 ++++
6159 doc/reference/cogl/cogl-docs.xml | 1 +
6160 doc/reference/cogl/cogl-sections.txt | 4 +
6161 tests/conform/Makefile.am | 3 +-
6162 tests/conform/test-blend-strings.c | 410 +++++++++++
6163 tests/conform/test-conform-main.c | 2 +
6164 22 files changed, 2404 insertions(+), 84 deletions(-)
6166 commit ef1a771fde77e29b8bf327905674da59ea3d0bf0
6167 Author: Robert Bragg <robert@linux.intel.com>
6168 Date: Wed May 27 23:39:18 2009 +0100
6170 [build] Fixes some compiler warnings when building for GLES 2
6172 There were a number of variables shadowing other symbols, and an unused
6175 clutter/cogl/gles/cogl-gles2-wrapper.c | 20 +++++++++---------
6176 clutter/cogl/gles/cogl-primitives.c | 36 ++++++++++++++++----------------
6177 tests/conform/test-conform-main.c | 3 +--
6178 3 files changed, 29 insertions(+), 30 deletions(-)
6180 commit ccd3b4c8863a2a0568d903b4b0273ad05cc17c39
6181 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6182 Date: Wed May 27 18:28:37 2009 +0100
6184 [animation] Simplify the Animation code
6186 After long deliberation, the Animation class handling of the
6187 :mode, :duration and :loop properties, as well as the conditions
6188 for creating the Alpha and Timeline instances, came out as far too
6189 complicated for their own good.
6191 This is a rework of the API/parameters matrix and behaviour:
6193 - :mode accessors will create an Alpha, if needed
6194 - :duration and :loop accessors will create an Alpha and a Timeline
6196 - :alpha will set or unset the Alpha
6197 - :timeline will set or unset the Timeline
6199 Plus, more documentation on the Animation class itself.
6201 Many thanks to Jonas Bonn <jonas@southpole.se> for the feedback
6204 clutter/clutter-animation.c | 420 ++++++++++++++++++-------------------------
6205 1 file changed, 174 insertions(+), 246 deletions(-)
6207 commit 6fff1bcdc6cd90bfc75eff765c7512545fedded9
6208 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6209 Date: Wed May 27 13:01:31 2009 +0100
6211 [animatable] Allow validation in ::animate_property
6213 The Animatable interface implementation will always have the computed
6214 value applied, whilst the non-Animatable objects go through the
6215 interval validation first to avoid incurring in assertions and
6218 The Animatable::animate_property() should also be able to validate the
6219 property it's supposed to interpolate, and eventually discard it. This
6220 requires adding a return value to the virtual function (and its wrapper
6223 The Animation code will then apply the computed value only if the
6224 animate_property() returns TRUE -- unifying the code path with the
6225 non-Animatable objects.
6227 clutter/clutter-animatable.c | 43 +++++++++++++++++++++++++-----------------
6228 clutter/clutter-animatable.h | 28 +++++++++++++--------------
6229 clutter/clutter-animation.c | 21 ++++++++++++---------
6230 3 files changed, 52 insertions(+), 40 deletions(-)
6232 commit 7edaf8ece8af8c1f9bf7dd25263ec16dee5adf69
6233 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6234 Date: Wed May 27 12:12:11 2009 +0100
6236 [animation] Proxy properties whenever possible
6238 The Animation class should proxy the :mode, :duration and :loop
6239 properties whenever possible, to avoid them going out of sync when
6240 changed using the Alpha and Timeline instances directly.
6242 Currently, if Timeline:duration is changed, querying Animation:duration
6243 will yield the old value, but the animation itself (being driven by
6244 the Timeline) will use the Timeline's :duration new value. This holds
6245 for the :loop and :mode properties as well.
6247 Instead, the getters for the Animation's :duration, :loop and
6248 :mode properties should ask the relevant object -- if any. The
6249 loop, duration and mode values inside AnimationPrivate should only
6250 be used if no Timeline or no Alpha instances are available, or
6251 when creating new instances.
6253 clutter/clutter-animation.c | 60 +++++++++++++++++++++++++++++++++----------
6254 1 file changed, 46 insertions(+), 14 deletions(-)
6256 commit 1f44c3584c9040a6745f052ad7ce7ffd9dc399a9
6257 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6258 Date: Wed May 27 11:52:40 2009 +0100
6260 [animation] Defer the timeline handling to the Alpha
6262 The Animation should not directly manipulate a Timeline instance,
6263 but it should defer to the Alpha all handling of the timeline.
6267 - set_duration() and set_loop() will either create a Timeline or
6268 will set the :duration and :loop properties on the Timeline; if
6269 the Timeline must be created, and no Alpha instance is available,
6270 then a new Alpha instance will be created as well and the newly
6271 create Timeline will be assigned to the Alpha
6273 - if set_mode() on an Animation instance without an Alpha, the
6274 Alpha will be created; a Timeline will also be created
6276 - set_alpha() will replace the Alpha; if the new Alpha does not
6277 have a Timeline associated then a Timeline will be created using
6278 the current :duration and :loop properties of Animation; otherwise,
6279 if the replaced Alpha had a timeline, the timeline will be
6280 transferred to the new one
6282 clutter/clutter-animation.c | 342 +++++++++++++++++++++++++++++--------------
6283 1 file changed, 231 insertions(+), 111 deletions(-)
6285 commit 331d43196da1a76fe5abe138639674b0cb9fbd47
6286 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6287 Date: Tue May 26 17:23:24 2009 +0100
6289 [build] Decouple COGL debug level from Clutter's
6291 Using --enable-debug, which controls Clutter's debug level, also
6292 defines COGL_ENABLE_DEBUG. This should be left to --enable-cogl-debug
6293 instead, since it's the configure switch that controls COGL debug
6296 configure.ac | 16 ++++++++--------
6297 1 file changed, 8 insertions(+), 8 deletions(-)
6299 commit 387ab4c142c8c3b4708e08be540b279fcda8ffd8
6300 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6301 Date: Mon May 25 17:16:44 2009 +0100
6305 Long overdue update of the DOAP file for Clutter
6311 clutter.doap | 61 ++++++++++++++++++++++++++++++++++++++++++----------------
6312 1 file changed, 44 insertions(+), 17 deletions(-)
6314 commit 733508b80d30a0946061c55e599f1348ea895140
6315 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6316 Date: Mon May 25 16:52:53 2009 +0100
6318 [build] More spring clean fixes
6320 * Remove the last if...fi with AS_IF
6322 * Put back the regexp for the mingw32 check that commit 0d1c626a
6323 inadvertedly removed
6325 configure.ac | 55 +++++++++++++++++++++++++++++++------------------------
6326 1 file changed, 31 insertions(+), 24 deletions(-)
6328 commit 0d1c626a86fdec432d5bb7ca78aec76ec1fecf7e
6329 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6330 Date: Mon May 25 14:04:53 2009 +0100
6332 [build] Spring cleanup of configure.ac
6334 Let's try to bring configure.ac into this century, shall we?
6336 * Use the proper shell macros AS_IF and AS_CASE instead of if...fi
6339 * Check for X11 and relative extensions only when building for GLX
6342 * Add documentation on the behaviour of binary_age and interface_age
6344 * Coalesce all the common checks to avoid redundancy
6346 * Escape everything that requires escaping
6348 configure.ac | 1057 +++++++++++++++++++++++++++++-----------------------------
6349 1 file changed, 534 insertions(+), 523 deletions(-)
6351 commit b05d4be19d07a834120bac6bbeacca31daae51b9
6352 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6353 Date: Mon May 25 12:42:17 2009 +0100
6355 Use GLib variant of strcasecmp()
6357 The GLib version of strcasecmp() ignores any non-ASCII character,
6358 unlike the original which is locale-dependent.
6360 clutter/glx/clutter-backend-glx.c | 2 +-
6361 clutter/glx/clutter-glx-texture-pixmap.c | 4 ++--
6362 2 files changed, 3 insertions(+), 3 deletions(-)
6364 commit ec374c7ab9d5b98230a90a4be7b8ca6f5337f2b8
6365 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6366 Date: Mon May 25 12:41:16 2009 +0100
6368 [build] Clean up cogl-pango Makefile
6370 clutter/pango/Makefile.am | 26 +++++++++++++-------------
6371 1 file changed, 13 insertions(+), 13 deletions(-)
6373 commit 71498a6376f3c45e6fec228251ec11b9c2dc4cd1
6374 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6375 Date: Sat May 23 19:18:18 2009 +0100
6377 [cogl] Remove max_waste argument from Texture ctors
6379 The CoglTexture constructors expose the "max-waste" argument for
6380 controlling the maximum amount of wasted areas for slicing or,
6381 if set to -1, disables slicing.
6383 Slicing is really relevant only for large images that are never
6384 repeated, so it's a useful feature only in controlled use cases.
6385 Specifying the amount of wasted area is, on the other hand, just
6386 a way to mess up this feature; 99% the times, you either pull this
6387 number out of thin air, hoping it's right, or you try to do the
6388 right thing and you choose the wrong number anyway.
6390 Instead, we can use the CoglTextureFlags to control whether the
6391 texture should not be sliced (useful for Clutter-GST and for the
6392 texture-from-pixmap actors) and provide a reasonable value for
6393 enabling the slicing ourself. At some point, we might even
6394 provide a way to change the default at compile time or at run time,
6395 for particular platforms.
6397 Since max_waste is gone, the :tile-waste property of ClutterTexture
6398 becomes read-only, and it proxies the cogl_texture_get_max_waste()
6401 Inside Clutter, the only cases where the max_waste argument was
6402 not set to -1 are in the Pango glyph cache (which is a POT texture
6403 anyway) and inside the test cases where we want to force slicing;
6404 for the latter we can create larger textures that will be bigger than
6405 the threshold we set.
6407 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
6408 Signed-off-by: Robert Bragg <robert@linux.intel.com>
6409 Signed-off-by: Neil Roberts <neil@linux.intel.com>
6411 clutter/clutter-texture.c | 116 +++++++------------------
6412 clutter/clutter-texture.h | 4 +-
6413 clutter/cogl/cogl-texture.h | 34 +++-----
6414 clutter/cogl/cogl-types.h | 4 +-
6415 clutter/cogl/common/cogl-util.c | 1 +
6416 clutter/cogl/gl/cogl-context.c | 6 +-
6417 clutter/cogl/gl/cogl-texture.c | 81 ++++++++---------
6418 clutter/cogl/gles/cogl-context.c | 6 +-
6419 clutter/cogl/gles/cogl-texture.c | 60 +++++++------
6420 clutter/glx/clutter-glx-texture-pixmap.c | 2 +-
6421 clutter/pango/cogl-pango-glyph-cache.c | 2 +-
6422 tests/conform/test-backface-culling.c | 36 ++++----
6423 tests/conform/test-npot-texture.c | 28 +++---
6424 tests/conform/test-vertex-buffer-contiguous.c | 3 +-
6425 tests/interactive/test-clip.c | 2 +-
6426 tests/interactive/test-cogl-multitexture.c | 18 ++--
6427 tests/interactive/test-cogl-offscreen.c | 4 +-
6428 tests/interactive/test-cogl-tex-convert.c | 8 +-
6429 tests/interactive/test-cogl-tex-getset.c | 4 +-
6430 tests/interactive/test-cogl-tex-polygon.c | 6 +-
6431 tests/interactive/test-cogl-tex-tile.c | 2 +-
6432 21 files changed, 191 insertions(+), 236 deletions(-)
6434 commit 87465355d3415a28fc6b3e4f62611cc3192516d8
6435 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6436 Date: Mon Mar 30 13:49:03 2009 +0100
6438 Add repaint functions
6440 Sometimes it is necessary for third party code to have a
6441 function called during the redraw process, so that you can
6442 update the scenegraph before it is painted.
6444 clutter/clutter-main.c | 159 +++++++++++++++++++++++++++++++++++++++++++++
6445 clutter/clutter-main.h | 62 +++++++++---------
6446 clutter/clutter-private.h | 4 ++
6447 clutter/clutter-stage.c | 9 ++-
6448 4 files changed, 203 insertions(+), 31 deletions(-)
6450 commit 5cde6a598f7b846615b817002389fcae954f612a
6451 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6452 Date: Sat May 23 19:32:24 2009 +0100
6454 [git ignore] Add test-text-perf
6457 1 file changed, 1 insertion(+), 1 deletion(-)
6459 commit 654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673
6460 Author: Neil Roberts <neil@linux.intel.com>
6461 Date: Fri May 22 14:49:37 2009 +0100
6463 [actor] In paint when opacity == 0, clear the queued_redraw flag
6465 If we are short-circuiting the paint when the opacity is zero we still
6466 need to clear the queued_redraw flag otherwise it won't be possible to
6467 queue another redraw of the actor until something else has caused a
6470 clutter/clutter-actor.c | 5 ++++-
6471 1 file changed, 4 insertions(+), 1 deletion(-)
6473 commit c262ab0b638eba97e8a152ca5c76360d0f4bf348
6474 Merge: 309f680 b3fe1b8
6475 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6476 Date: Fri May 22 12:00:33 2009 +0100
6478 Merge branch 'master' into 1.0-integration
6481 [cogl-vertex-buffer] Ensure the clip state before rendering
6482 [test-text-perf] Small fix-ups
6483 Add a test for text performance
6484 [build] Ensure that cogl-debug is disabled by default
6485 [build] The cogl GE macro wasn't passing an int according to the format string
6486 Use the right internal format for GL_ARB_texture_rectangle
6487 [actor_paint] Ensure painting is a NOP for actors with opacity = 0
6488 Make backface culling work with vertex buffers
6490 commit b3fe1b8a8a663fc8ac5e2388c7dbc7aa20929bce
6491 Author: Neil Roberts <neil@linux.intel.com>
6492 Date: Fri May 22 11:41:02 2009 +0100
6494 [cogl-vertex-buffer] Ensure the clip state before rendering
6496 Before any rendering is done by Cogl it needs to ensure the clip stack
6497 is set up correctly by calling cogl_clip_ensure. This was not being
6498 done for the Cogl vertex buffer so it would still use the clip from
6499 the previous render.
6501 clutter/cogl/common/cogl-vertex-buffer.c | 4 ++++
6502 1 file changed, 4 insertions(+)
6504 commit 309f680d323f25a83f0a529e499f84f301708e79
6505 Author: Damien Lespiau <damien.lespiau@intel.com>
6506 Date: Fri May 22 01:23:29 2009 +0100
6508 [texture] size-change closure is now VOID:FLOAT,FLOAT
6510 Now that everything is float, the marsharlling function of the
6511 size-change signal should reflect that fact.
6513 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
6515 clutter/clutter-marshal.list | 1 +
6516 clutter/clutter-texture.c | 4 ++--
6517 2 files changed, 3 insertions(+), 2 deletions(-)
6519 commit a1b0160da7b72a92178d58c514d3988b2761a688
6520 Author: Neil Roberts <neil@linux.intel.com>
6521 Date: Thu May 21 17:43:41 2009 +0100
6523 [test-text-perf] Small fix-ups
6525 - Fix a typo in a for loop in create_label which left 'i'
6526 uninitialised and caused a crash if you're unlucky.
6528 - Set the CLUTTER_VBLANK=none environment variable.
6530 - Don't quit on a keypress.
6532 - Trailing whitespace tidy up.
6534 tests/micro-bench/test-text-perf.c | 19 +++++++++----------
6535 1 file changed, 9 insertions(+), 10 deletions(-)
6537 commit 8724a16452eb4cb577ba6a7763a8491e2935f9a5
6538 Author: Owen W. Taylor <otaylor@fishsoup.net>
6539 Date: Sat Nov 22 19:26:56 2008 -0500
6541 Add a test for text performance
6543 Add tests/test-text-perf, which allows testing text performance as
6544 a function of the length of text strings and font size.
6546 tests/micro-bench/Makefile.am | 4 +-
6547 tests/micro-bench/test-text-perf.c | 123 ++++++++++++++++++++++++++++++++++++
6548 2 files changed, 126 insertions(+), 1 deletion(-)
6550 commit d513c1c5403e9f92178d3ed7202d78b0db6efe67
6551 Merge: 1985fa7 7e18109
6552 Author: Neil Roberts <neil@linux.intel.com>
6553 Date: Thu May 21 16:51:16 2009 +0100
6555 Merge branch 'pango-vbo' into 1.0-integration
6557 This makes it cache the geometry of PangoLayouts into a VBO as
6558 described in bug #1572.
6560 commit 7e18109f9bec0afba900534a9c96035ae1f32dd7
6561 Author: Neil Roberts <neil@linux.intel.com>
6562 Date: Thu May 21 15:49:14 2009 +0100
6564 [cogl-pango-display-list] Use GL_TRIANGLES under GLES
6566 GLES doesn't support GL_QUADS. This patch makes it use GL_TRIANGLES
6567 instead in that case. Unfortunately this means submitting two extra
6568 vertices per quad. It could be better to use indexed elements once
6569 CoglVertexBuffers gains support for that.
6571 clutter/pango/cogl-pango-display-list.c | 28 +++++++++++++++++++++++++++-
6572 1 file changed, 27 insertions(+), 1 deletion(-)
6574 commit 78a4f1de0d934b83d5ed30d33ac992f32c1b71c6
6575 Author: Robert Bragg <robert@linux.intel.com>
6576 Date: Thu May 21 15:25:31 2009 +0100
6578 [build] Ensure that cogl-debug is disabled by default
6580 The new cogl-debug option was accidentally being enabled by default since
6581 configure.ac checked the 'default_enable' variable not 'cogl_default_enable'
6584 1 file changed, 1 insertion(+), 1 deletion(-)
6586 commit 14c3ef1f8dab9390cbdb078ef4663b5ea88a78ce
6587 Author: Robert Bragg <robert@linux.intel.com>
6588 Date: Thu May 21 15:04:38 2009 +0100
6590 [build] The cogl GE macro wasn't passing an int according to the format string
6592 This patch simply updates the arguments passed to g_warning inline with the
6593 given format string.
6595 clutter/cogl/common/cogl-internal.h | 1 +
6596 1 file changed, 1 insertion(+)
6598 commit 5481681e5c74a8eb994935e5a14d08cc4372a791
6599 Author: Owen W. Taylor <otaylor@fishsoup.net>
6600 Date: Wed May 6 23:35:01 2009 -0400
6602 Use the right internal format for GL_ARB_texture_rectangle
6604 When ClutterGLXTexturePixmap uses GL_ARB_texture_rectangle,
6605 it needs to pass the right internal format (GL_RGB or GL_RGBA)
6606 when it initializes the texture with glTexImage2D() or later
6607 handling won't recognize the alpha channel.
6609 http://bugzilla.openedhand.com/show_bug.cgi?id=1586
6611 Signed-off-by: Robert Bragg <robert@linux.intel.com>
6613 clutter/glx/clutter-glx-texture-pixmap.c | 7 +++++--
6614 1 file changed, 5 insertions(+), 2 deletions(-)
6616 commit 2c6719502a1e22f4e910ef3514ba5bdf8b1f0c83
6617 Author: Robert Bragg <robert@linux.intel.com>
6618 Date: Wed May 20 17:55:29 2009 +0100
6620 [actor_paint] Ensure painting is a NOP for actors with opacity = 0
6622 Since it is convenient to use geometry with an opacity of 0 for input only
6623 purposes it's a worthwhile optimization to avoid submitting anything
6624 for such actors while painting.
6626 clutter/clutter-actor.c | 11 ++++++++++-
6627 1 file changed, 10 insertions(+), 1 deletion(-)
6629 commit f13c3ee3095ecb1c2ab6b8efbe25362967bc513e
6630 Author: Neil Roberts <neil@linux.intel.com>
6631 Date: Thu May 21 14:56:38 2009 +0100
6633 Make backface culling work with vertex buffers
6635 Backface culling is enabled as part of cogl_enable so the different
6636 rendering functions in Cogl need to explicitly opt-in to have backface
6637 culling enabled. Cogl vertex buffers should allow backface culling so
6638 they should check whether it is enabled and then set the appropriate
6641 clutter/cogl/cogl.h.in | 6 +++---
6642 clutter/cogl/common/cogl-vertex-buffer.c | 3 +++
6643 2 files changed, 6 insertions(+), 3 deletions(-)
6645 commit 3fc64dfaa799828c3e0743df60de4255dac58d60
6646 Author: Neil Roberts <neil@linux.intel.com>
6647 Date: Thu May 21 12:17:12 2009 +0100
6649 [pango-render] Keep a reference to the first line to detect layout changes
6651 In order to cope with the situation where an application renders with
6652 a PangoLayout, makes some changes and then renders again with the same
6653 layout, CoglPangoRenderer needs to detect that the changes have
6654 occured so that it can recreate the display list. This is acheived by
6655 keeping a reference to the first line of the layout. When the layout
6656 is changed Pango will clear the layout pointer in the first line and
6657 create a new line. So if the layout pointer in the line becomes NULL
6658 then we know the layout has changed. This trick was suggested by
6659 Behdad Esfahbod in this email:
6661 http://mail.gnome.org/archives/gtk-i18n-list/2009-May/msg00019.html
6663 clutter/pango/cogl-pango-render.c | 81 ++++++++++++++++++++++++++++++-------
6664 1 file changed, 67 insertions(+), 14 deletions(-)
6666 commit 085be4cebc6f021d8deb114e7984fdfc49665f40
6667 Author: Neil Roberts <neil@linux.intel.com>
6668 Date: Thu May 21 12:09:16 2009 +0100
6670 [cogl-pango-render] Fix the positioning when calling cogl_pango_render_layout
6672 When a position is given to cogl_pango_render_layout_subpixel it
6673 translates the GL matrix by the coordinates. However it was not
6674 dividing by PANGO_SCALE so the coordinates were completely wrong.
6676 clutter/pango/cogl-pango-render.c | 2 +-
6677 1 file changed, 1 insertion(+), 1 deletion(-)
6679 commit 1985fa75b1929b005d4b5ff46d62ae840f62f38d
6680 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6681 Date: Wed May 20 17:38:58 2009 +0100
6683 [texture] Use a box instead of int coordinates
6685 Most of the operations involving the texture's allocated area require
6686 floats -- either for computations or for setting the geometry into
6687 COGL. So it doesn't make any sense to use get_allocation_coords() and
6688 cast everything to floats.
6690 clutter/clutter-texture.c | 16 ++++++++--------
6691 1 file changed, 8 insertions(+), 8 deletions(-)
6693 commit 3428e4dd1d1f852521efbc4b1590370b050173b1
6694 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6695 Date: Wed May 20 17:26:39 2009 +0100
6697 [actor] Do not try to dereference NULL data
6699 If the shader_data bound to an Actor is NULL we should not try to access
6702 clutter/clutter-actor.c | 16 +++++++++-------
6703 1 file changed, 9 insertions(+), 7 deletions(-)
6705 commit f8f54989be460f8ae7abda7c2dc01eb578471742
6706 Merge: aa1246e 4f5a5f3
6707 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6708 Date: Wed May 20 16:49:22 2009 +0100
6710 Merge commit 'origin/master' into 1.0-integration
6713 clutter/clutter-texture.c
6714 clutter/cogl/gl/cogl-fbo.c
6716 commit 4f5a5f38f7068d4ec0dca9967f304a39901e8fec
6717 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6718 Date: Wed May 20 16:06:09 2009 +0100
6720 Add more padding in Model and ModelIter classes
6722 ClutterModel and ClutterModelIter have 4 padding slots, but if they
6723 have to survive the 1.x API cycle they will need at least twice that
6726 clutter/clutter-model.h | 12 ++++++++++--
6727 1 file changed, 10 insertions(+), 2 deletions(-)
6729 commit c74586d019a4651d52938610894c0396f02294bb
6730 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6731 Date: Wed May 20 15:15:25 2009 +0100
6733 [cogl] Do no include gprintf.h
6735 We are not using any of the g_printf* family of functions, so we
6736 can import glib.h instead.
6738 clutter/cogl/common/cogl-vertex-buffer.c | 3 +--
6739 1 file changed, 1 insertion(+), 2 deletions(-)
6741 commit 1f1d19f63450f52caa7231738cad84067486a2ba
6742 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6743 Date: Tue May 19 16:00:18 2009 +0100
6745 [cogl] Move debugging to a configure-time switch
6747 Currently, COGL depends on defining debug symbols by manually
6748 modifying the source code. When it's done, it will forcefully
6749 print stuff to the console.
6751 Since COGL has also a pretty, runtime selectable debugging API
6752 we might as well switch everything to it.
6754 In order for this to happen, configure needs a new:
6758 command line switch; this will enable COGL debugging, the
6759 CoglHandle debugging and will also turn on the error checking
6760 for each GL operation.
6762 The default setting for the COGL debug defines is off, since
6763 it slows down the GL operations; enabling it for a particular
6764 debug build is trivial, though.
6766 clutter/cogl/cogl-debug.h | 3 ++-
6767 clutter/cogl/common/Makefile.am | 2 +-
6768 clutter/cogl/common/cogl-debug.c | 3 ++-
6769 clutter/cogl/common/cogl-handle.h | 23 ++++++++++++-----------
6770 clutter/cogl/common/cogl-internal.h | 7 +++----
6771 clutter/cogl/gl/Makefile.am | 2 +-
6772 clutter/cogl/gles/Makefile.am | 2 +-
6773 configure.ac | 21 ++++++++++++++++++++-
6774 8 files changed, 42 insertions(+), 21 deletions(-)
6776 commit df1a9b7a74880d60fe1f00a7e35b8b620705701a
6777 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6778 Date: Tue May 19 14:44:29 2009 +0100
6780 [cogl] Rework the debug messages
6782 COGL has a debug message system like Clutter's own. In parallel,
6783 it also uses a coupld of #defines. Spread around there are also
6784 calls to printf() instead to the more correct g_log* wrappers.
6786 This commit tries to unify and clean up the macros and the
6787 debug message handling inside COGL to be more consistent.
6789 clutter/cogl/common/cogl-handle.h | 145 ++++++++++++++++-----------------
6790 clutter/cogl/common/cogl-internal.h | 43 ++++------
6791 clutter/cogl/common/cogl-primitives.c | 30 +++----
6792 clutter/cogl/common/cogl.c | 31 +++++--
6793 clutter/cogl/gl/cogl-texture.c | 22 ++---
6794 clutter/cogl/gles/cogl-texture.c | 11 ---
6795 6 files changed, 131 insertions(+), 151 deletions(-)
6797 commit 529e48fbbe95f9fe2d8db631b129391d9c2f36c9
6798 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6799 Date: Tue May 19 14:42:37 2009 +0100
6801 Remove duplicate cogl-internal.h header
6803 The cogl-internal.h header has been moved inside cogl/common in
6804 commit 8a1b4f8326 but has been left behind inside cogl/gl and
6807 clutter/cogl/gl/Makefile.am | 1 -
6808 clutter/cogl/gl/cogl-internal.h | 66 --------------------------
6809 clutter/cogl/gles/Makefile.am | 1 -
6810 clutter/cogl/gles/cogl-internal.h | 93 -------------------------------------
6811 4 files changed, 161 deletions(-)
6813 commit 407ac5075fb5737aff3730773ec9ccba2dbe7fd0
6814 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6815 Date: Tue May 19 12:51:29 2009 +0100
6817 [texture] Add missing accessors
6819 ClutterTexture has many properties that can only be accessed using
6820 the GObject API. This is fairly inefficient and makes binding the
6821 class overly complicated.
6823 The Texture class should have accessor methods for all its properties,
6824 properly documented.
6826 clutter/clutter-texture.c | 453 +++++++++++++++++++++++-----
6827 clutter/clutter-texture.h | 45 ++-
6828 doc/reference/clutter/clutter-sections.txt | 13 +
6829 3 files changed, 429 insertions(+), 82 deletions(-)
6831 commit 3115a6168836ff65ce58c31458d7672400458d74
6832 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6833 Date: Mon May 18 19:38:03 2009 +0100
6835 [cogl] Rework the GL-error-to-string conversion
6837 The code for the conversion of the GL error enumeration code
6838 into a string is not following the code style and conventions
6839 we follow in Clutter and COGL.
6841 The GE() macro is also using fprintf(stderr) directly instead
6842 of using g_warning() -- which is redirectable to an alternative
6843 logging system using the g_log* API.
6845 clutter/cogl/common/cogl-internal.h | 22 +++++++--------
6846 clutter/cogl/common/cogl.c | 52 ++++++++++++++++++-----------------
6847 2 files changed, 38 insertions(+), 36 deletions(-)
6849 commit e725bd21bf6b0760ed099b6e7136765774cf2093
6850 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6851 Date: Tue May 19 12:53:37 2009 +0100
6853 [gitignore] Add more gtk-doc droppings
6856 1 file changed, 2 insertions(+)
6858 commit cd3acca2b793c45c81ea4fdc053f82aa2b0ffe21
6859 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6860 Date: Thu May 14 23:23:00 2009 +0100
6862 [build] Link Cogl against -lm
6864 We use math routines inside Cogl, so it's correct to have it in
6865 the LIBADD line. In normal usage something else was pulling in
6866 -lm, but the introspection is relying on linking against the
6867 convenience library.
6869 Based on a patch by: Colin Walters <walters@verbum.org>
6871 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
6873 clutter/cogl/common/Makefile.am | 10 +++-------
6874 clutter/cogl/gl/Makefile.am | 9 +++------
6875 clutter/cogl/gles/Makefile.am | 13 ++++---------
6876 3 files changed, 10 insertions(+), 22 deletions(-)
6878 commit 08ac50faaeca28703e3f5495c76a72edca3c17f0
6879 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6880 Date: Thu May 14 19:51:03 2009 +0100
6882 [build] List cogl-internal.h
6884 During the Makefile clean up, cogl-internal.h got lost and this
6885 broke the dist. Let's put it back in.
6887 clutter/cogl/common/Makefile.am | 2 ++
6888 1 file changed, 2 insertions(+)
6890 commit 2f5012e38cd6566d01b98fb44679c9b431dbd473
6891 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6892 Date: Thu May 7 18:39:07 2009 +0100
6894 [animation] Do not leak timelines
6896 The timeline created when calling set_timeline(NULL) is referenced
6897 even though we implicitly own it. When the Animation is destroyed,
6898 the timeline is then leaked.
6900 Thanks to: Richard Heatley <richard.heatley@starleaf.com>
6904 http://bugzilla.openedhand.com/show_bug.cgi?id=1548
6906 clutter/clutter-animation.c | 20 ++++++++++++--------
6907 1 file changed, 12 insertions(+), 8 deletions(-)
6909 commit 21e3901d6248ceb9fd4e3c0c82565817774f463f
6910 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6911 Date: Wed May 6 17:18:12 2009 +0100
6913 [text] Expose position_to_coords()
6915 The clutter_text_position_to_coords() is useful for ClutterText
6920 http://bugzilla.openedhand.com/show_bug.cgi?id=1521
6922 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
6924 clutter/clutter-text.c | 33 ++++++++++++++++------------
6925 clutter/clutter-text.h | 5 +++++
6926 doc/reference/clutter/clutter-sections.txt | 1 +
6927 3 files changed, 25 insertions(+), 14 deletions(-)
6929 commit ca238387521d2df289e8df81ddf9e01597bed046
6930 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6931 Date: Wed May 6 17:08:25 2009 +0100
6933 [text] Add ClutterText::delete_selection()
6935 Add a method for deleting the current selection inside a Text actor.
6937 This is useful for subclasses.
6941 http://bugzilla.openedhand.com/show_bug.cgi?id=1521
6943 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
6945 clutter/clutter-text.c | 47 +++++++++++++++++++---------
6946 clutter/clutter-text.h | 1 +
6947 doc/reference/clutter/clutter-sections.txt | 1 +
6948 3 files changed, 34 insertions(+), 15 deletions(-)
6950 commit 79cb0a3515325dcf183684eb9809fd66abff478a
6951 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6952 Date: Wed May 6 17:01:44 2009 +0100
6954 [animation] Remove InitiallyUnowned from Animation
6956 ClutterAnimation currently inherits the initial floating reference
6957 semantics from GInitiallyUnowned. An Animation is, though, meant to
6958 be used as a top-level object, like a Timeline or a Behaviour, and
6959 not "owned" by another object. For this reason, the initial floating
6960 reference does not make any sense.
6962 clutter/clutter-animation.c | 18 ++++++++----------
6963 clutter/clutter-animation.h | 4 ++--
6964 2 files changed, 10 insertions(+), 12 deletions(-)
6966 commit 0f7a3b973952505e85e93d0bde59be48973fbeb2
6967 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6968 Date: Wed May 6 16:43:52 2009 +0100
6970 [docs] Add Animation get_type() function
6972 We need to reference clutter_animation_get_type() if we want the
6973 properties, signals and object hierarchy to show up in the API
6976 doc/reference/clutter/clutter.types | 1 +
6977 1 file changed, 1 insertion(+)
6979 commit 092b41d53b793a985d5234acfa9df007b16be4c3
6980 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6981 Date: Wed May 6 16:42:57 2009 +0100
6983 [docs] Document the destructor for Timeline
6985 The rest of the API reference lists the destructor for the class
6986 inside the constructor's return value -- except Timeline.
6988 clutter/clutter-timeline.c | 6 ++++--
6989 1 file changed, 4 insertions(+), 2 deletions(-)
6991 commit 1c6580afd67526d1f8e7ee114fdcd69b83e9f4c6
6992 Author: Dan Winship <danw@gnome.org>
6993 Date: Thu May 14 09:28:12 2009 -0400
6995 [cairo-texture] Document redrawing behavior
6997 Document that repeated calls to clutter_cairo_texture_create()
6998 continue drawing on the same cairo_surface_t. Add
6999 clutter_cairo_texture_clear() for when you don't want that behavior.
7001 http://bugzilla.openedhand.com/show_bug.cgi?id=1599
7003 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
7005 clutter/clutter-cairo-texture.c | 31 +++++++++++++++++++++++++++++++
7006 clutter/clutter-cairo-texture.h | 6 ++++--
7007 2 files changed, 35 insertions(+), 2 deletions(-)
7009 commit 81a536238d539fb87b24b7815408c4916fa63da6
7010 Author: Thomas Wood <thomas.wood@intel.com>
7011 Date: Thu May 14 15:08:31 2009 +0100
7013 [text] fix problems with scrolling interaction
7015 The cursor x position is already translated, so we do not need to take the
7016 actors allocation into account when calculating scrolling.
7018 Additionally, we need to update the text_x value before running
7019 clutter_text_ensure_cursor_position.
7021 clutter/clutter-text.c | 3 ++-
7022 1 file changed, 2 insertions(+), 1 deletion(-)
7024 commit a3a5fe5594301778ec78f161dfeffac113d89901
7025 Author: Thomas Wood <thomas.wood@intel.com>
7026 Date: Thu May 14 13:31:51 2009 +0100
7028 [text] scroll to the cursor position if it is outside the allocation
7030 Adjust the text offset to keep the cursor within the allocation. This means
7031 the text will scroll per character
7033 clutter/clutter-text.c | 22 +++++++++++++---------
7034 1 file changed, 13 insertions(+), 9 deletions(-)
7036 commit cf6c2d9721b96123f20c9ed26f8066dba502a035
7037 Author: Thomas Wood <thomas.wood@intel.com>
7038 Date: Thu May 14 10:55:25 2009 +0100
7040 [text] account for scrolling in text selections
7042 Account for any scrolling offset in single line mode when calculating the
7043 area that should be selected.
7045 clutter/clutter-text.c | 6 ++++++
7046 1 file changed, 6 insertions(+)
7048 commit e79fd1055d5d220a2460fc5ada0e74d7456aedf2
7049 Author: Thomas Wood <thomas.wood@intel.com>
7050 Date: Thu May 14 10:53:44 2009 +0100
7052 [text] account for scrolling in clutter_text_position_to_coords
7054 Add any scrolling offset to the x value when in single line mode.
7056 Now that the offset is taken into account in the position_to_coords
7057 function, we do not need to adjust the cursor x manually in
7060 clutter/clutter-text.c | 10 +++++++++-
7061 1 file changed, 9 insertions(+), 1 deletion(-)
7063 commit 16185c78fc59f8538f0a439908bd43ae8ee981fe
7064 Author: Thomas Wood <thomas.wood@intel.com>
7065 Date: Thu May 14 10:51:58 2009 +0100
7067 [text] take scrolling into account when calculating cursor position
7069 Account for the scrolling in single line more when calculating the cursor
7070 position from coordinates.
7072 clutter/clutter-text.c | 4 ++++
7073 1 file changed, 4 insertions(+)
7075 commit e162d0b0607e9221b360cfe7b0d61a2b4b44edd9
7076 Author: Thomas Wood <thomas.wood@intel.com>
7077 Date: Thu May 14 10:17:24 2009 +0100
7079 [text] position the cursor correctly in single line mode
7081 The position of the text should be increased by the value of TEXT_PADDING
7082 and the cursor offset by the same value as the text offset.
7084 clutter/clutter-text.c | 7 +++----
7085 1 file changed, 3 insertions(+), 4 deletions(-)
7087 commit cd86e70f4150505a035ea074aed06e4bd3fbb9df
7088 Author: Thomas Wood <thomas.wood@intel.com>
7089 Date: Thu May 14 09:53:41 2009 +0100
7091 [text] take text padding into account when in single line mode
7093 In single line mode, extra padding is added to the text which must be
7094 taken into account when reporting the natural size of the actor.
7096 clutter/clutter-text.c | 7 ++++++-
7097 1 file changed, 6 insertions(+), 1 deletion(-)
7099 commit 92e439105697fe65d8c6dda08d1658774245e9cb
7100 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7101 Date: Thu May 14 12:05:57 2009 +0100
7103 [tests] Verify cursor position
7105 Print out the cursor and selection positions in order to verify
7106 the behaviour of the Text actor.
7108 This is a likely candidate for a conformance test unit as well.
7110 tests/interactive/test-text-field.c | 5 ++++-
7111 1 file changed, 4 insertions(+), 1 deletion(-)
7113 commit 0d43d81ee04ea456edb3159aa0e0c71e2f869f62
7114 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7115 Date: Thu May 14 12:00:51 2009 +0100
7117 [text] Maintain the cursor at the end when deleting
7119 If the cursor is already at the end of the Text contents then we
7120 need to maintain its position when deleting the previous character
7121 using the relative key binding.
7123 clutter/clutter-text.c | 10 +++++-----
7124 1 file changed, 5 insertions(+), 5 deletions(-)
7126 commit 8174f66cc60a70e60eb98b0097416f898e8df485
7127 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7128 Date: Thu May 14 11:50:42 2009 +0100
7130 [text] Reset the cursor when setting empty text
7132 When setting the contents of Text to an empty string we should
7133 reset the cursor position and selection bound to -1.
7135 clutter/clutter-text.c | 10 ++++++++++
7136 1 file changed, 10 insertions(+)
7138 commit 608c3e3ab45ab262e9b89f8a78cdf2f057dca570
7139 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7140 Date: Thu May 14 10:02:06 2009 +0100
7142 [build] Fix with --disable-introspection
7144 The required "fake" libclutter-cogl.la upon with the main clutter
7145 shared object depends is only built with introspection enabled
7146 instead of being built unconditionally.
7148 clutter/cogl/Makefile.am | 2 +-
7149 1 file changed, 1 insertion(+), 1 deletion(-)
7151 commit 724e58a85a35e249490e54d27e7f9411033db3a9
7152 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7153 Date: Thu May 14 08:32:46 2009 +0100
7155 [build] Do not rebuild the conformance tests scripts
7157 Make the build output a little bit cleaner by not re-creating the
7158 small shell scripts that allow launching the test units separately.
7161 tests/conform/Makefile.am | 10 +++++++---
7162 2 files changed, 8 insertions(+), 3 deletions(-)
7164 commit d8aa6827ee310115b3f0a466c0798e4e5c1e5780
7165 Author: Owen W. Taylor <otaylor@redhat.com>
7166 Date: Wed May 13 23:14:24 2009 +0100
7168 Don't build Cogl.gir against installed Clutter library
7172 --library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@
7174 to g-ir-scanner, when building Cogl was causing g-ir-scanner to
7175 link the introspection program against the installed clutter library,
7176 if it existed or fail otherwise. Instead copy the handling from
7177 the json/ directory where we link against the convenience library
7178 to scan, and do the generation of the typelib later in the
7179 main clutter/directory.
7183 http://bugzilla.openedhand.com/show_bug.cgi?id=1594
7185 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
7187 .gitignore | 5 +++--
7188 clutter/Makefile.am | 30 ++++++++++++++++++++----------
7189 clutter/cogl/Makefile.am | 29 +++++++++++------------------
7190 3 files changed, 34 insertions(+), 30 deletions(-)
7192 commit 447e04bdce9b95bb1fc544d4c931071fa3665825
7193 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7194 Date: Wed May 13 23:04:25 2009 +0100
7196 [text] Return the correct minimum height
7198 If text is set, ClutterText should never return less than the layout
7199 height for minimum and preferred heights.
7201 This holds unless ellipsize and wrap are enabled, in which case the
7202 minimum height should be the height of the first line -- which is
7203 the height needed to at the very least show the ellipsization.
7205 Based on a patch by: Thomas Wood <thomas@openedhand.com>
7209 http://bugzilla.openedhand.com/show_bug.cgi?id=1598
7211 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
7213 clutter/clutter-text.c | 24 +++++++++++++++++++-----
7214 1 file changed, 19 insertions(+), 5 deletions(-)
7216 commit aa1246e8917f0977bd03b97c206d4c2a01ff8599
7217 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7218 Date: Wed May 13 22:21:48 2009 +0100
7220 [backend] Abstract the GL context creation
7222 This is the another step into abstracting the backend operations
7223 that are currently spread all across the board back into the
7224 backend implementations where they belong.
7226 The GL context creation, for instance, is demanded to the stage
7227 realization which makes it a critical path for every operation
7228 that is GL-context bound. This usually does not make any difference
7229 since we realize the default stage, but at some point we might
7230 start looking into avoiding the default stage realization in order
7231 to make the Clutter startup faster.
7233 It also makes the code maintainable because every part is self
7234 contained and can be reworked with the minimum amount of pain.
7236 clutter/clutter-backend.c | 16 ++++++++
7237 clutter/clutter-backend.h | 3 ++
7238 clutter/clutter-private.h | 3 ++
7239 clutter/glx/clutter-backend-glx.c | 54 +++++++++++++++++++++++++-
7240 clutter/glx/clutter-stage-glx.c | 76 +++++++++++++++++--------------------
7241 5 files changed, 110 insertions(+), 42 deletions(-)
7243 commit 1d7a79f343760d192619629de8e1ca9547007c13
7244 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7245 Date: Wed May 13 22:20:19 2009 +0100
7247 Update the redraw priority
7249 The master clock is using the redraw priority to create the source
7250 that will be used to spin the paint sequence if something is being
7251 animated using a timeline.
7253 Unfortunately, the priority is too high and this causes starvation
7254 when embedding into other toolkits -- like gtk+.
7256 Thanks to Havoc Pennington for catching this.
7258 clutter/clutter-main.h | 2 +-
7259 1 file changed, 1 insertion(+), 1 deletion(-)
7261 commit e59a19bd03964aacfa64479fdb51555350992989
7262 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7263 Date: Wed May 13 21:49:45 2009 +0100
7265 [x11] Abstract XVisualInfo creation
7267 The XVisualInfo for GL is created when a stage is being realized.
7268 When embedding Clutter inside another toolkit we might not want to
7269 realize a stage to extract the XVisualInfo, then set the stage
7270 window using a foreign X Window -- which will cause a re-realization.
7272 Instead, we should abstract as much as possible into the X11 backend.
7274 Unfortunately, the XVisualInfo for GL is requested using GLX API; for
7275 this reason we have to create a ClutterBackendX11 method that we
7276 override inside the ClutterBackendGLX implementation.
7278 This also allows us to move a little bit of complexity from out of
7279 the stage realization, which is currently a very delicate and hard
7282 clutter/glx/clutter-backend-glx.c | 67 +++++++++++++++++++++++++++++++++----
7283 clutter/glx/clutter-stage-glx.c | 46 ++++++-------------------
7284 clutter/x11/clutter-backend-x11.c | 14 ++++++++
7285 clutter/x11/clutter-backend-x11.h | 7 ++++
7286 clutter/x11/clutter-stage-x11.c | 16 ++++++++-
7287 5 files changed, 108 insertions(+), 42 deletions(-)
7289 commit 2b1759385e8f3373497b5d99c733266c2ecae1ee
7290 Author: Robert Bragg <robert@linux.intel.com>
7291 Date: Wed May 13 12:11:54 2009 +0100
7293 [text] Ensure clutter_text_get_selection copes with start/end positions of -1
7295 I was seeing clutter_text_get_selection trying to malloc up to 4Gb due to
7296 unexpected negative arithmetic for the start/end offsets which resulted
7299 This just tests for positions of -1 before deciding if the start/end
7300 positions need to be swapped. The conversion from position to byte offset
7301 already works with -1.
7303 clutter/clutter-text.c | 3 ++-
7304 1 file changed, 2 insertions(+), 1 deletion(-)
7306 commit 979f089ef9e5ef3486fd81f8ec4d38579bb7e7b7
7307 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7308 Date: Tue May 12 19:22:25 2009 +0100
7310 [tests] Add command line option to the picking test
7312 The picking test has two configurables: the number of actors and
7313 the number of events per frame. It makes sense to have them as
7314 command line options to test with multiple configurations without
7315 having to change defines and recompile.
7317 tests/micro-bench/test-picking.c | 56 ++++++++++++++++++++++++++------------
7318 1 file changed, 39 insertions(+), 17 deletions(-)
7320 commit df85b70ab44c564f65605d38abc923822f70f405
7321 Author: Owen W. Taylor <otaylor@fishsoup.net>
7322 Date: Sat May 9 20:09:42 2009 -0400
7324 Fix chain-up in clutter_list_model_dispose()
7326 Chain up to parent class's dispose() method not parent class's
7329 http://bugzilla.openedhand.com/show_bug.cgi?id=1595
7331 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
7333 clutter/clutter-list-model.c | 2 +-
7334 1 file changed, 1 insertion(+), 1 deletion(-)
7336 commit 62e2f276041365853838122b3a7326a27c7c733e
7337 Author: Chris Lord <chris@linux.intel.com>
7338 Date: Tue May 12 16:17:51 2009 +0100
7340 [tests/micro-bench] Add a picking performance test
7342 Approved by Robert Bragg.
7344 tests/micro-bench/Makefile.am | 4 +-
7345 tests/micro-bench/test-picking.c | 128 ++++++++++++++++++++++++++++++++++++++
7346 2 files changed, 131 insertions(+), 1 deletion(-)
7348 commit d1fa83039d12f8501075d3e9f7fd17a42cbdd7c8
7349 Author: Robert Bragg <robert@linux.intel.com>
7350 Date: Tue May 12 01:02:25 2009 +0100
7352 [picking] Use cogl_clip_push_window_rect to greatly reduce the cost of picking.
7354 cogl_clip_push_window_rect is implemented using GPU scissoring which allows
7355 the GPU to cull anything that falls outside a given rectangle. Since in the
7356 case of picking we only ever care about a single pixel we can get the GPU to
7357 ignore all geometry that doesn't intersect that pixel and only rasterize for
7360 clutter/clutter-main.c | 2 ++
7361 1 file changed, 2 insertions(+)
7363 commit e80fcbc298812b7fc333cec34049a4ee806f469a
7364 Author: Robert Bragg <robert@linux.intel.com>
7365 Date: Fri May 8 16:32:01 2009 +0100
7367 [cogl-clip-stack] Support pushing rectangles onto the stack using window coords
7369 Previously clipping could only be specified in object coordinates, now
7370 rectangles can also be pushed in window coordinates.
7372 Internally rectangles pushed this way are intersected and then clipped using
7373 scissoring. We also transparently try to convert rectangles pushed in
7374 object coordinates into window coordinates as we anticipate the scissoring
7375 path will be faster then the clip planes and undoubtably it will be faster
7376 than using the stencil buffer.
7378 clutter/cogl/cogl.h.in | 21 +++++
7379 clutter/cogl/common/cogl-clip-stack.c | 165 +++++++++++++++++++++++++++++++--
7380 clutter/cogl/common/cogl.c | 2 +
7381 3 files changed, 180 insertions(+), 8 deletions(-)
7383 commit e9b863eba28564dd0b19f982610e5afe93ac17eb
7384 Author: Neil Roberts <neil@linux.intel.com>
7385 Date: Tue May 12 15:36:16 2009 +0100
7387 Don't clear the stencil buffer before painting and picking
7389 The stencil buffer is always cleared the first time a clip is used
7390 that needs it and the stencil test is disabled otherwise so there is
7391 no need to clear before a paint.
7393 clutter/clutter-main.c | 3 +--
7394 clutter/clutter-stage.c | 3 +--
7395 clutter/clutter-texture.c | 3 +--
7396 3 files changed, 3 insertions(+), 6 deletions(-)
7398 commit 36cfb6030784791a4420a1e52a8c18d56b1d0c69
7399 Author: Robert Bragg <robert@linux.intel.com>
7400 Date: Tue May 12 14:15:18 2009 +0100
7402 [cogl] Remove the COGL{enum,int,uint} typedefs
7404 COGLenum, COGLint and COGLuint which were simply typedefs for GL{enum,int,uint}
7405 have been removed from the API and replaced with specialised enum typedefs, int
7406 and unsigned int. These were causing problems for generating bindings and also
7407 considered poor style.
7409 The cogl texture filter defines CGL_NEAREST and CGL_LINEAR etc are now replaced
7410 by a namespaced typedef 'CoglTextureFilter' so they should be replaced with
7411 COGL_TEXTURE_FILTER_NEAREST and COGL_TEXTURE_FILTER_LINEAR etc.
7413 The shader type defines CGL_VERTEX_SHADER and CGL_FRAGMENT_SHADER are handled by
7414 a CoglShaderType typedef and should be replaced with COGL_SHADER_TYPE_VERTEX and
7415 COGL_SHADER_TYPE_FRAGMENT.
7417 cogl_shader_get_parameteriv has been replaced by cogl_shader_get_type and
7418 cogl_shader_is_compiled. More getters can be added later if desired.
7421 clutter/clutter-shader-types.c | 10 ++--
7422 clutter/clutter-shader-types.h | 2 +-
7423 clutter/clutter-shader.c | 21 +++----
7424 clutter/clutter-texture.c | 14 ++---
7425 clutter/cogl/cogl-shader.h | 81 +++++++++++++++-----------
7426 clutter/cogl/cogl-texture.h | 54 +++++++++++++++--
7427 clutter/cogl/gl/cogl-defines.h.in | 13 -----
7428 clutter/cogl/gl/cogl-program.c | 14 ++---
7429 clutter/cogl/gl/cogl-shader.c | 73 ++++++++++++++++++-----
7430 clutter/cogl/gl/cogl-texture-private.h | 4 +-
7431 clutter/cogl/gl/cogl-texture.c | 20 +++----
7432 clutter/cogl/gles/cogl-defines.h.in | 16 -----
7433 clutter/cogl/gles/cogl-program.c | 26 ++++-----
7434 clutter/cogl/gles/cogl-shader.c | 90 +++++++++++++++++++++--------
7435 clutter/cogl/gles/cogl-texture-private.h | 4 +-
7436 clutter/cogl/gles/cogl-texture.c | 8 +--
7437 clutter/glx/clutter-glx-texture-pixmap.c | 50 ++++++++--------
7438 clutter/pango/cogl-pango-glyph-cache.c | 8 +--
7439 doc/reference/cogl/cogl-sections.txt | 3 +-
7440 tests/interactive/test-cogl-tex-polygon.c | 44 +++++++-------
7441 tests/interactive/test-cogl-tex-tile.c | 49 ++++++++--------
7442 22 files changed, 376 insertions(+), 244 deletions(-)
7444 commit cea711cc7e5c2d8f8328d8ce072f43b8b034d13e
7445 Author: Robert Bragg <robert@linux.intel.com>
7446 Date: Tue May 12 14:20:22 2009 +0100
7448 [ClutterTexture] Remove a spurious line I accidentally committed in 741c4bb5
7450 I accidentally changed clutter_texture_set_cogl_texture to always set the
7451 filter quality for the new Cogl texture to medium.
7453 clutter/clutter-texture.c | 3 ---
7454 1 file changed, 3 deletions(-)
7456 commit 08a73a215f2cf18abcfd7d93e8047583511497bd
7457 Author: Robert Bragg <robert@linux.intel.com>
7458 Date: Wed May 6 19:01:09 2009 +0100
7460 Don't call glFinish in _clutter_do_pick
7462 Calling glReadPixels is bad enough in forcing us to synchronize the CPU with
7463 the GPU, but glFinish has even stronger synchonization semantics than
7464 glReadPixels which may negate some driver optimizations possible in
7467 clutter/clutter-main.c | 8 ++------
7468 1 file changed, 2 insertions(+), 6 deletions(-)
7470 commit 10783e053be104c14bfab24dff7c54046790af60
7471 Author: Neil Roberts <neil@linux.intel.com>
7472 Date: Tue May 12 14:15:37 2009 +0100
7474 [build] Fix out-of-tree builds for Cogl
7476 Commit 43fa38fcf5 broke out-of-tree builds by removing some of the
7477 builddir directories from the include path. builddir/clutter/cogl and
7478 builddir/clutter are needed because cogl.h and cogl-defines-gl.h are
7479 automatically generated by the configure script. The main clutter
7480 headers are in the srcdir so this needs to be in the path too.
7482 clutter/cogl/gl/Makefile.am | 2 ++
7483 1 file changed, 2 insertions(+)
7485 commit dd95939d260e19bac8119d430ff3d9b9279c0234
7486 Author: Raymond Liu <raymond.liu@intel.com>
7487 Date: Thu May 7 18:20:19 2009 +0800
7489 Emit key focus signal when stage state changes
7491 When the stage state changes between active/deactive, send out
7492 key-focus-in/key-focus-out signal for the current key focused
7497 http://bugzilla.openedhand.com/show_bug.cgi?id=1503
7499 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
7501 clutter/clutter-stage.c | 29 +++++++++++++++++++++++++++++
7502 1 file changed, 29 insertions(+)
7504 commit 4b285e02bc85e92612485b5ebea568b90951be40
7505 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7506 Date: Mon May 11 18:17:30 2009 +0100
7508 [x11] Unset the GL context when re-realizing
7510 Setting the stage window using the set_stage_foreign() method will
7511 lead to a re-realization. We need to make sure that the Drawable
7512 currently associated to the GL context is set to None, to avoid a
7513 BadDrawable error or, if we're unlucky, a segfault in the X server.
7515 clutter/x11/clutter-stage-x11.c | 8 +++++++-
7516 1 file changed, 7 insertions(+), 1 deletion(-)
7518 commit 0b7e459d481d84683adf65b8ea6c0c5502aa97c0
7519 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7520 Date: Mon May 11 12:36:14 2009 +0100
7522 Add more debugging notes
7524 clutter/clutter-actor.c | 5 +++++
7525 clutter/glx/clutter-stage-glx.c | 4 +++-
7526 clutter/x11/clutter-stage-x11.c | 14 ++++++++------
7527 3 files changed, 16 insertions(+), 7 deletions(-)
7529 commit 8b7c6955de2c09c1f3d9c0e1b349966b6a63062e
7530 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7531 Date: Mon May 11 12:36:55 2009 +0100
7533 [backend] Unset the current stage if it is unrealized
7535 This commit reverts part of commit 5bcde25c - specifically the
7536 part that forced a realization of the stage if we are ensuring
7537 the GL context with it. This makes Clutter behave like it did
7538 prior to commit 5bcde25c: if we are asked to ensure the GL context
7539 with an unrealized stage we simply pass NULL to the backend
7542 clutter/clutter-backend.c | 27 +++++++++++++++------------
7543 1 file changed, 15 insertions(+), 12 deletions(-)
7545 commit d19f6feb45cfedfedda997967954ea892c4cfb92
7546 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7547 Date: Mon May 11 12:43:37 2009 +0100
7549 [stage] Chain up ::show before showing the implementation
7551 When showing a Stage for the first time we end up realizing the stage
7552 implementation before realizing the wrapper. This leads to segmentation
7553 faults or errors coming from the backend because we're fumbling the
7554 state and realization sequence.
7556 clutter/clutter-stage.c | 8 ++++----
7557 1 file changed, 4 insertions(+), 4 deletions(-)
7559 commit 9582fddb24fba071ea77aa2396aa5288639c3217
7560 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7561 Date: Mon May 11 12:39:46 2009 +0100
7563 [x11] Do not needlessly check XVisualInfo
7565 Since we are destroying any previously set VisualInfo we keep we know
7566 for sure that stage->xvisinfo is going to be None; hence, no reason to
7567 check this condition.
7569 clutter/glx/clutter-stage-glx.c | 16 +++++++---------
7570 1 file changed, 7 insertions(+), 9 deletions(-)
7572 commit 0acb98e987f456d67db11f85ccca909d67922362
7573 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7574 Date: Mon May 11 12:43:56 2009 +0100
7576 [actor] Conditionally verify the map state
7578 The verify_map_state() internal method is conditionally compiled
7579 if we have CLUTTER_ENABLE_DEBUG set; for this reason, all calls to
7580 that method should be made conditional.
7582 clutter/clutter-actor.c | 3 ++-
7583 1 file changed, 2 insertions(+), 1 deletion(-)
7585 commit d00cac635325e5e279fb9dce87bfc36954d314b7
7586 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7587 Date: Sun May 10 00:41:17 2009 +0100
7589 [build] Unbreak compilation
7591 When building Clutter with introspection enabled everything stops
7592 at Cogl GIR generation because it depends on the installed library
7593 to work. Since we still require some changes in the API to be able
7594 to build the GIR and the typelib for Cogl we should disable the
7595 generation of the GIR as well.
7597 clutter/cogl/Makefile.am | 4 ++--
7598 1 file changed, 2 insertions(+), 2 deletions(-)
7600 commit 5bcde25cbbfcfefc850605fb0ddf8e818d2413fa
7601 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7602 Date: Fri May 8 17:17:48 2009 +0100
7604 Tentative fix for multi-stage support on GLX
7606 The fix for bug 1138 broke multi-stage support on GLX, causing
7607 X11 to segfault with the following stack trace:
7610 0: /usr/X11R6/bin/X(xf86SigHandler+0x7e) [0x80c91fe]
7612 2: /usr/lib/xorg/modules/extensions//libglx.so [0xb7ae880c]
7613 3: /usr/lib/xorg/modules/extensions//libglx.so [0xb7aec0d6]
7614 4: /usr/X11R6/bin/X [0x8154c24]
7615 5: /usr/X11R6/bin/X(Dispatch+0x314) [0x808de54]
7616 6: /usr/X11R6/bin/X(main+0x4b5) [0x8074795]
7617 7: /lib/i686/cmov/libc.so.6(__libc_start_main+0xe5) [0xb7c75775]
7618 8: /usr/X11R6/bin/X(FontFileCompleteXLFD+0x21d) [0x8073a81]
7620 which I can only track down to clutter_backend_glx_ensure_current()
7621 being passed a NULL stage -- something that happens when a stage
7622 is not correct realized. That should lead to a glXMakeCurrent(None)
7623 and not to a segmentation fault, though.
7625 clutter/clutter-backend.c | 14 +++++++++++---
7626 clutter/clutter-stage.c | 18 +++++++++++++-----
7627 clutter/glx/clutter-backend-glx.c | 7 +++++--
7628 3 files changed, 29 insertions(+), 10 deletions(-)
7630 commit 91126558d35c58a94f674ad93d9561e4c5ab3bff
7631 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7632 Date: Fri May 8 17:14:49 2009 +0100
7634 [actor] Relax some of the invariants checks
7636 When destroying a top-level actor we can actually relax the verification
7637 of the map state, since it might be fully asynchronous and we might not
7638 re-enter inside the mainloop in time to receive the unmap notification.
7640 clutter/clutter-actor.c | 23 ++++++++++++++++-------
7641 1 file changed, 16 insertions(+), 7 deletions(-)
7643 commit 692c50ba672b55d809e12b97184e7ee21d9f3fda
7644 Author: Rob Bradford <rob@linux.intel.com>
7645 Date: Fri May 8 10:57:56 2009 +0100
7647 [list-model] Return NULL for first row in a fully filtered model
7649 If the filter means that the there should be no rows left in the model,
7650 clutter_model_get_iter_at_row (model, 0) should return NULL.
7652 Howevever the currene implementation misbehaves and returns a bad iterator.
7653 This change resolves the issue by tracking if we actually found any
7654 non-filtered rows in our pass through the sequence.
7658 clutter/clutter-list-model.c | 14 +++++++++++++-
7659 1 file changed, 13 insertions(+), 1 deletion(-)
7661 commit 9f3927c460cbc4d50eae2b78826cc5347cb37c16
7662 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7663 Date: Thu May 7 19:14:48 2009 +0100
7665 [stage] Chain up to the correct vfunc when picking
7667 The stage is chaining up to the ClutterGroup::paint instead of
7668 the ClutterGroup::pick method. This works anyway because we
7669 detect the stage by default, but it's not a reliable solution
7670 in case we decide to change the picking further on.
7672 clutter/clutter-stage.c | 3 +--
7673 1 file changed, 1 insertion(+), 2 deletions(-)
7675 commit 533c9c536530bd43931793010f76714580f6b166
7676 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7677 Date: Thu May 7 19:14:29 2009 +0100
7679 [debug] Show the actor name/type on queue_redraw()
7681 clutter/clutter-actor.c | 3 +++
7682 1 file changed, 3 insertions(+)
7684 commit 86bc31bd55fec32ed70abc19f0f2c4514d1c8e29
7685 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7686 Date: Thu May 7 19:07:21 2009 +0100
7688 [clock] Rework the master clock
7690 The master clock is currently advanced using a frame source driven
7691 by the default frame rate. This breaks the sync to vblank because
7692 the vblanking rate could be different than 60 Hz -- or it might be
7693 completely disabled (e.g. with CLUTTER_VBLANK=none).
7695 We should be using the main loop to check if we have timelines
7696 playing, and if so queue a redraw on the stages we own.
7698 We should also prepare the subsequent frame at the end of the redraw
7699 process, so if there are new redraw we will have the scene already
7702 This makes Clutter redraw at the maximum frame rate, which is
7703 limited by the vblanking frequency.
7705 clutter/clutter-main.c | 14 ++-
7706 clutter/clutter-master-clock.c | 247 +++++++++++++++++++++++++---------------
7707 clutter/clutter-private.h | 2 +
7708 clutter/clutter-stage.c | 10 +-
7709 4 files changed, 173 insertions(+), 100 deletions(-)
7711 commit ab9c7671f57a03ab34dac97bbd3a787b5f0ab65d
7712 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7713 Date: Thu May 7 18:47:50 2009 +0100
7715 [group] Implement pick
7717 Currently, picking in ClutterGroup pollutes the CLUTTER_DEBUG=paint
7718 logs since it just calls the paint function. Reimplementing the pick
7719 doesn't make us lose anything -- it might even be slightly faster
7720 since we don't have to do a (typed) cast and a class dereference.
7722 clutter/clutter-group.c | 21 ++++++++++++++-------
7723 1 file changed, 14 insertions(+), 7 deletions(-)
7725 commit 081813fd61400dec7183cb5d151dff3bbbbc8b34
7726 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7727 Date: Thu May 7 18:39:07 2009 +0100
7729 [animation] Do not leak timelines
7731 The timeline created when calling set_timeline(NULL) is referenced
7732 even though we implicitly own it. When the Animation is destroyed,
7733 the timeline is then leaked.
7735 Thanks to: Richard Heatley <richard.heatley@starleaf.com>
7739 http://bugzilla.openedhand.com/show_bug.cgi?id=1548
7741 clutter/clutter-animation.c | 20 ++++++++++++--------
7742 1 file changed, 12 insertions(+), 8 deletions(-)
7744 commit e41452fc0c465c92a5d26c28b4c744ae73829d58
7745 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7746 Date: Thu May 7 19:16:20 2009 +0100
7748 [tests] Check em to unit conversion
7750 We should be able to position elements of the stage using em as
7751 a unit, and converting values into pixels.
7753 tests/interactive/test-text-field.c | 16 ++++++++++++----
7754 1 file changed, 12 insertions(+), 4 deletions(-)
7756 commit 33ef1675f5d5d750833a5d2eb9373afe44adb0c5
7757 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7758 Date: Thu May 7 18:46:36 2009 +0100
7760 [script] Allow parsing units in em
7762 When creating an actor, using "em" as a unit should result
7763 in an implicit conversion, like for "mm" and "pt".
7765 clutter/clutter-actor.c | 6 ++++++
7766 1 file changed, 6 insertions(+)
7768 commit f2c25fd4f7d8a22dcb91461ebb86d1c74565c89b
7769 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7770 Date: Thu May 7 14:16:01 2009 +0100
7772 Allow specifying the font for the em conversion
7774 Currently, the conversion from em to units is done by using the
7775 default font name inside the backend. For actors using their own
7776 font/text layout we need a way to specify the font name along
7777 with the quantity we wish to transform.
7779 clutter/clutter-backend.c | 89 ++++++++++++++++++++++++++++++---------------
7780 clutter/clutter-private.h | 3 +-
7781 clutter/clutter-units.c | 47 ++++++++++++++++++++++--
7782 clutter/clutter-units.h | 13 ++++---
7783 4 files changed, 114 insertions(+), 38 deletions(-)
7785 commit 8ec1c3e2fbb25c32f6d14f697995c438ea4fb755
7786 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7787 Date: Thu May 7 11:18:51 2009 +0100
7789 Fix remaining ::focus-in signal emission
7791 Commit 515350a7 renamed ::focus-in and ::focus-out to ::key-focus-in
7792 and ::key-focus-out respectively. One signal emission for ::focus-out
7793 escaped the renaming in ClutterStage.
7795 clutter/clutter-stage.c | 2 +-
7796 1 file changed, 1 insertion(+), 1 deletion(-)
7798 commit 2ae9d84a2a917993ea2efb4f6980ed325a711371
7799 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7800 Date: Wed May 6 18:32:17 2009 +0100
7802 [x11] Use -1 as the default screen guard
7804 Currently, the default screen guard value is 0, which is a valid
7805 screen number on X11, and it might not be the default.
7807 Patch suggested by: Owen W. Taylor <otaylor@redhat.com>
7809 clutter/x11/clutter-backend-x11.c | 4 ++--
7810 1 file changed, 2 insertions(+), 2 deletions(-)
7812 commit 8ca46d728ddd1c86869b0e04494b3a73d99e2133
7813 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7814 Date: Wed May 6 11:18:31 2009 +0100
7816 [build] Build Cogl introspection data
7818 Currently, the introspection data for Cogl is built right into
7819 Clutter's own typelib. This makes functions like:
7821 cogl_path_round_rectangle()
7825 Clutter.cogl_path_round_rectangle()
7827 It should be possible, instead, to have a Cogl namespace and:
7829 Cogl.path_round_rectangle()
7831 This means building introspection data for Cogl alone. Unfortunately,
7832 there are three types defined in Cogl that confuse the introspection
7833 scanner, and make it impossible to build a typelib:
7839 These three types should go away before 1.0, substituted by int,
7840 unsigned int and proper enumeration types. For this reason, we can
7841 just set up the GIR build and wait until the last moment to create
7842 the typelib. Once that has been done, we will be able to safely
7843 remove the Cogl API from the Clutter GIR and typelib and let
7844 people import Cogl if they want to use the Cogl API via introspection.
7846 clutter/cogl/Makefile.am | 57 ++++++++++++++++++++++++++++++++++++++++++++++
7847 1 file changed, 57 insertions(+)
7849 commit 43fa38fcf5178bf91b8b49fc1ddf0b36b07f4b59
7850 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7851 Date: Wed May 6 10:55:17 2009 +0100
7853 [build] Clean up the makefile
7855 Split out the files into their own variables to clean up the
7856 Makefile template; also use top_srcdir with the header files
7857 instead of top_builddir.
7859 clutter/cogl/gl/Makefile.am | 102 +++++++++++++++++++++----------------------
7860 1 file changed, 51 insertions(+), 51 deletions(-)
7862 commit c065524b9f15aa73f9d73044b41a62644fc76a91
7863 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7864 Date: Wed May 6 10:35:28 2009 +0100
7866 Fix inclusion guards and headers
7868 The C++ inclusion guards G_BEGIN_DECLS and G_END_DECLS are
7869 defined by GLib; so we need to include glib.h before using
7872 clutter/cogl/cogl-bitmap.h | 4 ++--
7873 clutter/cogl/cogl-shader.h | 2 +-
7874 clutter/cogl/cogl-texture.h | 4 ++--
7875 clutter/cogl/gl/cogl-defines.h.in | 1 +
7876 clutter/cogl/gles/cogl-defines.h.in | 1 +
7877 5 files changed, 7 insertions(+), 5 deletions(-)
7879 commit 4cb3fa872825d2903e8c50733eb171b729a1272a
7880 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7881 Date: Wed May 6 17:57:34 2009 +0100
7883 [docs] Update documentation
7885 Remove the units-based API and add the missing symbols.
7887 Also, do not let gtk-doc check the master clock header, since
7890 doc/reference/clutter/Makefile.am | 1 +
7891 doc/reference/clutter/clutter-sections.txt | 37 +++++++---------------------
7892 2 files changed, 10 insertions(+), 28 deletions(-)
7894 commit 515350a77fb42317f5a0643702733e0dbaffc2aa
7895 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7896 Date: Wed May 6 17:56:40 2009 +0100
7898 [actor] Rename focus-in and focus-out signals
7900 For consistency, and since those signals are key-related, the
7901 ::focus-in signal is not ::key-focus-in and the ::focus-out
7902 signal is now ::key-focus-out.
7904 clutter/clutter-actor.c | 22 +++++++++++-----------
7905 clutter/clutter-actor.h | 8 ++++----
7906 clutter/clutter-stage.c | 6 +++---
7907 3 files changed, 18 insertions(+), 18 deletions(-)
7909 commit d0ad5a8abb732ae9b80d036116b6c2c1e5bef985
7910 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7911 Date: Wed May 6 17:18:12 2009 +0100
7913 [text] Expose position_to_coords()
7915 The clutter_text_position_to_coords() is useful for ClutterText
7920 http://bugzilla.openedhand.com/show_bug.cgi?id=1521
7922 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
7924 clutter/clutter-text.c | 16 ++++++++++++----
7925 clutter/clutter-text.h | 5 +++++
7926 doc/reference/clutter/clutter-sections.txt | 1 +
7927 3 files changed, 18 insertions(+), 4 deletions(-)
7929 commit a28b9f31eb9f4c4a1d4520350f268549e4d37c5a
7930 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7931 Date: Wed May 6 17:08:25 2009 +0100
7933 [text] Add ClutterText::delete_selection()
7935 Add a method for deleting the current selection inside a Text actor.
7937 This is useful for subclasses.
7941 http://bugzilla.openedhand.com/show_bug.cgi?id=1521
7943 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
7945 clutter/clutter-text.c | 47 +++++++++++++++++++---------
7946 clutter/clutter-text.h | 1 +
7947 doc/reference/clutter/clutter-sections.txt | 1 +
7948 3 files changed, 34 insertions(+), 15 deletions(-)
7950 commit ab1dcb803333a9a063d91312a1710c28ece951cd
7951 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7952 Date: Wed May 6 17:01:44 2009 +0100
7954 [animation] Remove InitiallyUnowned from Animation
7956 ClutterAnimation currently inherits the initial floating reference
7957 semantics from GInitiallyUnowned. An Animation is, though, meant to
7958 be used as a top-level object, like a Timeline or a Behaviour, and
7959 not "owned" by another object. For this reason, the initial floating
7960 reference does not make any sense.
7962 clutter/clutter-animation.c | 18 ++++++++----------
7963 clutter/clutter-animation.h | 4 ++--
7964 2 files changed, 10 insertions(+), 12 deletions(-)
7966 commit d6d208da7de44b1a266957ad69acff6ee0f2fd4d
7967 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7968 Date: Wed May 6 16:44:47 2009 +0100
7970 Remove Units from the public API
7972 With the recent change to internal floating point values, ClutterUnit
7973 has become a redundant type, defined to be a float. All integer entry
7974 points are being internally converted to floating point values to be
7975 passed to the GL pipeline with the least amount of conversion.
7977 ClutterUnit is thus exposed as just a "pixel with fractionary bits",
7978 and not -- as users might think -- as generic, resolution and device
7979 independent units. not that it was the case, but a definitive amount
7980 of people was convinced it did provide this "feature", and was flummoxed
7981 about the mere existence of this type.
7983 So, having ClutterUnit exposed in the public API doubles the entry
7984 points and has the following disadvantages:
7986 - we have to maintain twice the amount of entry points in ClutterActor
7987 - we still do an integer-to-float implicit conversion
7988 - we introduce a weird impedance between pixels and "pixels with
7990 - language bindings will have to choose what to bind, and resort
7991 to manually overriding the API
7992 + *except* for language bindings based on GObject-Introspection, as
7993 they cannot do manual overrides, thus will replicate the entire
7996 For these reason, we should coalesces every Actor entry point for
7997 pixels and for ClutterUnit into a single entry point taking a float,
8000 void clutter_actor_set_x (ClutterActor *self,
8002 void clutter_actor_get_size (ClutterActor *self,
8005 gfloat clutter_actor_get_height (ClutterActor *self);
8009 The issues I have identified are:
8011 - we'll have a two cases of compiler warnings:
8012 - printf() format of the return values from %d to %f
8013 - clutter_actor_get_size() taking floats instead of unsigned ints
8014 - we'll have a problem with varargs when passing an integer instead
8015 of a floating point value, except on 64bit platforms where the
8016 size of a float is the same as the size of an int
8018 To be clear: the *intent* of the API should not change -- we still use
8019 pixels everywhere -- but:
8021 - we remove ambiguity in the API with regard to pixels and units
8022 - we remove entry points we get to maintain for the whole 1.0
8024 - we make things simpler to bind for both manual language bindings
8025 and automatic (gobject-introspection based) ones
8026 - we have the simplest API possible while still exposing the
8027 capabilities of the underlying GL implementation
8029 clutter/clutter-actor.c | 2539 +++++++++---------------
8030 clutter/clutter-actor.h | 223 +--
8031 clutter/clutter-animation.c | 3 +
8032 clutter/clutter-backend.c | 11 +-
8033 clutter/clutter-behaviour.c | 5 +-
8034 clutter/clutter-cairo-texture.c | 16 +-
8035 clutter/clutter-clone.c | 16 +-
8036 clutter/clutter-deprecated.h | 20 +
8037 clutter/clutter-event.c | 9 +-
8038 clutter/clutter-event.h | 24 +-
8039 clutter/clutter-group.c | 40 +-
8040 clutter/clutter-main.c | 22 +-
8041 clutter/clutter-private.h | 10 +-
8042 clutter/clutter-stage.c | 34 +-
8043 clutter/clutter-text.c | 50 +-
8044 clutter/clutter-texture.c | 63 +-
8045 clutter/clutter-types.h | 8 +-
8046 clutter/eglnative/clutter-stage-egl.c | 12 +-
8047 clutter/fruity/clutter-stage-fruity.c | 12 +-
8048 clutter/osx/clutter-stage-osx.c | 12 +-
8049 clutter/sdl/clutter-stage-sdl.c | 12 +-
8050 clutter/win32/clutter-stage-win32.c | 12 +-
8051 clutter/x11/clutter-stage-x11.c | 14 +-
8052 tests/conform/test-anchors.c | 15 +-
8053 tests/conform/test-timeline-dup-frames.c | 1 -
8054 tests/conform/test-timeline-interpolate.c | 1 -
8055 tests/conform/test-timeline-rewind.c | 1 -
8056 tests/conform/test-timeline-smoothness.c | 1 -
8057 tests/interactive/test-actor-clone.c | 4 +-
8058 tests/interactive/test-actors.c | 4 +-
8059 tests/interactive/test-animation.c | 12 +-
8060 tests/interactive/test-clutter-cairo-flowers.c | 10 +-
8061 tests/interactive/test-depth.c | 24 +-
8062 tests/interactive/test-easing.c | 12 +-
8063 tests/interactive/test-fullscreen.c | 6 +-
8064 tests/interactive/test-layout.c | 16 +-
8065 tests/interactive/test-paint-wrapper.c | 6 +-
8066 tests/interactive/test-project.c | 46 +-
8067 tests/interactive/test-stage-read-pixels.c | 12 +-
8068 tests/interactive/test-unproject.c | 21 +-
8069 40 files changed, 1320 insertions(+), 2039 deletions(-)
8071 commit c2abdd5e820134c6281e38339ef141b1e1ed8bf0
8072 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8073 Date: Wed May 6 16:43:52 2009 +0100
8075 [docs] Add Animation get_type() function
8077 We need to reference clutter_animation_get_type() if we want the
8078 properties, signals and object hierarchy to show up in the API
8081 doc/reference/clutter/clutter.types | 1 +
8082 1 file changed, 1 insertion(+)
8084 commit 7afdfb080b2f6ecb94ea5d10a9709be71e2ddb9f
8085 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8086 Date: Wed May 6 16:42:57 2009 +0100
8088 [docs] Document the destructor for Timeline
8090 The rest of the API reference lists the destructor for the class
8091 inside the constructor's return value -- except Timeline.
8093 clutter/clutter-timeline.c | 6 ++++--
8094 1 file changed, 4 insertions(+), 2 deletions(-)
8096 commit 41bb88548605948787d53475fce68194ad441db3
8097 Author: Rob Bradford <rob@linux.intel.com>
8098 Date: Tue May 5 20:15:01 2009 +0100
8100 [model] Add a private row mutator to ClutterModelIter
8102 When calling clutter_model_iter_next () / clutter_model_iter_prev () we need
8103 to update the row for the iterator. In order to improve the peformance of
8104 iterating this change adds a private row mutator and switches ClutterListModel
8107 clutter/clutter-list-model.c | 4 ++--
8108 clutter/clutter-model-private.h | 3 +++
8109 clutter/clutter-model.c | 10 ++++++++++
8110 3 files changed, 15 insertions(+), 2 deletions(-)
8112 commit b2fbc2c95c8b3f0bebb6f1f4a8579dd303163078
8113 Author: Rob Bradford <rob@linux.intel.com>
8114 Date: Tue May 5 19:39:26 2009 +0100
8116 [list-model] Use an internal iterator for comparisons
8118 In order to carry out various comparisons for e.g. identifying the first
8119 iterator in the model we need a ClutterModelIter. This change switches from
8120 creating a new iterator each time to reusing an existing iterator.
8122 clutter/clutter-list-model.c | 45 +++++++++++++++++++++++-------------------
8123 1 file changed, 25 insertions(+), 20 deletions(-)
8125 commit 72562cda5847946d9f1d4124290b6c06c7921f2b
8126 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8127 Date: Tue May 5 15:37:41 2009 +0100
8129 [actor] Add ActorFlags accessor methods
8131 The flags field of ClutterActor should have accessor methods for,
8134 Also, the set_flags() and unset_flags() methods should actively
8135 emit notifications for the changed properties.
8137 clutter/clutter-actor.c | 148 +++++++++++++++++++++++++++++++++++++++++++++--
8138 clutter/clutter-actor.h | 17 ++++--
8139 2 files changed, 156 insertions(+), 9 deletions(-)
8141 commit fc991e9b67d659fff143f953fe2996c27f406c8a
8142 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8143 Date: Tue May 5 15:36:29 2009 +0100
8145 [actor] Add the :realized property
8147 The :realized property is the only missing property for an actor flag.
8149 clutter/clutter-actor.c | 46 ++++++++++++++++++++++++++++++++++------------
8150 1 file changed, 34 insertions(+), 12 deletions(-)
8152 commit 353187ce49f681b590ffc02a19fb378e96d42dc3
8153 Author: Robert Bragg <robert@linux.intel.com>
8154 Date: Fri May 1 09:53:20 2009 +0100
8156 [cogl-material] Adds a cogl_material_set_color4f convenience function
8158 This is simply a wrapper around cogl_color_set_from_4f and
8159 cogl_material_set_color. We already had a prototype for this, it was
8160 an oversight that it wasn't already implemented.
8162 clutter/cogl/cogl-material.h | 4 ++--
8163 clutter/cogl/common/cogl-material.c | 12 ++++++++++++
8164 2 files changed, 14 insertions(+), 2 deletions(-)
8166 commit a5cdfdfd87b2fa559460ac117f4ed27474a6f47f
8167 Author: Robert Bragg <robert@linux.intel.com>
8168 Date: Thu Apr 30 22:19:43 2009 +0100
8170 [cogl-offscreen] Cleans up the cogl offscreen API and adds documentation
8172 There were several functions I believe no one is currently using that were
8173 only implemented in the GL backend (cogl_offscreen_blit_region and
8174 cogl_offscreen_blit) that have simply been removed so we have a chance to
8175 think about design later with a real use case.
8177 There was one nonsense function (cogl_offscreen_new_multisample) that
8178 sounded exciting but in all cases it just returned COGL_INVALID_HANDLE
8179 (though at least for GL it checked for multisampling support first!?)
8180 it has also been removed.
8182 The MASK draw buffer type has been removed. If we want to expose color
8183 masking later then I think it at least would be nicer to have the mask be a
8184 property that can be set on any draw buffer.
8186 The cogl_draw_buffer and cogl_{push,pop}_draw_buffer function prototypes
8187 have been moved up into cogl.h since they are for managing global Cogl state
8188 and not for modifying or creating the actual offscreen buffers.
8190 This also documents the API so for example desiphering the semantics of
8191 cogl_offscreen_new_to_texture() should be a bit easier now.
8193 README | 54 ++++++++-------
8194 clutter/clutter-texture.c | 4 +-
8195 clutter/cogl/cogl-offscreen.h | 97 +++++++--------------------
8196 clutter/cogl/cogl-types.h | 4 +-
8197 clutter/cogl/cogl.h.in | 29 ++++++++
8198 clutter/cogl/common/cogl-util.c | 1 -
8199 clutter/cogl/gl/cogl-fbo.c | 109 ++-----------------------------
8200 clutter/cogl/gles/cogl-fbo.c | 91 ++------------------------
8201 clutter/cogl/gles/cogl-texture.c | 5 --
8202 doc/reference/cogl/cogl-sections.txt | 4 +-
8203 tests/interactive/test-cogl-offscreen.c | 4 +-
8204 11 files changed, 104 insertions(+), 298 deletions(-)
8206 commit e47b19822510344e4cae854e99a5ef0a76304980
8207 Author: Havoc Pennington <hp@pobox.com>
8208 Date: Thu Feb 19 22:37:08 2009 -0500
8210 add cogl_push_draw_buffer() and cogl_pop_draw_buffer()
8212 These are necessary if nesting redirections to an fbo,
8213 otherwise there's no way to know how to restore
8216 glPushAttrib(GL_COLOR_BUFFER_BIT) would save draw buffer
8217 state, but also saves a lot of other stuff, and
8218 cogl_draw_buffer() relies on knowing about all draw
8219 buffer state changes. So we have to implement a
8220 draw buffer stack ourselves.
8222 Signed-off-by: Robert Bragg <robert@linux.intel.com>
8224 clutter/cogl/cogl-offscreen.h | 14 +++++++
8225 clutter/cogl/gl/cogl-context.c | 7 +++-
8226 clutter/cogl/gl/cogl-context.h | 8 +++-
8227 clutter/cogl/gl/cogl-fbo.c | 75 ++++++++++++++++++++++++++++++++++++--
8228 clutter/cogl/gles/cogl-context.c | 7 +++-
8229 clutter/cogl/gles/cogl-context.h | 8 +++-
8230 clutter/cogl/gles/cogl-fbo.c | 75 ++++++++++++++++++++++++++++++++++++--
8231 7 files changed, 184 insertions(+), 10 deletions(-)
8233 commit d5fc61102fccf49a9156b2a2bdd2954207d87c38
8234 Author: Robert Bragg <robert@linux.intel.com>
8235 Date: Thu Apr 30 18:00:22 2009 +0100
8237 [cogl] Only expose CoglBitmap as a CoglHandle
8239 It was inconsistent that we exposed the CoglBitmap struct instead of an
8242 clutter/clutter-texture.c | 8 +--
8243 clutter/cogl/cogl-bitmap.h | 78 +++++++++++++++++++++
8244 clutter/cogl/cogl-texture.h | 45 +------------
8245 clutter/cogl/cogl-types.h | 7 --
8246 clutter/cogl/cogl.h.in | 1 +
8247 clutter/cogl/common/Makefile.am | 2 +-
8248 clutter/cogl/common/cogl-bitmap-fallback.c | 2 +-
8249 clutter/cogl/common/cogl-bitmap-pixbuf.c | 2 +-
8250 clutter/cogl/common/cogl-bitmap-private.h | 101 ++++++++++++++++++++++++++++
8251 clutter/cogl/common/cogl-bitmap.c | 25 ++++---
8252 clutter/cogl/common/cogl-bitmap.h | 98 ---------------------------
8253 clutter/cogl/gl/Makefile.am | 2 +
8254 clutter/cogl/gl/cogl-texture-private.h | 2 +-
8255 clutter/cogl/gl/cogl-texture.c | 13 ++--
8256 clutter/cogl/gles/Makefile.am | 2 +
8257 clutter/cogl/gles/cogl-texture-private.h | 2 +-
8258 clutter/cogl/gles/cogl-texture.c | 12 ++--
8259 doc/reference/cogl/cogl-sections.txt | 13 ++--
8260 18 files changed, 235 insertions(+), 180 deletions(-)
8262 commit ee57192f47e38a62828e0f2c1a1f966b7aa4fba3
8263 Author: Robert Bragg <robert@linux.intel.com>
8264 Date: Wed Apr 29 19:49:09 2009 +0100
8266 [cogl-material] make _cogl_material_layer_free check for an invalid texture handle
8268 It is valid in some situations to have a material layer with an invalid texture
8269 handle (e.g. if you setup a texture combine mode before setting the texture)
8270 and so _cogl_material_layer_free needs to check for a valid handle before
8271 attempting to unref it.
8273 clutter/cogl/common/cogl-material.c | 3 ++-
8274 1 file changed, 2 insertions(+), 1 deletion(-)
8276 commit f85377372cc1317f8301a78423e76c668e281f3b
8277 Author: Robert Bragg <robert@linux.intel.com>
8278 Date: Mon Apr 27 15:48:12 2009 +0100
8280 [cogl] Updates all file headers and removes lots of trailing white space
8282 Adds missing notices, and ensures all the notices are consistent. The Cogl
8283 blurb also now reads:
8287 * An object oriented GL/GLES Abstraction/Utility Layer
8289 clutter/cogl/cogl-color.h | 12 ++-
8290 clutter/cogl/cogl-debug.h | 23 ++++
8291 clutter/cogl/cogl-deprecated.h | 23 ++++
8292 clutter/cogl/cogl-fixed.h | 14 ++-
8293 clutter/cogl/cogl-material.h | 23 ++++
8294 clutter/cogl/cogl-matrix.h | 26 +++++
8295 clutter/cogl/cogl-offscreen.h | 14 ++-
8296 clutter/cogl/cogl-path.h | 12 ++-
8297 clutter/cogl/cogl-shader.h | 12 ++-
8298 clutter/cogl/cogl-texture.h | 12 ++-
8299 clutter/cogl/cogl-types.h | 21 ++--
8300 clutter/cogl/cogl-vertex-buffer.h | 17 +--
8301 clutter/cogl/cogl.h.in | 9 +-
8302 clutter/cogl/common/cogl-bitmap-fallback.c | 52 +++++----
8303 clutter/cogl/common/cogl-bitmap-pixbuf.c | 38 ++++---
8304 clutter/cogl/common/cogl-bitmap.c | 40 ++++---
8305 clutter/cogl/common/cogl-clip-stack.c | 8 +-
8306 clutter/cogl/common/cogl-clip-stack.h | 8 +-
8307 clutter/cogl/common/cogl-color.c | 23 ++++
8308 clutter/cogl/common/cogl-current-matrix.c | 11 +-
8309 clutter/cogl/common/cogl-current-matrix.h | 11 +-
8310 clutter/cogl/common/cogl-debug.c | 23 ++++
8311 clutter/cogl/common/cogl-fixed.c | 23 ++++
8312 clutter/cogl/common/cogl-handle.h | 8 +-
8313 clutter/cogl/common/cogl-internal.h | 5 +-
8314 clutter/cogl/common/cogl-material-private.h | 26 +++++
8315 clutter/cogl/common/cogl-material.c | 25 +++++
8316 clutter/cogl/common/cogl-matrix-stack.c | 11 +-
8317 clutter/cogl/common/cogl-matrix-stack.h | 11 +-
8318 clutter/cogl/common/cogl-matrix.c | 26 +++++
8319 clutter/cogl/common/cogl-primitives.c | 122 +++++++++++-----------
8320 clutter/cogl/common/cogl-primitives.h | 8 +-
8321 clutter/cogl/common/cogl-util.c | 16 ++-
8322 clutter/cogl/common/cogl-util.h | 10 +-
8323 clutter/cogl/common/cogl-vertex-buffer-private.h | 15 +--
8324 clutter/cogl/common/cogl-vertex-buffer.c | 17 +--
8325 clutter/cogl/common/cogl.c | 5 +-
8326 clutter/cogl/gl/cogl-context.c | 8 +-
8327 clutter/cogl/gl/cogl-context.h | 8 +-
8328 clutter/cogl/gl/cogl-defines.h.in | 22 ++--
8329 clutter/cogl/gl/cogl-fbo.c | 84 ++++++++-------
8330 clutter/cogl/gl/cogl-fbo.h | 8 +-
8331 clutter/cogl/gl/cogl-internal.h | 8 +-
8332 clutter/cogl/gl/cogl-primitives.c | 8 +-
8333 clutter/cogl/gl/cogl-program.c | 16 ++-
8334 clutter/cogl/gl/cogl-program.h | 8 +-
8335 clutter/cogl/gl/cogl-shader-private.h | 8 +-
8336 clutter/cogl/gl/cogl-shader.c | 10 +-
8337 clutter/cogl/gl/cogl-texture-private.h | 8 +-
8338 clutter/cogl/gl/cogl-texture.c | 13 ++-
8339 clutter/cogl/gl/cogl.c | 4 +-
8340 clutter/cogl/gles/cogl-context.c | 8 +-
8341 clutter/cogl/gles/cogl-context.h | 8 +-
8342 clutter/cogl/gles/cogl-fbo.c | 8 +-
8343 clutter/cogl/gles/cogl-fbo.h | 8 +-
8344 clutter/cogl/gles/cogl-gles2-wrapper.c | 10 +-
8345 clutter/cogl/gles/cogl-gles2-wrapper.h | 8 +-
8346 clutter/cogl/gles/cogl-internal.h | 8 +-
8347 clutter/cogl/gles/cogl-primitives.c | 8 +-
8348 clutter/cogl/gles/cogl-program.c | 12 +--
8349 clutter/cogl/gles/cogl-program.h | 8 +-
8350 clutter/cogl/gles/cogl-shader-private.h | 8 +-
8351 clutter/cogl/gles/cogl-shader.c | 10 +-
8352 clutter/cogl/gles/cogl-texture-private.h | 8 +-
8353 clutter/cogl/gles/cogl-texture.c | 8 +-
8354 clutter/cogl/gles/cogl-util.c | 10 +-
8355 clutter/cogl/gles/cogl-util.h | 10 +-
8356 clutter/cogl/gles/cogl.c | 4 +-
8357 clutter/cogl/gles/stringify.sh | 30 +++++-
8358 69 files changed, 684 insertions(+), 463 deletions(-)
8360 commit 741c4bb5e92c5f7f86188a89b9697b842783d714
8361 Author: Robert Bragg <robert@linux.intel.com>
8362 Date: Fri Apr 24 18:09:52 2009 +0100
8364 [cogl] Adds a bitfield argument to cogl_clear for specifying which buffers to clear
8366 Redundant clearing of depth and stencil buffers every render can be very
8367 expensive, so cogl now gives control over which auxiliary buffers are
8370 Note: For now clutter continues to clear the color, depth and stencil buffer
8374 clutter/clutter-main.c | 5 ++++-
8375 clutter/clutter-stage.c | 5 ++++-
8376 clutter/clutter-texture.c | 8 +++++++-
8377 clutter/cogl/cogl.h.in | 21 ++++++++++++++++++---
8378 clutter/cogl/common/cogl.c | 42 +++++++++++++++++++++++-------------------
8379 6 files changed, 59 insertions(+), 27 deletions(-)
8381 commit fa9efe4828834a62b694232d61124f4b0703d922
8382 Author: Neil Roberts <neil@linux.intel.com>
8383 Date: Thu Apr 30 18:47:59 2009 +0100
8385 Accumulate small deltas
8387 The clutter frame source tries to average out the frame deltas so that
8388 if one frame takes 1 interval plus a little bit of extra time then the
8389 next frame will be 1 interval minus that little bit of extra
8390 time. Therefore the deltas can sometimes be less than the frame
8391 interval. ClutterTimeline should accumulate these small differences
8392 otherwise it will end up missing out frames so the total duration of
8393 the timeline will be a lot longer.
8395 For example this was causing test-actors to appear to run very slow.
8397 clutter/clutter-timeline.c | 4 +++-
8398 1 file changed, 3 insertions(+), 1 deletion(-)
8400 commit cf28c023a051eef96c9aa9c8ebffff75f470470a
8401 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8402 Date: Fri May 1 15:08:42 2009 +0100
8404 [tests] Manually advance the timelines
8406 The units in the Timeline test suite just rely on the timeline
8407 being a timeout automatically advanced by the main loop. This
8408 is not the case anymore, since the merge of the master-clock.
8410 To make the test units work again we need to "emulate" the master
8411 clock without effectively having a stage to redraw; we do this
8412 by creating a frame source and manually advancing the timelines
8413 we create for test purposes, using the advance_msecs() "protected"
8416 tests/conform/test-timeline-dup-frames.c | 40 +++++++++++++++++--
8417 tests/conform/test-timeline-interpolate.c | 52 ++++++++++++++++++++-----
8418 tests/conform/test-timeline-rewind.c | 46 ++++++++++++++++++----
8419 tests/conform/test-timeline-smoothness.c | 41 ++++++++++++++++++--
8420 tests/conform/test-timeline.c | 59 ++++++++++++++++++++++++++++-
8421 5 files changed, 214 insertions(+), 24 deletions(-)
8423 commit 5be29cf9bc6ee5789f4f8473aee8ec72a77034c9
8424 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8425 Date: Fri May 1 15:05:51 2009 +0100
8427 [timeline] Expose the msec advancement
8429 The method of ClutterTimeline that advances the timeline by a
8430 delta (in millisecond) is going to be useful for testing the
8431 timeline's behaviour -- and unbreak the timeline test suite that
8432 was broken by the MasterClock merge.
8434 clutter/clutter-master-clock.c | 2 +-
8435 clutter/clutter-private.h | 3 ---
8436 clutter/clutter-timeline.c | 16 +++++++---------
8437 clutter/clutter-timeline.h | 4 ++++
8438 4 files changed, 12 insertions(+), 13 deletions(-)
8440 commit d7a1a168ba1039cd4711bda60015667dbf1fcb27
8441 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8442 Date: Fri May 1 12:42:37 2009 +0100
8444 [tests] Verify that Clone can paint hidden sources
8446 With the change in commit 87e4e2 painting of hidden source actors
8447 in ClutterClone was fixed. This commit changes the test-actor-clone
8448 to visually verify this.
8450 tests/interactive/test-actor-clone.c | 5 +++++
8451 1 file changed, 5 insertions(+)
8453 commit 71473466fa2cc4783934b2cdbcb709d50a0e37b8
8454 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8455 Date: Fri May 1 12:42:30 2009 +0100
8457 [gitignore] Ignore the new invariants units
8460 1 file changed, 3 insertions(+)
8462 commit 1a87e4e2520a57d26a4e83e7f69f26d2cfab3d4c
8463 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8464 Date: Fri May 1 12:33:42 2009 +0100
8466 [clone] Allow painting hidden source actors
8468 With the introduction of the map/unmap flags and the split of the
8469 visible state from the mapped state we require that every part of
8470 a scene graph branch is mapped in order to be painted. This breaks
8471 the ability of a ClutterClone to paint an hidden source actor.
8473 In order to fix this we need to introduce an override flag, similar
8474 in spirit to the current modelview and paint opacity overrides that
8475 Clone is already using.
8477 The override flag, when set, will force a temporary map on a
8478 Clone source (and its children).
8480 clutter/clutter-actor.c | 129 ++++++++++++++++++++++++++++++++++-----------
8481 clutter/clutter-clone.c | 10 ++++
8482 clutter/clutter-private.h | 3 ++
8483 3 files changed, 112 insertions(+), 30 deletions(-)
8485 commit 5d2d8297e26780d95f46c77d5865c1cb77959d07
8486 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8487 Date: Fri May 1 12:31:06 2009 +0100
8489 [actor] Use foreach_with_internals()
8491 ClutterContainer provides a foreach_with_internals() vfunc for
8492 iterating over all of a container's children, be them added using
8493 the Container API or be them internal to the container itself.
8495 We should be using the foreach_with_internals() function instead
8496 of the plain foreach().
8498 clutter/clutter-actor.c | 55 +++++++++++++++++++++++------------------------
8499 1 file changed, 27 insertions(+), 28 deletions(-)
8501 commit 20cd885c3d6b8fce611c156a491ca93ea7ba13c6
8502 Author: Neil Roberts <neil@linux.intel.com>
8503 Date: Thu Apr 30 15:00:01 2009 +0100
8505 [ClutterTexture] Check before unrefing the fbo_handle
8507 When replacing the fbo_handle with a new handle it first unrefs the
8508 old handle. This was previously a call to cogl_offscreen_unref which
8509 silently ignored attempts to unref COGL_INVALID_HANDLE. However the
8510 new cogl_handle_unref does check for this so we should make sure the
8511 handle is valid to avoid the warning.
8513 clutter/clutter-texture.c | 3 ++-
8514 1 file changed, 2 insertions(+), 1 deletion(-)
8516 commit 4f692cc3ee9089c568952e758406954bc5cf72dd
8517 Author: Neil Roberts <neil@linux.intel.com>
8518 Date: Thu Apr 30 14:32:19 2009 +0100
8520 [ClutterTexture] Attach the FBO texture to a layer in the material
8522 Bug 1565 - test-fbo case failed in many platform
8524 clutter_texture_new_from_actor was broken because it created the FBO
8525 texture but then never attached it to the material so it was never
8526 used for rendering. The old behaviour in Clutter 0.8 was to assign the
8527 texture directly to priv->tex. In 0.9 priv->tex is replaced with
8528 priv->material which has a reference to the tex in layer 0. So putting
8529 the FBO texture directly in layer 0 more closely matches the original
8532 clutter/clutter-texture.c | 47 ++++++++++++++++++++++++++-------------------
8533 1 file changed, 27 insertions(+), 20 deletions(-)
8535 commit 8e6e09c8ef646f20bbcde7fdff02069d0d20167e
8536 Author: Øyvind Kolås <pippin@linux.intel.com>
8537 Date: Thu Apr 30 11:54:09 2009 +0100
8539 [events] Added handling of missing type to clutter_event_get_state
8541 clutter_event_get_state wasn't returning the state for
8542 CLUTTER_BUTTON_RELEASE, the information was there it just needed to
8543 be returned correctly.
8545 clutter/clutter-event.c | 1 +
8546 1 file changed, 1 insertion(+)
8548 commit bb156970defbd7479d512ab5b5aeb78fd1fefd75
8549 Author: Neil Roberts <neil@linux.intel.com>
8550 Date: Wed Mar 25 14:18:00 2009 +0000
8552 Render pango layouts with vertex buffers
8554 When rendering a pango layout CoglPangoRenderer now records the
8555 operations into a list called a CoglPangoDisplayList. The entries in
8556 the list are either glyph renderings from a texture, rectangles or
8557 trapezoids. Multiple consecutive glyph renderings from the same glyph
8558 cache texture are combined into a single entry. Note the
8559 CoglPangoDisplayList has nothing to do with a GL display list.
8561 After the display list is built it is attached to the PangoLayout with
8562 g_object_set_qdata so that next time the layout is rendered it can
8563 bypass rebuilding it.
8565 The glyph rendering entries are drawn via a VBO. The VBO is attached
8566 to the display list so it can be used multiple times. This makes the
8567 common case of rendering a PangoLayout contained in a single texture
8568 subsequent times usually boil down to a single call to glDrawArrays
8569 with an already uploaded VBO.
8571 The VBOs are accessed via the cogl_vertex_buffer API so if VBOs are
8572 not available in GL it will resort to a fallback.
8574 Note this will fall apart if the pango layout is altered after the
8575 first render. I can't find a way to detect when the layout is
8576 altered. However this won't affect ClutterText because it creates a
8577 new PangoLayout whenever any properties are changed.
8579 clutter/pango/Makefile.am | 2 +
8580 clutter/pango/cogl-pango-display-list.c | 330 +++++++++++++++++++++++++++++++
8581 clutter/pango/cogl-pango-display-list.h | 68 +++++++
8582 clutter/pango/cogl-pango-render.c | 145 ++++++++------
8583 4 files changed, 482 insertions(+), 63 deletions(-)
8585 commit 48ac45f060a6b2df7a2adfecd6019ce18ae3db3b
8586 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8587 Date: Wed Apr 29 15:41:12 2009 +0100
8589 [gitignore] Update with the new Model test
8592 1 file changed, 1 insertion(+)
8594 commit d2cd636fb69e313e3105a21f6194b98b4a5cba30
8595 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8596 Date: Wed Apr 29 15:40:13 2009 +0100
8598 [docs] Add ClutterModel::get_filter_set()
8600 doc/reference/clutter/clutter-sections.txt | 1 +
8601 1 file changed, 1 insertion(+)
8603 commit f3e33bd25a0f9710166d5e72524163966f3c2982
8604 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8605 Date: Wed Apr 29 15:39:23 2009 +0100
8607 [tests] Exercise the Model filtering
8609 Add a test unit that exercises the ClutterModel iteration API
8610 when there is a filter in place.
8612 tests/conform/test-conform-main.c | 1 +
8613 tests/conform/test-model.c | 138 +++++++++++++++++++++++++++++++++++--
8614 2 files changed, 133 insertions(+), 6 deletions(-)
8616 commit 01d172293ce3c6dd8576319657ab316c479e6acc
8617 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8618 Date: Wed Apr 29 15:26:05 2009 +0100
8620 [model] Rework Model behaviour with a filter
8622 Currently ClutterModel::get_iter_at_row() ignores whether we have
8623 a filter in place. This also extends to the get_n_rows() method.
8625 The more consistent, more intuitive and surely more correct way to
8626 handle a Model with a filter in place is to take into account the
8627 presence of the filter itself -- that is:
8629 - get_n_rows() should take into account the filter and return the
8630 number of *filtered* rows
8632 - get_iter_at_row() should also take the filter into account and
8633 get the first non-filtered row
8635 These two changes make the ClutterModel with a filter function
8636 behave like a subset of the original Model without a filter in
8639 For instance, given a model with three rows:
8641 - [row 0] <does not match filter>
8642 - [row 1] <matches filter>
8643 - [row 2] <matches filter>
8644 - [row 3] <does not match filter>
8646 The get_n_rows() method will return "2", since only two rows will
8647 match the filter; the get_first_iter() method will ask for the
8648 zero-eth row, which will return an iterator pointing to the contents
8649 of row 1 (but the :row property of the iterator will be set to 0);
8650 the get_last_iter() method will ask for the last row, which will
8651 return an iterator pointing to the contents of row 2 (but the :row
8652 property of the iterator will be set to 1).
8654 This changes will hopefully make the Model API more consistent
8655 in its usage whether there is a filter in place or not.
8657 clutter/clutter-list-model.c | 100 ++++++++++++++++++++-------------
8658 clutter/clutter-model.c | 125 +++++++++++++++++++++++++-----------------
8659 clutter/clutter-model.h | 2 +-
8660 3 files changed, 138 insertions(+), 89 deletions(-)
8662 commit 44fefa2afec991d9b60ae5694e511617b1369d1f
8663 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8664 Date: Wed Apr 29 15:14:40 2009 +0100
8666 [model] Add :filter-set
8668 Currently, there is no way for implementations of the ClutterModel
8669 abstract class to know whether there is a filter in place. Since
8670 subclasses might implement some optimization in case there is no
8671 filter present, we need a simple (and public) API to ask the model
8674 clutter/clutter-model.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++-
8675 clutter/clutter-model.h | 1 +
8676 2 files changed, 67 insertions(+), 1 deletion(-)
8678 commit 9fdc9ca583e1b3e0dd81d7322732156d3eb121b7
8679 Author: Neil Roberts <neil@linux.intel.com>
8680 Date: Tue Apr 21 14:15:19 2009 +0100
8682 [ClutterText] Fix actors with a width but no wrapping and the wrap modes
8684 Setting the wrap mode on the PangoLayout seems to have disappeared
8685 during the text-actor-layout-height branch merge so this brings it
8686 back. The test for this in test-text-cache no longer needs to be
8689 We also shouldn't set the width on the layout if there is no wrapping
8690 or ellipsizing because otherwise it implicitly enables wrapping. This
8691 only matters if the actor gets allocated smaller than its natural
8694 clutter/clutter-text.c | 10 +++++++---
8695 tests/conform/test-text-cache.c | 2 --
8696 2 files changed, 7 insertions(+), 5 deletions(-)
8698 commit e260296cb5a8acef0ba2c9a10b6dec1dca787081
8699 Author: Owen W. Taylor <otaylor@redhat.com>
8700 Date: Fri Feb 27 14:43:47 2009 -0500
8702 [clone] Redraw when the source changes
8704 Bug 1484 - Redraw ClutterClone when the source changes, even for
8707 Connect to ::queue-redraw on the clone source and queue a redraw.
8708 This allows redrawing the Clone when the source changes, even in
8709 case of a non visible source actor.
8711 http://bugzilla.openedhand.com/show_bug.cgi?id=1484
8713 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
8715 clutter/clutter-clone.c | 62 ++++++++++++++++++++++++++++++++---------------
8716 1 file changed, 42 insertions(+), 20 deletions(-)
8718 commit 678f99677fb9f6c1d443da1c27753c5cbe768118
8719 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8720 Date: Sat Mar 21 20:39:32 2009 +0000
8722 Use a single master "clock" to drive timelines
8724 Currently, all timelines install a timeout inside the TimeoutPool
8725 they share. Every time the main loop spins, all the timeouts are
8726 updated. This, in turn, will usually lead to redraws being queued
8729 This behaviour leads to the potential starvation of timelines and
8730 to excessive redraws.
8732 One lesson learned from the games developers is that the scenegraph
8733 should be prepared in its entirety before the GL paint sequence is
8734 initiated. This means making sure that every ::new-frame signal
8735 handler is called before clutter_redraw() is invoked.
8737 In order to do so a TimeoutPool is not enough: we need a master
8738 clock. The clock will be responsible for advancing all the active
8739 timelines created inside a scene, but only when the stage is
8744 + queue_redraw() is invoked on an actor and bubbles up
8747 + if no redraw() has already been scheduled, install an
8748 idle handler with a known priority
8750 + inside the idle handler:
8752 - advance the master clock, which will in turn advance
8753 every playing timeline by the amount of milliseconds
8754 elapsed since the last redraw; this will make every
8755 playing timeline emit the ::new-frame signal
8759 - call the redraw() method of the backend
8761 This way we trade multiple timeouts with a single frame source
8762 that only runs if a timeline is playing and queues redraws on
8765 clutter/Makefile.am | 2 +
8766 clutter/clutter-main.c | 7 +-
8767 clutter/clutter-master-clock.c | 364 ++++++++++++++++++++++++++++++++++++++++
8768 clutter/clutter-master-clock.h | 48 ++++++
8769 clutter/clutter-private.h | 5 +
8770 clutter/clutter-stage.c | 51 ++++--
8771 clutter/clutter-timeline.c | 247 +++++++++------------------
8772 7 files changed, 537 insertions(+), 187 deletions(-)
8774 commit 51f4e9680b599d040d9200cb0bd19a024999c22d
8775 Author: Johan Bilien <jobi@litl.com>
8776 Date: Wed Apr 8 10:33:39 2009 +0100
8778 Relinquish the focus when unmapped while owning it
8780 Bug 1547 - when an actor is unmapped while owning the focus, it should
8783 When an actor is unmapped while owning the focus, the should release it.
8785 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
8787 clutter/clutter-actor.c | 14 ++++++++++++++
8788 1 file changed, 14 insertions(+)
8790 commit 125bded81455df73b37ed459f360ced0135db65a
8791 Author: Havoc Pennington <hp@pobox.com>
8792 Date: Thu Apr 2 09:16:43 2009 -0400
8794 Enforce invariants on mapped, realized, visibility states
8796 Bug 1138 - No trackable "mapped" state
8798 * Add a VISIBLE flag tracking application programmer's
8799 expected showing-state for the actor, allowing us to
8800 always ensure we keep what the app wants while tracking
8801 internal implementation state separately.
8803 * Make MAPPED reflect whether the actor will be painted;
8804 add notification on a ClutterActor::mapped property.
8805 Keep MAPPED state updated as the actor is shown,
8806 ancestors are shown, actor is reparented, etc.
8808 * Require a stage and realized parents to realize; this means
8809 at realization time the correct window system and GL resources
8810 are known. But unparented actors can no longer be realized.
8812 * Allow children to be unrealized even if parent is realized.
8813 Otherwise in effect either all actors or no actors are realized,
8814 i.e. it becomes a stage-global flag.
8816 * Allow clutter_actor_realize() to "fail" if not inside a toplevel
8818 * Rework clutter_actor_unrealize() so internally we have
8819 a flavor that does not mess with visibility flag
8821 * Add _clutter_actor_rerealize() to encapsulate a somewhat
8822 tricky operation we were doing in a couple of places
8824 * Do not realize/unrealize children in ClutterGroup,
8825 ClutterActor already does it
8827 * Do not realize impl by hand in clutter_stage_show(),
8828 since showing impl already does that
8830 * Do not unrealize in various dispose() methods, since
8831 ClutterActor dispose implementation already does it
8832 and chaining up is mandatory
8834 * ClutterTexture uses COGL while unrealizable (before it's
8835 added to a stage). Previously this breakage was affecting
8836 ClutterActor because we had to allow realize outside
8837 a stage. Move the breakage to ClutterTexture, by making
8838 ClutterTexture just use COGL while not realized.
8840 * Unrealize before we set parent to NULL in clutter_actor_unparent().
8841 This means unrealize() implementations can get to the stage.
8842 Because actors need the stage in order to detach from stage.
8844 * Update clutter-actor-invariants.txt to reflect latest changes
8846 * Remove explicit hide/unrealize from ClutterActor::dispose since
8847 unparent already forces those
8848 Instead just assert that unparent() occurred and did the right thing.
8850 * Check whether parent implements unrealize before chaining up
8851 Needed because ClutterGroup no longer has to implement unrealize.
8853 * Perform unrealize in the default handler for the signal.
8854 This allows non-containers that have children to work properly,
8855 and allows containers to override how it's done.
8857 * Add map/unmap virtual methods and set MAPPED flag on self and
8858 children in there. This allows subclasses to hook map/unmap.
8859 These are not signals, because notify::mapped is better for
8860 anything it's legitimate for a non-subclass to do.
8862 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
8864 clutter/clutter-actor.c | 813 +++++++++++++++++++++++++++++----
8865 clutter/clutter-actor.h | 12 +-
8866 clutter/clutter-group.c | 18 -
8867 clutter/clutter-private.h | 4 +
8868 clutter/clutter-stage.c | 60 +--
8869 clutter/clutter-texture.c | 81 ++--
8870 clutter/eglnative/clutter-stage-egl.c | 5 +-
8871 clutter/eglx/clutter-stage-egl.c | 6 +-
8872 clutter/fruity/clutter-fruity.c | 4 +
8873 clutter/fruity/clutter-stage-fruity.c | 5 +-
8874 clutter/glx/clutter-stage-glx.c | 12 +-
8875 clutter/sdl/clutter-stage-sdl.c | 2 -
8876 clutter/win32/clutter-stage-win32.c | 15 +-
8877 clutter/x11/clutter-stage-x11.c | 69 +--
8878 doc/clutter-actor-invariants.txt | 180 ++++++--
8879 tests/conform/test-actor-invariants.c | 129 +++++-
8880 tests/conform/test-conform-main.c | 3 +
8881 17 files changed, 1142 insertions(+), 276 deletions(-)
8883 commit b73ee6992c68559f04f8d3e42d337b1c39a57933
8884 Author: Johan Bilien <jobi@via.ecp.fr>
8885 Date: Fri Apr 24 15:07:49 2009 +0100
8887 Unnecessary glColorMask on alpha drops performance
8889 Bug 1228 - Unnecessary glColorMask on alpha drops performance
8891 With DRI2, alpha is allowed in the window's framebuffer
8893 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
8895 clutter/cogl/gl/cogl-fbo.c | 8 +-------
8896 1 file changed, 1 insertion(+), 7 deletions(-)
8898 commit 08ba42a5ab4d42a76b4c1ff30bf37d6e3177de11
8899 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8900 Date: Fri Apr 24 15:05:02 2009 +0100
8902 Allow passing the pick mode to get_actor_at_pos()
8904 Bug 1513 - Allow passing in ClutterPickMode to
8905 clutter_stage_get_actor_at_pos()
8907 At the moment, clutter_stage_get_actor_at_pos() uses CLUTTER_PICK_ALL
8908 internally to find an actor. It would be useful to allow passing in
8909 ClutterPickMode to clutter_stage_get_actor_at_pos(), so that the caller
8910 can specify CLUTTER_PICK_REACTIVE as a criteria.
8912 clutter/clutter-private.h | 6 ------
8913 clutter/clutter-stage.c | 16 +++++++++++-----
8914 clutter/clutter-stage.h | 17 +++++++++++++++++
8915 doc/reference/clutter/clutter-sections.txt | 1 +
8916 tests/conform/test-pick.c | 1 +
8917 tests/interactive/test-actor-clone.c | 4 +++-
8918 tests/interactive/test-actors.c | 4 +++-
8919 tests/interactive/test-paint-wrapper.c | 2 +-
8920 tests/interactive/test-project.c | 4 +++-
8921 tests/interactive/test-unproject.c | 4 +++-
8922 10 files changed, 43 insertions(+), 16 deletions(-)
8924 commit 60645727036d9b0945b9ce71606d6067a54dd1e7
8925 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8926 Date: Fri Apr 24 14:59:18 2009 +0100
8928 [x11] Use XWithdrawWindow()
8930 Bug 1516 - Does not withdraw toplevels correctly
8932 clutter_stage_x11_hide() needs to use XWithdrawWindow(), not
8935 As it stands now, if the window is already unmapped (say the WM has
8936 minimized it), then the WM will not know that Clutter has closed the
8937 window and will keep the window managed, showing it in the task list
8940 clutter/x11/clutter-stage-x11.c | 2 +-
8941 1 file changed, 1 insertion(+), 1 deletion(-)
8943 commit 4f663384c77788e5d8b64c02175d7c8c5a0415de
8944 Author: Havoc Pennington <hp@pobox.com>
8945 Date: Mon Mar 23 10:15:00 2009 -0400
8947 Add ClutterContainer::foreach_with_internals()
8949 Bug 1517 - clutter_container_foreach_with_internals()
8951 This allows us to iterate over all children (for things like maintaining
8952 map/realize invariants) or only children that apps added and care about.
8954 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
8956 clutter/clutter-container.c | 40 +++++++++++++++++++++++++++++++++++++++-
8957 clutter/clutter-container.h | 34 ++++++++++++++++++++--------------
8958 2 files changed, 59 insertions(+), 15 deletions(-)
8960 commit 27bea43a4d7b792159622ad67f1ddbb0919f3d94
8961 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8962 Date: Thu Apr 23 11:38:58 2009 +0100
8964 [docs] Increase verbosity for commit messages
8966 Apparently, not everyone read the HACKING file, especially the
8967 section about commit messages. This lead to some confusion with
8968 regards to the acceptable (i.e. mandatory) format for commit
8969 messages in Clutter. Let's clarify it a little bit before I start
8970 enforcing it and reverting commits.
8972 HACKING | 48 ++++++++++++++++++++++++++++++++++++------------
8973 1 file changed, 36 insertions(+), 12 deletions(-)
8975 commit d6ccecd79e40f5d5887b81f22bc969216d09c8d5
8976 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8977 Date: Thu Apr 23 11:35:10 2009 +0100
8979 [alpha] Sanitize easing equations
8981 Bug 1561 - Bad code in clutter-alpha.c
8983 The implementation of the easing modes equations followed closely
8984 the JavaScript and ActionScript counterparts. Obviously, JS and AS
8985 are not C-compatible, so later versions of gcc (4.4.0 for instance)
8986 would complain about uninitialized variables and such. The code is
8987 also obfuscated and hard to debug/understand.
8989 For these reasons, the implementation should be unobfuscated and
8992 clutter/clutter-alpha.c | 157 ++++++++++++++++++++++++++++++++---------------
8993 1 file changed, 108 insertions(+), 49 deletions(-)
8995 commit 1d2ac51ea34cae9e94e6d5f831db13f0ac3613d8
8996 Author: Robert Bragg <robert@linux.intel.com>
8997 Date: Fri Apr 17 19:05:21 2009 +0100
8999 [x11-texture-pixmap] Fixes a reported lockup due to an undesireable X server grab
9001 A lockup was reported by fargoilas on #clutter and removing the server grab in
9002 clutter_x11_texture_pixmap_sync_window fixed the problem.
9004 We were doing an x server grab to guarantee that if the XGetWindowAttributes
9005 request reported that our redirected window was viewable then we would also
9006 be able to get a valid pixmap name. (the composite protocol says it's an
9007 error to request a name for a window if it's not viewable) Without the grab
9008 there would be a race condition.
9010 Instead we now handle error conditions gracefully.
9012 clutter/x11/clutter-x11-texture-pixmap.c | 50 +++++++++++++++++-------------
9013 1 file changed, 29 insertions(+), 21 deletions(-)
9015 commit ffefbe466100f72eed7ce760512253f0b90786fe
9016 Author: Emmanuele Bassi <ebassi@gnome.org>
9017 Date: Thu Apr 2 10:28:37 2009 +0100
9019 [text] Avoid a Pango warning with empty markup
9021 When the markup string is empty Pango complains about invalid
9024 clutter/clutter-text.c | 12 +++++++++---
9025 1 file changed, 9 insertions(+), 3 deletions(-)
9027 commit bced9c65e73e94d206c1c98e824dee9c83783010
9028 Author: Neil Roberts <neil@linux.intel.com>
9029 Date: Fri Mar 27 21:55:40 2009 +0000
9031 [test-pick] Improve to include a covering actor
9033 Three tests are now performed on the picked squares. First there is no
9034 covering actor which is the same as the original test. Then there is a
9035 hidden covering actor which should not affect the results. Finally
9036 there is a covering actor with a clip set on it so that only actors
9037 at the borders of the stage should be pickable.
9039 tests/conform/test-pick.c | 115 +++++++++++++++++++++++++++++++++------------
9040 1 file changed, 84 insertions(+), 31 deletions(-)
9042 commit 77dc4fd66bdd649ba3705a59b26c75dc5e891bd3
9043 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9044 Date: Tue Apr 21 12:09:59 2009 +0100
9046 [tests] Disable a subtest of the Text cache unit
9048 The wrap mode sub-test inside the ClutterText layout cache test
9049 unit has been broken by the recent changes inside the Text actor.
9051 The sub-test itself might require tweaking.
9053 tests/conform/test-text-cache.c | 6 +++++-
9054 1 file changed, 5 insertions(+), 1 deletion(-)
9056 commit 1c42e6334e535dbd9015c20810a6560195803f1c
9057 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9058 Date: Tue Apr 21 12:06:14 2009 +0100
9060 [text] Emit ::cursor-event only on changes
9062 The documentation for the ::cursor-event says that the signal
9063 is emitted only when the cursor position changes. Right now it
9064 is being emitted every time we ensure the cursor position during
9065 the Text paint sequence.
9067 The clutter_text_ensure_cursor_position() function should check
9068 whether the stored cursor position has changed since the last
9069 paint, and emit the ::cursor-event signal only when there has
9072 clutter/clutter-text.c | 23 ++++++++++++++++++-----
9073 1 file changed, 18 insertions(+), 5 deletions(-)
9075 commit 4518cf140cbe77e5f4ac111a76f78dd34dffd18c
9076 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9077 Date: Tue Apr 21 12:03:41 2009 +0100
9079 [tests] Visually verify ellipsization
9081 Verify that the non-editable, single line entries are still
9082 correctly ellipsized when a maximum width is set.
9084 tests/interactive/test-text-field.c | 13 +++++++++----
9085 1 file changed, 9 insertions(+), 4 deletions(-)
9087 commit 368f61fa650bbf148fcfe029778d79a7046cc882
9088 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9089 Date: Tue Apr 21 12:01:52 2009 +0100
9091 [text] Return the correct minimum height
9093 The correct minimum height in case of ellipsis is still 1px.
9095 clutter/clutter-text.c | 2 +-
9096 1 file changed, 1 insertion(+), 1 deletion(-)
9098 commit 5c8263ecb7e3e942c355a62d36934b6935ebb813
9099 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9100 Date: Tue Apr 21 11:59:38 2009 +0100
9102 [text] Limit the Layout width
9104 We only want to eschew the pango_layout_set_width() on editable,
9105 single-line Text actors because they can "scroll" the PangoLayout.
9107 This fixes the ellipsization on entries.
9109 clutter/clutter-text.c | 8 ++++----
9110 1 file changed, 4 insertions(+), 4 deletions(-)
9112 commit e4d3b0536f955a4e5317d0f195c814a2e6d4e1f9
9113 Author: Robert Bragg <robert@linux.intel.com>
9114 Date: Mon Apr 20 12:36:43 2009 +0100
9116 [gl/cogl.c] #include <gmodule.h> for OS X builds
9118 In unifying the {gl,gles}/cogl.c code recently, moving most of the code into
9119 common/cogl.c the gmodule.h include was also mistakenly moved.
9121 Thanks to Felix Rabe for reporting this issue.
9123 Note: I haven't tested this fix myself, as I'm not set up to be able to
9126 clutter/cogl/common/cogl.c | 1 -
9127 clutter/cogl/gl/cogl.c | 1 +
9128 2 files changed, 1 insertion(+), 1 deletion(-)
9130 commit 46c20f1523d6317a49b3df5843f217cced8d3f6d
9131 Author: Robert Bragg <robert@linux.intel.com>
9132 Date: Wed Apr 15 19:25:55 2009 +0100
9134 [cogl vertex buffers] Adds fallbacks for drivers without VBO support
9136 Buffer objects aren't currently available for glx indirect contexts, so we
9137 now have a fallback that simply allocates fake client side vbos to store the
9140 clutter/cogl/common/cogl-vertex-buffer-private.h | 5 +-
9141 clutter/cogl/common/cogl-vertex-buffer.c | 149 +++++++++++++++++-----
9142 clutter/cogl/gles/cogl.c | 2 +
9143 3 files changed, 121 insertions(+), 35 deletions(-)
9145 commit ac21e7b182d08cdbdcb5f4e0f2fd44a23e7e8d93
9146 Author: Robert Bragg <robert@linux.intel.com>
9147 Date: Fri Apr 17 15:10:55 2009 +0100
9149 [cogl debug] --cogl-debug=rectangles now outlines all cogl rectangles
9151 This makes the #if 0'd debug code that was in _cogl_journal_flush_quad_batch
9152 - which we have repeatedly found usefull for debugging various geometry
9153 issues in Clutter apps - a runtime debug option.
9155 The outline colors rotate in order from red to green to blue which can also
9156 help confirm the order that your geometry really drawn.
9158 The outlines are not affected by the current material state, so if you e.g.
9159 have a blending bug where geometry mysteriously disappears this can confirm
9160 if the underlying rectangles are actually being emitted but blending is
9161 causing them to be invisible.
9163 clutter/cogl/cogl-debug.h | 15 ++++++++-------
9164 clutter/cogl/common/cogl-debug.c | 3 ++-
9165 clutter/cogl/common/cogl-primitives.c | 7 +++----
9166 3 files changed, 13 insertions(+), 12 deletions(-)
9168 commit 169d472d17113416ea7e6c4eea4abda92c54e934
9169 Author: Robert Bragg <robert@linux.intel.com>
9170 Date: Fri Apr 17 14:53:24 2009 +0100
9172 Use $(MAINTAINER_CFLAGS) in clutter/{x11,glx}/Makefile.am
9174 These makefile weren't resulting in the addition of the maintainer flags while
9177 clutter/glx/Makefile.am | 1 +
9178 clutter/x11/Makefile.am | 1 +
9179 2 files changed, 2 insertions(+)
9181 commit 5c50be1bdc3bf5d4f060324c23f5a0ca906dee42
9182 Author: Bastian Winkler <buz@netbuz.org>
9183 Date: Thu Apr 16 13:06:58 2009 +0200
9185 Prevent a possible zero division
9187 A zero division might occur in clutter_path_get_position if the length
9188 of a curved node is zero.
9190 Signed-off-by: Neil Roberts <neil@linux.intel.com>
9192 clutter/clutter-path.c | 13 +++++++++----
9193 1 file changed, 9 insertions(+), 4 deletions(-)
9195 commit 56ac4baf17e5917c738257d8beab7a583c793fcb
9196 Author: Chris Lord <chris@linux.intel.com>
9197 Date: Thu Apr 16 16:34:15 2009 +0100
9199 [ClutterText] Return 1 for min width when editable
9201 Editable ClutterText will scroll when allocated less width than is
9202 necessary to lay out the entire layout on a single line, so return 1 for
9203 the minimum width in this case.
9205 Approved by Emmanuele Bassi, fixes bug #1555.
9207 clutter/clutter-text.c | 2 +-
9208 1 file changed, 1 insertion(+), 1 deletion(-)
9210 commit 425fa78a27b9182f60d64ed08f1b470e96539908
9211 Merge: d4b47af fbd9c59
9212 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9213 Date: Wed Apr 15 18:08:14 2009 +0100
9215 Merge branch 'text-actor-layout-height'
9217 * text-actor-layout-height:
9218 [clutter-text] Fix ellipsizing
9219 Support pango_layout_set_height() in ClutterText
9222 clutter/clutter-text.c
9224 commit d4b47af153a31eeac12dc5d2ba7f62fdcde833b1
9225 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9226 Date: Wed Apr 15 17:27:04 2009 +0100
9228 [stage] Warn if perspective's z_far - z_near is 0
9230 Since we have to do (z_far - z_near) and use it in a division we
9231 should check that the user is not passing a value that would
9232 cause a division by zero.
9234 clutter/clutter-stage.c | 1 +
9235 1 file changed, 1 insertion(+)
9237 commit 709bb69970ff2b8c2caa27aa0f4b43a9ce763901
9238 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9239 Date: Wed Apr 15 17:25:50 2009 +0100
9241 Add debug annotations for the layout process
9243 If we need to check that the layout sequence is correct in
9244 terms of order of execution and with respect to caching, then
9245 having a CLUTTER_DEBUG_LAYOUT debug flag would make things
9248 clutter/clutter-actor.c | 38 ++++++++++++++++++++++++++++++--------
9249 clutter/clutter-debug.h | 3 ++-
9250 clutter/clutter-main.c | 3 ++-
9251 3 files changed, 34 insertions(+), 10 deletions(-)
9253 commit f8256e4b23af2ab8f3849ab3fae2747f01a6324b
9254 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9255 Date: Wed Apr 15 17:23:45 2009 +0100
9257 [text] Do not ellipsize non-editable layouts
9259 If a ClutterText is set as non-editable then its PangoLayout
9260 will occupy as much width as its contents and ignore the
9261 ellipsization setting.
9263 clutter/clutter-text.c | 4 ++--
9264 1 file changed, 2 insertions(+), 2 deletions(-)
9266 commit fbd9c59c7cb7901ec208d05416454a68c7329cfd
9267 Author: Neil Roberts <neil@linux.intel.com>
9268 Date: Wed Apr 15 14:46:45 2009 +0100
9270 [clutter-text] Fix ellipsizing
9272 Ellipsizing was effectively broken for two reasons. There was a typo
9273 in the code to set the width so it always ended up being some massive
9274 value. If no height should be set on the layout it was being set to
9275 G_MAXINT. Setting a height greater than 0 enables wrapping which so
9276 ellipsizing is not performed. It should be left at the default of -1
9279 clutter/clutter-text.c | 4 +---
9280 1 file changed, 1 insertion(+), 3 deletions(-)
9282 commit 5af99660cb7fdb76ab2a55288bce7342f5e04761
9283 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9284 Date: Wed Apr 15 12:18:55 2009 +0100
9286 [json] Avoid leaks on error code paths
9288 Bug 1476 - JSON Parser memory leak
9290 Static analysis of the code showed that the in-tree copy of
9291 the JsonParser object leaks objects and arrays on parse errors.
9293 Thanks to Gordon Williams <gordon.williams@collabora.co.uk>
9295 clutter/json/json-parser.c | 14 +++++++++++++-
9296 1 file changed, 13 insertions(+), 1 deletion(-)
9298 commit 269598a2cfa147b4d8361789356aba8318bde434
9299 Author: Øyvind Kolås <pippin@linux.intel.com>
9300 Date: Wed Apr 8 18:18:31 2009 +0100
9302 [group] avoid double evaluation of arguments in clutter_group_add
9304 clutter_group_add would evaluate the actor argument twice, which is
9305 bad if this is a function call creating a new actor and not a variable.
9307 clutter/clutter-group.h | 4 ++--
9308 1 file changed, 2 insertions(+), 2 deletions(-)
9310 commit a9f24351e9a4b354a23f86b7aff7096a33195543
9311 Author: Neil Roberts <neil@linux.intel.com>
9312 Date: Tue Apr 7 15:24:48 2009 +0100
9314 Fix fullscreening when the stage is unrealized and on dual-head
9316 If the stage is unrealized (such as will be the case if the stage was
9317 created with clutter_stage_new) then it would set the size of the
9318 stage display but it was not setting the fullscreen_on_map flag so it
9319 never got the _NET_WM_STATE_FULLSCREEN property. Now it always sets
9320 the flag regardless of whether the window is created yet.
9322 There was also problems with dual-headed displays because in that case
9323 DisplayWidth/Height will return the size of the combined display but
9324 Metacity (and presumably other WMs) will sensibly try fit the window
9325 to only one of the monitors. However we were setting the size hints so
9326 that the minimum size is that of the combined display. Metacity tries
9327 to honour this by setting the minimum size but then it no longer
9328 positions the window at the top left of the screen.
9330 The patch makes it avoid setting the minimum size when the stage is
9331 fullscreen by checking the fullscreen_on_map flag. This also means we
9332 can remove the static was_resizable flag which would presumably have
9333 caused problems for multi-stage.
9335 clutter/x11/clutter-stage-x11.c | 57 +++++++++++++++++++++------------------
9336 1 file changed, 31 insertions(+), 26 deletions(-)
9338 commit 1edc19d1d33453bee85fb2b4bdb21a18c0089535
9339 Author: Neil Roberts <neil@linux.intel.com>
9340 Date: Mon Apr 6 15:22:31 2009 +0100
9342 [clutter-text] Add a separate property for the selection color
9344 Adds a new property so that the selection color can be different from
9345 the cursor color. If no selection color is specified it will use the
9346 cursor color as before. If no cursor color is specified either it will
9349 clutter/clutter-text.c | 193 ++++++++++++++++++++++------
9350 clutter/clutter-text.h | 4 +
9351 doc/reference/clutter/clutter-sections.txt | 2 +
9352 3 files changed, 160 insertions(+), 39 deletions(-)
9354 commit 3fdacf97624a0bdbe6360c5561a7d7adcfcb8645
9355 Author: Neil Roberts <neil@linux.intel.com>
9356 Date: Mon Apr 6 12:43:16 2009 +0100
9358 [cogl-handle] Fix the broken debug macros
9360 The debug macros for tracking reference counting of CoglHandles had
9361 some typos introduced in c3d9f0 which meant it failed to compile when
9364 clutter/cogl/common/cogl-handle.h | 4 ++--
9365 1 file changed, 2 insertions(+), 2 deletions(-)
9367 commit e464acff7ab83b29291992cca1e3043b8c65823e
9368 Author: Robert Bragg <robert@linux.intel.com>
9369 Date: Sat Apr 4 19:02:01 2009 +0100
9371 [cogl] cogl_is_*(): Don't dereference an invalid handle; just return FALSE
9373 An invalid handle is implicitly not of any type.
9375 clutter/cogl/common/cogl-handle.h | 3 +++
9376 1 file changed, 3 insertions(+)
9378 commit fff5585b5f4d4f885090a3bfae5c4757d6d7447f
9379 Author: Neil Roberts <neil@linux.intel.com>
9380 Date: Mon Apr 6 11:14:43 2009 +0100
9382 [cogl-pango-render] Fix returning to default color after a color attribute
9384 Since the Cogl material branch merge when changing the color of a part
9385 using pango attributes (such as using <span color="red" /> markup)
9386 then it wouldn't return to the default color for the rest of the
9387 layout. pango_renderer_get_color returns NULL if there is no color
9388 override in which case it needs to revert to the color specified as
9389 the argument to cogl_pango_render_layout. The 'color' member of
9390 CoglPangoRenderer has been reinstated to store that default color and
9391 now cogl_pango_render_set_color_for_part is the only place that sets
9394 clutter/pango/cogl-pango-render.c | 31 ++++++++++++++-----------------
9395 1 file changed, 14 insertions(+), 17 deletions(-)
9397 commit a1cc1f57aca703e85a4c475a2c097a9dacff066a
9398 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9399 Date: Sun Apr 5 20:32:15 2009 +0100
9401 [animation] Do not connect to ::completed multiple times
9403 The clutter_actor_animate*() family of functions should only connect
9404 to the Animation::completed signal once, during the construction of
9405 the Animation object attached to the Actor. Otherwise, the completed
9406 signal handler will be run multiple times, and will try to unref()
9407 the Animation for each call -- leading to a segmentation fault.
9409 clutter/clutter-animation.c | 36 ++++++++++++++++++++++++++++--------
9410 1 file changed, 28 insertions(+), 8 deletions(-)
9412 commit 6bf883da6cbc53b1bbff82f8a4b29227758158cf
9413 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9414 Date: Fri Apr 3 14:19:20 2009 +0100
9416 [animation] Add the ::started signal
9418 The Animation class is missing a ::started signal matching the
9419 ::completed one. A ::started signal is useful for debugging,
9420 initial state set up, and checks.
9422 clutter/clutter-animation.c | 61 ++++++++++++++++++++++++++++++++++++++++---
9423 clutter/clutter-animation.h | 2 ++
9424 2 files changed, 60 insertions(+), 3 deletions(-)
9426 commit 17627959902edb7a61daccb991a329f8a89ee109
9427 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9428 Date: Fri Apr 3 13:36:30 2009 +0100
9430 [group] Fix compilation
9432 A case of rebase FAIL. The sorting of the children was still
9433 done using the now removed group function call instead of the
9436 clutter/clutter-group.c | 4 +---
9437 1 file changed, 1 insertion(+), 3 deletions(-)
9439 commit df738d0a8c601a9d8afde7273717ebd926d90eda
9440 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9441 Date: Fri Apr 3 12:39:35 2009 +0100
9443 [animation] Do not unref on ::complete by default
9445 Bug 1535 - Complete animation always unrefs ClutterAnimation (even
9446 after g_object_ref_sink)
9448 Animations created through clutter_animation_new() should not
9449 automagically unref themselves by default on ::complete. We
9450 only want that behaviour for Animations created by the
9451 clutter_actor_animate* family of functions, since those provide
9452 the automagic memory management.
9454 clutter/clutter-animation.c | 51 ++++++++++++++++++++++++-------------------
9455 1 file changed, 29 insertions(+), 22 deletions(-)
9457 commit bd8d3f6bd87558438420b488df252f5b04a3316e
9458 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9459 Date: Wed Apr 1 11:22:42 2009 +0100
9461 [group] Remove long deprecated API
9463 ClutterGroup still ships with API deprecated since 0.4. We did
9464 promise to keep it around for a minor release cycle -- not for 3.
9466 Since we plan on shipping 1.0 without the extra baggage of the
9467 deprecated entry points, here's the chance to remove the accumulated
9470 All the removed methods and signals have a ClutterContainer
9473 clutter/clutter-group.c | 212 +---------------------------
9474 clutter/clutter-group.h | 23 ---
9475 doc/reference/clutter/clutter-sections.txt | 6 -
9476 3 files changed, 6 insertions(+), 235 deletions(-)
9478 commit 9d0ce68c2fafbe484129c09f82dc20f955b99310
9479 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9480 Date: Wed Apr 1 11:08:28 2009 +0100
9482 [shader] Remove deprecated set_uniform_1f()
9484 Since we're planning to release 1.0 without any of the deprecated
9485 API baggage, we can simply remove the set_uniform_1f() method from
9486 ClutterShader public API and add it to the deprecated header.
9488 clutter/clutter-deprecated.h | 2 ++
9489 clutter/clutter-shader.c | 25 -------------------------
9490 clutter/clutter-shader.h | 6 ------
9491 doc/reference/clutter/clutter-sections.txt | 1 -
9492 4 files changed, 2 insertions(+), 32 deletions(-)
9494 commit c3d9f0bed4680dd0aa10b3a52ade23d9f0597212
9495 Author: Robert Bragg <robert@linux.intel.com>
9496 Date: Wed Apr 1 17:16:44 2009 +0100
9498 [cogl-handle] Optimize how we define cogl handles
9500 The cogl_is_* functions were showing up quite high on profiles due to
9501 iterating through arrays of cogl handles.
9503 This does away with all the handle arrays and implements a simple struct
9504 inheritance scheme. All cogl objects now add a CoglHandleObject _parent;
9505 member to their main structures. The base object includes 2 members a.t.m; a
9506 ref_count, and a klass pointer. The klass in turn gives you a type and
9507 virtual function for freeing objects of that type.
9509 Each handle type has a _cogl_##handle_type##_get_type () function
9510 automatically defined which returns a GQuark of the handle type, so now
9511 implementing the cogl_is_* funcs is just a case of comparing with
9514 Another outcome of the re-work is that cogl_handle_{ref,unref} are also much
9515 more efficient, and no longer need extending for each handle type added to
9516 cogl. The cogl_##handle_type##_{ref,unref} functions are now deprecated and
9517 are no longer used internally to Clutter or Cogl. Potentially we can remove
9518 them completely before 1.0.
9520 clutter/clutter-shader.c | 6 +-
9521 clutter/clutter-texture.c | 30 ++--
9522 clutter/cogl/common/cogl-handle.h | 171 +++++++++++-----------
9523 clutter/cogl/common/cogl-material-private.h | 5 +-
9524 clutter/cogl/common/cogl-material.c | 31 ++--
9525 clutter/cogl/common/cogl-util.c | 45 ++----
9526 clutter/cogl/common/cogl-vertex-buffer-private.h | 7 +-
9527 clutter/cogl/common/cogl-vertex-buffer.c | 7 +-
9528 clutter/cogl/gl/cogl-context.c | 25 +---
9529 clutter/cogl/gl/cogl-context.h | 13 --
9530 clutter/cogl/gl/cogl-fbo.c | 5 +-
9531 clutter/cogl/gl/cogl-fbo.h | 6 +-
9532 clutter/cogl/gl/cogl-program.c | 5 +-
9533 clutter/cogl/gl/cogl-program.h | 4 +-
9534 clutter/cogl/gl/cogl-shader-private.h | 4 +-
9535 clutter/cogl/gl/cogl-shader.c | 5 +-
9536 clutter/cogl/gl/cogl-texture-private.h | 3 +-
9537 clutter/cogl/gl/cogl-texture.c | 16 +-
9538 clutter/cogl/gles/cogl-context.c | 25 +---
9539 clutter/cogl/gles/cogl-context.h | 13 --
9540 clutter/cogl/gles/cogl-fbo.c | 5 +-
9541 clutter/cogl/gles/cogl-fbo.h | 6 +-
9542 clutter/cogl/gles/cogl-program.c | 9 +-
9543 clutter/cogl/gles/cogl-program.h | 3 +-
9544 clutter/cogl/gles/cogl-shader-private.h | 4 +-
9545 clutter/cogl/gles/cogl-shader.c | 5 +-
9546 clutter/cogl/gles/cogl-texture-private.h | 3 +-
9547 clutter/cogl/gles/cogl-texture.c | 16 +-
9548 clutter/pango/cogl-pango-glyph-cache.c | 10 +-
9549 tests/conform/test-backface-culling.c | 2 +-
9550 tests/conform/test-npot-texture.c | 2 +-
9551 tests/conform/test-vertex-buffer-contiguous.c | 6 +-
9552 tests/conform/test-vertex-buffer-interleved.c | 2 +-
9553 tests/conform/test-vertex-buffer-mutability.c | 2 +-
9554 tests/interactive/test-clip.c | 2 +-
9555 tests/interactive/test-cogl-multitexture.c | 8 +-
9556 tests/interactive/test-cogl-offscreen.c | 4 +-
9557 tests/interactive/test-cogl-tex-convert.c | 2 +-
9558 tests/interactive/test-cogl-tex-foreign.c | 2 +-
9559 tests/interactive/test-cogl-tex-getset.c | 2 +-
9560 tests/interactive/test-cogl-tex-polygon.c | 4 +-
9561 tests/interactive/test-cogl-tex-tile.c | 2 +-
9562 tests/interactive/test-cogl-vertex-buffer.c | 2 +-
9563 43 files changed, 209 insertions(+), 320 deletions(-)
9565 commit 04ebd6be44d7641abc73a80f61606178f1861e66
9566 Author: Robert Bragg <robert@linux.intel.com>
9567 Date: Thu Apr 2 11:50:44 2009 +0100
9569 [cogl] handle_automatic_blend_enable(): consider layers with invalid textures
9571 A layer object may be instantiated when setting a combine mode, but before a
9572 texture is associated. (e.g. this is done by the pango renderer) if this is the
9573 case we shouldn't call cogl_texture_get_format() with an invalid cogl handle.
9575 This patch skips over layers without a texture handle when determining if any
9576 textures have an alpha channel.
9578 clutter/cogl/common/cogl-material.c | 6 ++++++
9579 1 file changed, 6 insertions(+)
9581 commit 8a1b4f8326ff60164029c85d40482e369eeaafa8
9582 Author: Robert Bragg <robert@linux.intel.com>
9583 Date: Mon Mar 30 17:07:31 2009 +0100
9585 Unifies 90% of the code in {gl,gles}/cogl.c in common/cogl.c
9587 This code keeps on diverging and we get bugs and fixes in one version but
9588 not the other. This should make things a bit more maintainable.
9590 clutter/cogl/common/Makefile.am | 1 +
9591 clutter/cogl/common/cogl-internal.h | 95 ++++++
9592 clutter/cogl/common/cogl.c | 640 +++++++++++++++++++++++++++++++++++
9593 clutter/cogl/gl/cogl.c | 608 +--------------------------------
9594 clutter/cogl/gles/cogl-internal.h | 3 +
9595 clutter/cogl/gles/cogl.c | 584 +-------------------------------
9596 6 files changed, 749 insertions(+), 1182 deletions(-)
9598 commit 50c1fc6291650c80d2182162621dc5e2d5976d57
9599 Author: Robert Bragg <robert@linux.intel.com>
9600 Date: Mon Mar 30 16:41:02 2009 +0100
9602 Removes cogl_blend_func prototype from cogl-internal.h
9604 cogl_blend_func was removed a while ago so this was just a left over from then
9606 clutter/cogl/gl/cogl-internal.h | 4 ----
9607 clutter/cogl/gles/cogl-internal.h | 4 ----
9608 2 files changed, 8 deletions(-)
9610 commit 34467e5c6a764450e0bb0d76dc4131665523fb4c
9611 Author: Bastian Winkler <buz@netbuz.org>
9612 Date: Mon Mar 30 17:38:42 2009 +0200
9614 [docs] Fix some inconsistency in Animation
9616 For some examples of clutter_actor_animate the parameters of @mode and
9617 @duration are swapped.
9619 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
9621 clutter/clutter-animation.c | 10 +++++-----
9622 1 file changed, 5 insertions(+), 5 deletions(-)
9624 commit 077e3192fd77223ea8123f84a75787f1138566f5
9625 Author: Havoc Pennington <hp@pobox.com>
9626 Date: Mon Mar 30 17:32:54 2009 +0100
9628 [texture] Queue a relayout when changing :keep-aspect-ratio
9630 Bug 1528 - queue relayout when setting ClutterTexture:keep-aspect-ratio
9632 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
9634 clutter/clutter-texture.c | 1 +
9635 1 file changed, 1 insertion(+)
9637 commit a362a4a8894e0630af54acc43be05a928306278e
9638 Author: Raymond Liu <raymond.liu@intel.com>
9639 Date: Mon Mar 30 16:57:11 2009 +0100
9641 [text] Use the base class binding pool
9643 Bug 1518 - [Patch] Widget derivied from ClutterText will crash on
9646 In clutter_text_key_press() we are using G_OBJECT_TYPE_NAME to find
9647 out the actor's type name. However, if some widget is derived from
9648 ClutterText, when the key press handler is called, G_OBJECT_TYPE_NAME
9649 will return the name of the derived widget.
9651 The default implementation should get the binding pool for the base
9654 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
9656 clutter/clutter-text.c | 6 +++++-
9657 1 file changed, 5 insertions(+), 1 deletion(-)
9659 commit 02ea81ce02f6fedee77623f1387e0381e0a78d9c
9660 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9661 Date: Mon Mar 30 16:46:57 2009 +0100
9663 [text] Different selection modes with multiple clicks
9665 ClutterText should offer multiple selection modes depending on the
9666 number of pointer clicks.
9668 Following the GTK+ conventions:
9670 - double click selects the current word
9671 - triple click selects the current line
9673 clutter/clutter-text.c | 230 +++++++++++++++++++++++++++++++++++++-----------
9674 1 file changed, 178 insertions(+), 52 deletions(-)
9676 commit f6d938a0dbf8e67ba20eef180fc2fae9e84b27f9
9677 Author: Øyvind Kolås <pippin@linux.intel.com>
9678 Date: Mon Mar 30 12:10:41 2009 +0100
9680 [animation] add varargs support for signal::completed
9682 Added support for registering a handler for the completed signal
9683 directly amongst the varargs making it easier to attach code
9684 to be executed when animations complete.
9686 clutter/clutter-animation.c | 72 ++++++++++++++++++++++++++++++-------------
9687 1 file changed, 51 insertions(+), 21 deletions(-)
9689 commit a1a8193179dec84b29fac146e5cf34d43a66f093
9690 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9691 Date: Mon Mar 30 07:54:42 2009 +0100
9693 [text] Check text length in ::button-press-event
9695 Bug 1529 - Selection bound out of sync with an empty Text actor
9697 When the user clicks on a Text actor the cursor position and the
9698 selection bound are set using bytes_to_offset(); if the Text is
9699 empty, this means placing them both to 0. Setting the selection
9700 bound to 0 means that when the user inserts a character by typing
9701 it into the Text, the selection will be [0,1]; this will select
9702 the first character, which will then be overwritten when typing
9705 The Text actor should, instead, check if there are no contents
9706 and set the cursor position and the selection bound to -1.
9708 The clutter_text_set_selection_bound() method should also validate
9709 the value passed, in case it's bigger than the text lenght, or
9712 clutter/clutter-text.c | 46 ++++++++++++++++++++++++++++++++++------------
9713 1 file changed, 34 insertions(+), 12 deletions(-)
9715 commit 0de0e869a990e2d5516c058d45143bba20e45de5
9716 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9717 Date: Fri Mar 27 14:28:08 2009 +0000
9719 [docs] Fix typo in the AnimationMode name
9721 clutter/clutter-alpha.c | 4 ++--
9722 1 file changed, 2 insertions(+), 2 deletions(-)
9724 commit cc21a4aa5f66e3fb1253587def2d7368cfd1db07
9725 Author: Chris Lord <chris@linux.intel.com>
9726 Date: Thu Mar 26 20:28:04 2009 +0000
9728 [ClutterTimeline] Fix clutter_timeline_set_delay
9730 When setting a delay, timeout_add was being used with msecs. timeout_add
9731 takes fps since the fix to bug #1495. Delay now uses g_timeout_add
9734 clutter/clutter-timeline.c | 10 +++++-----
9735 1 file changed, 5 insertions(+), 5 deletions(-)
9737 commit 231343f1513d31248ada221ddc0020d73930b889
9738 Author: Damien Lespiau <damien.lespiau@gmail.com>
9739 Date: Wed Mar 25 20:58:22 2009 +0000
9741 [gitignore] Ignore two newly introduced tests
9743 tests/.gitignore | 2 ++
9744 1 file changed, 2 insertions(+)
9746 commit 68ab2c602426ee0eeaca602e6154a98dc5d7e0bf
9747 Author: Neil Roberts <neil@linux.intel.com>
9748 Date: Wed Mar 25 14:53:58 2009 +0000
9750 [doc] Fix two small typos in cogl-vertex-buffer
9752 The symbol name for cogl_vertex_buffer_draw_elements was wrong so it
9753 ended up with no documentation. The name for the vertex attribute was
9754 incorrect in cogl_vertex_buffer_add.
9756 clutter/cogl/cogl-vertex-buffer.h | 4 ++--
9757 1 file changed, 2 insertions(+), 2 deletions(-)
9759 commit 3d81f0c08e0efa9c79af93db58944a53e09c7d70
9760 Author: Robert Bragg <robert@linux.intel.com>
9761 Date: Mon Mar 23 12:46:20 2009 +0000
9763 [build] Fixes a cogl-vertex-buffer.c warning when building for GLES
9765 GLES 1 doesn't support GLSL so it never needs to use the generic_index
9766 variable for generic attributes which was flagging a warning.
9768 clutter/cogl/common/cogl-vertex-buffer.c | 5 ++++-
9769 1 file changed, 4 insertions(+), 1 deletion(-)
9771 commit 891ed5356416a2d39e465a86932998379b6009d7
9772 Author: Robert Bragg <robert@linux.intel.com>
9773 Date: Mon Mar 23 12:29:15 2009 +0000
9775 [cogl] Move rect and poly drawing code from cogl-texture.c to cogl-primitives.c
9777 None of this code directly related to implementing CoglTextures, and the
9778 code was needlessly duplicated between the GL and GLES backends. This moves
9779 the cogl_rectangle* and cogl_polygon* code into common/cogl-primitives.c
9780 makes which makes lot of sense since the two copies keep needlessly
9781 diverging introducing or fixing bugs in one but not the other. For instance
9782 I came accross one such bug regarding the enabling of texture units when
9785 clutter/cogl/common/cogl-primitives.c | 1256 ++++++++++++++++++++++++++++-
9786 clutter/cogl/gl/cogl-texture-private.h | 34 +
9787 clutter/cogl/gl/cogl-texture.c | 1261 +-----------------------------
9788 clutter/cogl/gles/cogl-texture-private.h | 34 +
9789 clutter/cogl/gles/cogl-texture.c | 1244 +----------------------------
9790 5 files changed, 1331 insertions(+), 2498 deletions(-)
9792 commit b30bb575a1c63312d114927634d9066f7c1445a9
9793 Author: Robert Bragg <robert@linux.intel.com>
9794 Date: Mon Mar 23 11:39:40 2009 +0000
9796 [cogl_rectangles] A minor doc fix, and missing newline between functions
9798 The gtk-doc had a copy and paste error, saying the float array should be 8
9799 elements per rectangle instead of 4. There was also no newline in the gles
9800 code before the new function.
9802 clutter/cogl/cogl-texture.h | 2 +-
9803 clutter/cogl/gles/cogl-texture.c | 1 +
9804 2 files changed, 2 insertions(+), 1 deletion(-)
9806 commit 13e5bd9e8be7e7b88924a97ea02eee4187a29238
9807 Author: Johan Bilien <jobi@litl.com>
9808 Date: Fri Mar 20 19:22:23 2009 +0000
9810 Allow using array of vertices even without textures
9812 It's often nice to be able to draw a batch of vertices, even if these
9813 have no texture coordinates. This add a cogl_rectangles, similar to
9814 cogl_rectangles_with_texture_coords, only without.
9816 clutter/cogl/cogl-texture.h | 21 +++++++++++++++++++++
9817 clutter/cogl/gl/cogl-texture.c | 20 ++++++++++++++++++++
9818 clutter/cogl/gles/cogl-texture.c | 19 +++++++++++++++++++
9819 3 files changed, 60 insertions(+)
9821 commit 5a06f1d1d009e446109b0778e7f9f9a1f8a11194
9822 Author: Robert Bragg <robert@linux.intel.com>
9823 Date: Thu Mar 19 16:46:07 2009 +0000
9825 Removes a hack in gles/cogl.c that was already fixed in gl/cogl.c
9827 It removes the need to cast a CoglMatrix to a float * for transforming
9828 a vertex manually instead of using cogl_matrix_transform_point.
9830 clutter/cogl/gles/cogl.c | 43 ++++++++++++-------------------------------
9831 1 file changed, 12 insertions(+), 31 deletions(-)
9833 commit d6937b797e59cd02f663155dfea2d31355997c38
9834 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9835 Date: Thu Mar 19 11:40:13 2009 +0000
9837 [doc] Update the should_pick_paint() documentation
9839 The should_pick_paint() method of ClutterActor is not clearly
9842 clutter/clutter-actor.c | 4 +++-
9843 1 file changed, 3 insertions(+), 1 deletion(-)
9845 commit 0a48a52ba16fa367046badf8f7bf6beb865ea63b
9846 Author: Neil Roberts <neil@linux.intel.com>
9847 Date: Thu Mar 19 17:54:17 2009 +0000
9849 [glx-texture-pixmap] Don't enable the texture target when binding the texture
9851 There's no need to enable the texture target unless it is going to be
9852 used for rendering. Enabling it directly with glEnable calls confuses
9853 Cogl's state caching.
9855 This is a replacement for the patch in bug 1483 which was reverted.
9857 clutter/glx/clutter-glx-texture-pixmap.c | 2 --
9858 1 file changed, 2 deletions(-)
9860 commit c4dcbb6bdba91fbc20b7654fe98fd92a5adbb44c
9861 Author: Neil Roberts <neil@linux.intel.com>
9862 Date: Thu Mar 19 17:48:15 2009 +0000
9864 Revert "Use COGL to establish GL state for ClutterGLXTexturePixmap"
9866 This reverts commit f9d996a4603bef1f52e32e99f9f69a32b7c823ba.
9868 The change from calling glBindTexture to using the material API with
9869 cogl_material_flush_gl_state does not always work because it doesn't
9870 necessarily leave the active texture unit as GL_TEXTURE0. For example,
9871 if the previously rendered texture was multi-layered then the last
9872 thing cogl_material_flush_gl_state will do is select GL_TEXTURE1 just
9875 clutter/glx/clutter-glx-texture-pixmap.c | 26 +++++++++++++++++---------
9876 1 file changed, 17 insertions(+), 9 deletions(-)
9878 commit e94e5ad65b34dfad507de6eb63225798434f31ff
9879 Author: Øyvind Kolås <pippin@linux.intel.com>
9880 Date: Thu Mar 19 14:42:50 2009 +0000
9882 [actor] use an epsilon whens sanity checking sizes
9884 Clutter was complaining about netural width smaller than minimum widths
9885 (differences around 0.0005) by using an epsilon value of 1e-4 for these
9886 floating point comparisons, these warnings have now been silenced.
9888 clutter/clutter-actor.c | 6 ++++--
9889 1 file changed, 4 insertions(+), 2 deletions(-)
9891 commit 7d8da0e8303a5bf57002181ae1b76e6c8546f237
9892 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9893 Date: Wed Mar 18 17:07:50 2009 +0000
9895 [docs] Remove unused arguments
9897 The documentation for some X11TexturePixmap method does not reflect
9900 clutter/x11/clutter-x11-texture-pixmap.c | 6 ------
9901 1 file changed, 6 deletions(-)
9903 commit 6114c6c1db2643edf1679de814ce3d6cd4c5e0b9
9904 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9905 Date: Wed Mar 18 17:06:56 2009 +0000
9907 [docs] Pick up backend-specific API
9909 The various backend API outside from clutter-x11.h and clutter-win32.h
9910 is documented but not picked up by gtk-doc.
9912 doc/reference/clutter/Makefile.am | 15 ++++++-
9913 doc/reference/clutter/clutter-docs.xml | 3 ++
9914 doc/reference/clutter/clutter-sections.txt | 59 ++++++++++++++++++++++++++++
9915 3 files changed, 76 insertions(+), 1 deletion(-)
9917 commit ccca24ab7653477f5607ccacb46e1941d1fcfb5b
9918 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9919 Date: Tue Mar 17 14:12:01 2009 +0000
9921 Remove usage of the grave accent as quotation mark
9925 http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
9927 This should make Thomas happy.
9929 clutter/clutter-actor.c | 18 +++++------
9930 clutter/clutter-animation.c | 44 +++++++++++++--------------
9931 clutter/clutter-behaviour.c | 2 +-
9932 clutter/clutter-color.c | 2 +-
9933 clutter/clutter-container.c | 54 ++++++++++++++++-----------------
9934 clutter/clutter-model.c | 14 ++++-----
9935 clutter/clutter-score.c | 2 +-
9936 clutter/clutter-script.c | 30 +++++++++---------
9937 clutter/clutter-shader-types.c | 12 ++++----
9938 clutter/clutter-text.c | 8 ++---
9939 clutter/clutter-texture.c | 2 +-
9940 clutter/clutter-timeline.c | 12 ++++----
9941 clutter/clutter-units.c | 2 +-
9942 clutter/cogl/common/cogl-util.c | 2 +-
9943 clutter/eglnative/clutter-stage-egl.c | 2 +-
9944 clutter/eglx/clutter-backend-egl.c | 2 +-
9945 clutter/fruity/clutter-stage-fruity.c | 2 +-
9946 clutter/glx/clutter-backend-glx.c | 2 +-
9947 clutter/json/json-object.c | 2 +-
9948 clutter/json/json-parser.c | 13 ++------
9949 clutter/win32/clutter-backend-win32.c | 2 +-
9950 clutter/x11/clutter-backend-x11.c | 6 ++--
9951 tests/conform/test-timeline.c | 2 +-
9952 tests/interactive/test-score.c | 4 +--
9953 tests/interactive/test-script.c | 4 +--
9954 25 files changed, 118 insertions(+), 127 deletions(-)
9956 commit 39e2b43b22975d75352fc7af4e4e6f573e99eb9e
9957 Author: Robert Bragg <robert@linux.intel.com>
9958 Date: Tue Mar 17 00:12:27 2009 +0000
9960 [cogl] Apply the fix from 2c1c836417 (Flush matrix before clip planes) to GLES
9962 glClipPlane() is affected by modelview matrix so we need to flush before
9965 clutter/cogl/gles/cogl.c | 2 ++
9966 1 file changed, 2 insertions(+)
9968 commit b5a35a0f0b058784da2e5da083ee16232f06a6e0
9969 Author: Robert Bragg <robert@linux.intel.com>
9970 Date: Tue Mar 17 00:26:38 2009 +0000
9972 [test-cogl-vertex-buffer] Use clutter_color_from_hls instead of hsl_to_rgb
9974 There is no need for a custom hsl to rgb converter since Clutter implements
9975 this logic; originally it wasn't quite as optimal, but that has now been
9978 tests/interactive/test-cogl-vertex-buffer.c | 64 +--------------------------
9979 1 file changed, 2 insertions(+), 62 deletions(-)
9981 commit bb93a987622532f2900261bbc0f570ba1fd24ecf
9982 Author: Robert Bragg <robert@linux.intel.com>
9983 Date: Tue Mar 17 00:01:56 2009 +0000
9985 [clutter-color] Use a different hls->rgb algorithm + use floating point
9987 Using test-cogl-vertex-buffer as a test case which is CPU bound due to
9988 hls -> rgb conversions this alternative algorithm looked to be ~10%
9989 faster when tested on an X61s Lenovo.
9991 clutter/clutter-color.c | 312 ++++++++-------------------
9992 tests/interactive/test-cogl-vertex-buffer.c | 8 +
9993 2 files changed, 96 insertions(+), 224 deletions(-)
9995 commit 567a96c96a47b2ca932781ef22b694475d4caae8
9996 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9997 Date: Mon Mar 16 18:20:58 2009 +0000
9999 [docs] More information on animation queueing
10001 Queuing an animation on an actor cannot be done from within the
10002 ::completed signal handler, because we guarantee that the Animation
10003 instance is valid and attached to the actor it animates for the
10004 whole duration of the signal emission chain.
10006 In order to queue animations you have to install an idle handler
10007 on the main loop, and call clutter_actor_animate() inside it.
10009 The documentation should be more clear about this caveat in the
10010 memory management of ClutterAnimations created by the animate()
10011 family of functions.
10013 clutter/clutter-animation.c | 43 +++++++++++++++++++++++++++++++++++++++++++
10014 1 file changed, 43 insertions(+)
10016 commit 9694107f9002fcd2f6ec6900bccf1d28b16b21a5
10017 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10018 Date: Mon Mar 16 17:09:57 2009 +0000
10020 Post-release bump to 0.9.3
10022 configure.ac | 2 +-
10023 1 file changed, 1 insertion(+), 1 deletion(-)
10025 commit 35191f09ef0fa8fad6f386513dcd691ab6b6746f
10026 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10027 Date: Mon Mar 16 16:28:45 2009 +0000
10029 [release] Release 0.9.2
10031 NEWS | 259 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
10032 configure.ac | 2 +-
10033 2 files changed, 260 insertions(+), 1 deletion(-)
10035 commit f061e274166f50af5de1abe07dd114214ac822ba
10036 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10037 Date: Mon Mar 16 16:14:12 2009 +0000
10039 Update release notes
10041 README | 23 +++++++++++++++++++----
10042 1 file changed, 19 insertions(+), 4 deletions(-)
10044 commit e7c5b15e6026ce125e8cfd0b146a852a6a86707f
10045 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10046 Date: Mon Mar 16 16:55:48 2009 +0000
10048 [docs] Ignore the TimeoutInterval internal API
10050 The TimeoutInterval API is internal, and thus should not be part
10051 of the API reference.
10053 doc/reference/clutter/Makefile.am | 1 +
10054 1 file changed, 1 insertion(+)
10056 commit e8785fef0728e13ea3638825db246111fc39477d
10057 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10058 Date: Mon Mar 16 16:54:58 2009 +0000
10060 [docs] Fix naming of the interval parameter
10062 The interval parameter is now expressed in frames per second and not
10065 clutter/clutter-timeout-pool.c | 6 +++---
10066 1 file changed, 3 insertions(+), 3 deletions(-)
10068 commit d5ee6fc26439054beada960803b73a6dfdbfd044
10069 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10070 Date: Mon Mar 16 16:09:05 2009 +0000
10072 Fix release date of 0.9.0
10075 1 file changed, 1 insertion(+), 1 deletion(-)
10077 commit ca3bfe2ceaacc7c37d90492fd9429635b51caddd
10078 Author: Robert Bragg <robert@linux.intel.com>
10079 Date: Mon Mar 16 14:58:00 2009 +0000
10081 [cogl] Don't endlessly print the same warning regarding layer fallbacks
10083 There are various constraints for when we can support multi-texturing and
10084 when they can't be met we try and print a clear warning explaining why the
10085 operation isn't supported, but we shouldn't endlessly repeat the warning for
10086 every primitive of every frame. This patch fixes that.
10088 clutter/cogl/gl/cogl-texture.c | 94 +++++++++++++++++++++++---------------
10089 clutter/cogl/gles/cogl-texture.c | 90 +++++++++++++++++++++---------------
10090 2 files changed, 109 insertions(+), 75 deletions(-)
10092 commit c5bd63648d3dccbb554a1b899ab974fe91ef9249
10093 Author: Robert Bragg <robert@linux.intel.com>
10094 Date: Mon Mar 16 12:47:45 2009 +0000
10096 [tests] Adds an interactive cogl vertex buffer unit test
10098 The test is a sanity check that dynamic updating of vertex data via the cogl
10099 vertex buffer api works and has reasonable performance. (though it can't be
10100 considered a well designed benchmark since it wastes casual amounts of CPU
10101 time simply choosing pretty colors.)
10103 The code also aims to demonstrate one way of creating, updating and efficiently
10104 drawing a quad mesh structure via the vertex buffer api which could be applied
10105 to lots of different use cases.
10107 tests/interactive/Makefile.am | 3 +-
10108 tests/interactive/test-cogl-vertex-buffer.c | 428 +++++++++++++++++++++++++++
10109 2 files changed, 430 insertions(+), 1 deletion(-)
10111 commit 71d65b629bb8f0a36b24753d6205663daa5acb09
10112 Author: Robert Bragg <robert@linux.intel.com>
10113 Date: Mon Mar 9 10:26:31 2009 +0000
10115 [cogl-vertex-buffer] fix cogl_vertex_buffer_draw_elements prototype
10117 This function was renamed a while ago in the .c file from
10118 cogl_vertex_buffer_draw_range_elements but the corresponding .h and
10119 doc/reference/cogl changes weren't made.
10121 clutter/cogl/cogl-vertex-buffer.h | 14 +++++++-------
10122 doc/reference/cogl/cogl-sections.txt | 2 +-
10123 2 files changed, 8 insertions(+), 8 deletions(-)
10125 commit 14e6323554d46b5fc25b391fed703efab4266b3b
10126 Author: Robert Bragg <robert@linux.intel.com>
10127 Date: Sat Feb 28 17:39:38 2009 +0000
10129 [cogl-vertex-buffer] Allow querying back the number of vertices a buffer represents
10131 This may be convenient e.g. at draw time if you are simply drawing all vertices
10133 clutter/cogl/cogl-vertex-buffer.h | 9 +++++++++
10134 clutter/cogl/common/cogl-vertex-buffer.c | 13 +++++++++++++
10135 doc/reference/cogl/cogl-sections.txt | 1 +
10136 3 files changed, 23 insertions(+)
10138 commit 075ae9c4a74b5e7af248c27ef57d2d0b4948a74a
10139 Author: Robert Bragg <robert@linux.intel.com>
10140 Date: Sat Feb 28 17:36:25 2009 +0000
10142 [cogl-vertex-buffer] Add a flush of attribute changes in the *_draw() functions
10144 For convenience it is now valid to avoid a seperate call to
10145 cogl_vertex_buffer_submit() and assume that the _draw() calls will do this
10146 for you (though of course if you do this you still need to ensure the
10147 attribute pointers remain valid until your draw call.)
10149 clutter/cogl/cogl-vertex-buffer.h | 38 +++++++++++++++++++-----------
10150 clutter/cogl/common/cogl-vertex-buffer.c | 25 +++++++++++++++-----
10151 2 files changed, 43 insertions(+), 20 deletions(-)
10153 commit a93a93d007b7c3ccc407482aaf521bd6b5d6607e
10154 Author: Neil Roberts <neil@linux.intel.com>
10155 Date: Mon Mar 9 17:12:27 2009 +0000
10157 Count timeline frames using the FPS instead of an integer interval
10159 Bug 1495 - Timelines run 4% short
10161 Previously the timelines were timed by calculating the interval
10162 between each frame stored as an integer number of milliseconds so some
10163 precision is lost. For example, requesting 60 frames per second gets
10164 converted to 16 ms per frame which is actually 62.5 frames per
10165 second. This makes the timeline shorter by 4%.
10167 This patch merges the common code for timing from the timeout pools
10168 and frame sources into an internal clutter-timeout-interval file. This
10169 stores the interval directly as the FPS and counts the number of
10170 frames that have been reached instead of the elapsed time.
10172 clutter/Makefile.am | 2 +
10173 clutter/clutter-frame-source.c | 81 +++++++----------------
10174 clutter/clutter-frame-source.h | 4 +-
10175 clutter/clutter-main.c | 12 ++--
10176 clutter/clutter-main.h | 4 +-
10177 clutter/clutter-timeline.c | 18 +++---
10178 clutter/clutter-timeout-interval.c | 126 ++++++++++++++++++++++++++++++++++++
10179 clutter/clutter-timeout-interval.h | 56 ++++++++++++++++
10180 clutter/clutter-timeout-pool.c | 99 ++++++----------------------
10181 clutter/clutter-timeout-pool.h | 2 +-
10182 10 files changed, 244 insertions(+), 160 deletions(-)
10184 commit 2c1c8364170558a79d9d9af8a149b64dfd83c2b0
10185 Author: Havoc Pennington <hp@pobox.com>
10186 Date: Mon Mar 16 15:09:33 2009 +0000
10188 [cogl] Flush matrix before clip planes
10190 glClipPlane() is affected by modelview matrix so we need to flush
10193 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
10195 clutter/cogl/gl/cogl.c | 2 ++
10196 1 file changed, 2 insertions(+)
10198 commit 9229fb6114e57a2690fa7ea18cbcdc78b7210d85
10199 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10200 Date: Mon Mar 16 15:00:55 2009 +0000
10202 [docs] Bring down the undocumented symbols to 2%
10204 The usual pre-release documentation blitzing. Most of the remaining
10205 symbols are either COGL or X11 specific, or dummy interface typedefs.
10207 clutter/clutter-backend.c | 2 +-
10208 clutter/clutter-behaviour-depth.h | 16 +++++++++
10209 clutter/clutter-behaviour-opacity.h | 18 +++++++++-
10210 clutter/clutter-behaviour-path.h | 12 ++++++-
10211 clutter/clutter-child-meta.h | 7 ++++
10212 clutter/clutter-clone.c | 2 +-
10213 clutter/clutter-clone.h | 15 ++++++++
10214 clutter/clutter-group.h | 19 ++++++++--
10215 clutter/clutter-media.h | 9 +++++
10216 clutter/clutter-rectangle.h | 15 ++++++++
10217 clutter/clutter-score.h | 21 +++++++++++
10218 clutter/clutter-script.h | 26 ++++++++++++++
10219 clutter/clutter-shader.h | 22 ++++++++++++
10220 clutter/clutter-stage.h | 20 ++++++++++-
10221 clutter/clutter-texture.h | 27 ++++++++++++++
10222 clutter/clutter-timeline.h | 20 +++++++++++
10223 clutter/clutter-units.h | 53 +++++++++++++++++++++++++++-
10224 doc/reference/clutter/clutter-sections.txt | 6 ++--
10225 18 files changed, 299 insertions(+), 11 deletions(-)
10227 commit 216373047bb2b1e6e807e73694f246159a3271fe
10228 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10229 Date: Mon Mar 16 14:16:18 2009 +0000
10231 [animation] Enhance consistency of the Animation API
10233 The Animation API should follow this pattern:
10235 - functions with an Interval as part of the arguments should have
10236 "interval" inside their name, e.g.:
10238 clutter_animation_bind_interval
10239 clutter_animation_update_interval
10241 - functions dealing with property names should have "property"
10242 inside their name, e.g.:
10244 clutter_animation_has_property
10245 clutter_animation_unbind_property
10249 - functions dealing with a property and its value should not
10250 have any modifier, e.g.:
10252 clutter_animation_bind
10254 The change from update_property() to update_interval() frees up
10255 clutter_animation_update(), to be added at a later date.
10257 clutter/clutter-animation.c | 27 +++++++++++++++++++++++++--
10258 clutter/clutter-animation.h | 4 ++--
10259 doc/reference/clutter/clutter-sections.txt | 4 ++--
10260 3 files changed, 29 insertions(+), 6 deletions(-)
10262 commit bb795dec56790dd3c6f018bc4071fde915af6466
10263 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10264 Date: Mon Mar 16 14:02:09 2009 +0000
10266 [docs] Update after Animation API changes
10268 Rename the bind/unbind_property functions, and add the bind_interval,
10271 Also, add clutter_actor_get_animation().
10273 doc/reference/clutter/clutter-sections.txt | 7 +++++--
10274 1 file changed, 5 insertions(+), 2 deletions(-)
10276 commit 0942fac573aa3a311c94324935004082c2b04a92
10277 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10278 Date: Mon Mar 16 14:01:43 2009 +0000
10280 [docs] Add description of queue_redraw
10282 clutter/clutter-actor.h | 1 +
10283 1 file changed, 1 insertion(+)
10285 commit ff620402523a0dd33ae01d13f7490dc8e63caf3c
10286 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10287 Date: Mon Mar 16 12:17:03 2009 +0000
10289 [tests] Remove unused variables
10291 The size of the pixmap is passed by the ::size-changed signal, so
10292 we can remove the unused w, h variables and avoid a compiler warning.
10294 tests/interactive/test-texture-async.c | 1 -
10295 1 file changed, 1 deletion(-)
10297 commit 961aac3fb36f73d4a48720d93b8928a3e24b5b84
10298 Author: Havoc Pennington <hp@pobox.com>
10299 Date: Tue Feb 17 12:22:02 2009 -0500
10301 [actor] Add ::queue-redraw signal
10303 Bug 1454 - move queue_redraw virtualization to ClutterActor
10305 The ClutterActor::queue-redraw signal allows parent containers to
10306 track whether their children need a redraw.
10308 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
10310 clutter/clutter-actor.c | 124 +++++++++++++++++++++++++++++++++++++++++------
10311 clutter/clutter-actor.h | 3 ++
10312 clutter/clutter-stage.c | 63 ++++--------------------
10313 clutter/clutter-stage.h | 2 -
10314 4 files changed, 121 insertions(+), 71 deletions(-)
10316 commit 570610512364223937543c010a6133c0d2b3dab1
10317 Author: Havoc Pennington <hp@pobox.com>
10318 Date: Mon Mar 16 11:58:58 2009 +0000
10320 [actor] Add :clip-to-allocation property
10322 A common use of setting clip is to keep an actor inside its allocation;
10323 right now to do this you have to set up a callback on notify::allocation.
10325 There's no overhead added by sticking another bit in ClutterActor
10326 clip-to-allocation that will clip painting to the allocation if set.
10328 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
10330 clutter/clutter-actor.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
10331 1 file changed, 44 insertions(+)
10333 commit 0cb0a841cc56c7912b59973dddc9e157fba7e0f5
10334 Author: Colin Walters <walters@verbum.org>
10335 Date: Thu Mar 5 23:10:00 2009 -0500
10337 [animation] Enhance the bind API
10339 Bug 1419 - Add clutter_animation_bind, rename clutter_animation_bind_interval
10341 This is a different approach from the clutter_actor_animatev
10342 vector variant. The single call should be even easier on
10343 automatic bindings, since calls can be chained like:
10345 new Clutter.Animation({object: myactor}).bind("x", 42).bind("y", 43);
10347 Note clutter_animation_bind_property which took a ClutterInterval
10348 is renamed to clutter_animation_bind_interval for clarity, and to
10349 discourage use since there are friendlier APIs about.
10351 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
10353 clutter/clutter-animation.c | 129 +++++++++++++++++++++++++++++++++----------
10354 clutter/clutter-animation.h | 7 ++-
10355 2 files changed, 104 insertions(+), 32 deletions(-)
10357 commit 156589fe3f4eeb215d0bf567aff71da94e5ee721
10358 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10359 Date: Mon Mar 16 11:31:27 2009 +0000
10361 [animation] Add Animation getter
10363 If we are animating an actor using the clutter_actor_animate*() family
10364 of functions we might want to expose a getter for the Animation instance
10365 we are using, to avoid excessing bookkeeping.
10367 clutter/clutter-animation.c | 19 +++++++++++++++++++
10368 clutter/clutter-animation.h | 2 ++
10369 2 files changed, 21 insertions(+)
10371 commit 44d0733665eca0b6517332a176743783ec2ccb79
10372 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10373 Date: Mon Mar 16 11:30:10 2009 +0000
10375 [animation] Add an emitter for ::completed
10377 The ::completed signal requires an emitter in case we want to stop
10378 the animation and safely dispose it inside application code without
10379 breaking invariants.
10381 clutter/clutter-animation.c | 18 ++++++++++++++++++
10382 clutter/clutter-animation.h | 1 +
10383 2 files changed, 19 insertions(+)
10385 commit a5c88e62f2207f18897732c76654f4699d2a897c
10386 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10387 Date: Mon Mar 16 11:28:29 2009 +0000
10389 [docs] Clarify Animation memory management
10391 The memory management of the ClutterAnimation instances should be
10392 heavily documented, given its "automagical" nature, so that other
10393 people might understand it and avoid breaking it in the future.
10395 clutter/clutter-animation.c | 8 +++++++-
10396 1 file changed, 7 insertions(+), 1 deletion(-)
10398 commit 0674fded7f25fdbf019debe7d91d28b441d3acaf
10399 Merge: 7f2ef2f 56568db
10400 Author: Øyvind Kolås <pippin@linux.intel.com>
10401 Date: Mon Mar 16 00:40:27 2009 +0000
10403 Merge branch 'async-texture-thread-pool'
10405 commit 56568db3b0b9eebf7f000407e1334a5b4d85e889
10406 Author: Øyvind Kolås <pippin@linux.intel.com>
10407 Date: Thu Mar 12 11:48:44 2009 +0000
10409 [clutter-texture] fixed gtk-doc formatting, and init threads in test.
10411 Fixed markup to actually work with gtk-doc, also do a g_thread_init
10414 clutter/clutter-texture.c | 14 ++++++++------
10415 tests/interactive/test-texture-async.c | 4 +++-
10416 2 files changed, 11 insertions(+), 7 deletions(-)
10418 commit 7f2ef2f1e014201bb5d3614bc857e6122fbfe08f
10419 Author: Neil Roberts <neil@linux.intel.com>
10420 Date: Fri Mar 13 15:43:19 2009 +0000
10422 [cogl-path] Minor fix to gtk-doc
10424 Fix the parameters in cogl_path_curve_to and cogl_path_rel_curve_to to
10425 match the actual names otherwise they won't appear correctly in the
10428 clutter/cogl/cogl-path.h | 8 ++++----
10429 1 file changed, 4 insertions(+), 4 deletions(-)
10431 commit 89060a9bb37503ada773c9026a152690da48531e
10432 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10433 Date: Fri Mar 13 15:28:20 2009 +0000
10435 [cogl] Avoid shadowing math.h symbols
10437 As usual, y1 and y2 end up shadowing symbols exported by math.h.
10439 clutter/cogl/cogl-path.h | 108 ++++++++++++++++-----------------
10440 clutter/cogl/common/cogl-primitives.c | 30 ++++-----
10441 2 files changed, 69 insertions(+), 69 deletions(-)
10443 commit e1742af36806b838111b5f6f85422940c64a87b8
10444 Author: Owen W. Taylor <otaylor@redhat.com>
10445 Date: Thu Mar 12 15:33:36 2009 -0400
10447 Avoid drawing twice if relayout queues a draw
10449 It's reasonably normal for a relayout of the stage to cause the stage
10450 to be queued for drawing; for this reason we should do the relayout before
10451 we clear stage->update_idle. (But want to clear update_idle() before actually
10452 doing the redraw to handle the corner case where the draw queues another
10455 clutter/clutter-stage.c | 7 +++++++
10456 1 file changed, 7 insertions(+)
10458 commit 72f96468047e76fe8cb40b77cbfd0225c1d05b80
10459 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10460 Date: Fri Mar 13 14:14:00 2009 +0000
10462 Do not cause more size requisitions than necessary
10464 Bug 1499 - clutter_actor_notify_if_geometry_changed causes sync
10467 Whenever clutter_actor_set_{width,height,x,y,size...} is used, extra
10468 synchronous size requests are triggered in
10469 clutter_actor_notify_if_geometry_changed.
10471 If the get_preferred_width() and get_preferred_height() implementations
10472 are particularly costly (e.g. ClutterText) this will result in a performance
10475 To avoid excessive allocation or requisition cycles we use the
10476 cached values and flags. If we don't have an allocation, we assume
10477 that we need to notify all the properties; if we don't have a size
10478 requisition we notify only width and height; finally, if we do have
10479 a valid allocation we notify only on the changed values.
10481 clutter/clutter-actor.c | 56 ++++++++++++++++++++++++++++++++++++-----------
10482 1 file changed, 43 insertions(+), 13 deletions(-)
10484 commit 786161c75f0bf5e3612f2f3df42eb3704ac7c27a
10485 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10486 Date: Thu Mar 12 21:11:50 2009 +0000
10488 [deprecated] Add Effect deprecation
10490 The ClutterEffect API has been deprecated during 0.9, so it should be
10491 added to the deprecation macros.
10493 clutter/clutter-deprecated.h | 9 +++++++++
10494 1 file changed, 9 insertions(+)
10496 commit ed2fe41b32ea6c9d645f89f385e088ca9857aa6e
10497 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10498 Date: Thu Mar 12 16:20:42 2009 +0000
10500 Add more deprecation notices
10502 Most of the deprecated API does not have an entry inside
10503 clutter-deprecated.h, thus making porting a tad more difficult.
10505 clutter/clutter-deprecated.h | 80 +++++++++++++++++++++++++++++++++++++++++-
10506 clutter/clutter.h | 3 +-
10507 2 files changed, 81 insertions(+), 2 deletions(-)
10509 commit cde05288b7e59061eea622c9028a3968334f4483
10510 Author: Neil Roberts <neil@linux.intel.com>
10511 Date: Fri Mar 13 12:20:26 2009 +0000
10513 Change cogl_path_rectangle and cogl_path_round_rectangle to take x1,y1,x2,y2
10515 This matches the changes to cogl_rectangle to improve consistency.
10518 clutter/cogl/cogl-path.h | 34 +++++++++++++++---------------
10519 clutter/cogl/common/cogl-primitives.c | 30 +++++++++++++-------------
10520 clutter/pango/cogl-pango-render.c | 8 +++----
10521 tests/interactive/test-clip.c | 10 ++++-----
10522 tests/interactive/test-cogl-primitives.c | 4 ++--
10523 6 files changed, 46 insertions(+), 45 deletions(-)
10525 commit 5d4c09369e2efd729d44399557c2dce45bb51b62
10526 Author: Neil Roberts <neil@linux.intel.com>
10527 Date: Fri Mar 13 12:02:33 2009 +0000
10529 [README] Small typo fix
10532 1 file changed, 1 insertion(+), 1 deletion(-)
10534 commit 2edccc760dae07a66badfe081f2e64865dfe5c3c
10535 Merge: c418b23 ca28440
10536 Author: Robert Bragg <robert@linux.intel.com>
10537 Date: Thu Mar 12 18:59:20 2009 +0000
10539 Merge branch 'cogl-client-matrix-stacks'
10541 * cogl-client-matrix-stacks:
10542 Maintain the Cogl assumption that the modelview matrix is normally current
10543 Finish GLES{1,2} support for client side matrix stacks
10544 Explicitly make the modelview-matrix current in cogl_{rotate,transform,etc}
10545 Avoid casting CoglMatrix to a GLfloat * when calling glGetFloatv
10546 Removes need for casting const float * in _cogl_set_clip_planes
10547 Virtualize GL matrix operations and use a client-side matrix when GL is indirect
10549 commit ca2844013e7c2d0bea48b4f2f2539306aace235f
10550 Author: Robert Bragg <robert@linux.intel.com>
10551 Date: Thu Mar 12 14:16:48 2009 +0000
10553 Maintain the Cogl assumption that the modelview matrix is normally current
10555 _cogl_add_path_to_stencil_buffer and _cogl_add_stencil_clip were leaving
10556 the projection matrix current when calling cogl_rectangle which was
10557 upsetting _cogl_current_matrix_state_flush.
10559 clutter/cogl/gl/cogl-primitives.c | 14 ++++++++++++--
10560 clutter/cogl/gl/cogl.c | 16 ++++++++++++++--
10561 clutter/cogl/gles/cogl-primitives.c | 14 ++++++++++++--
10562 clutter/cogl/gles/cogl.c | 16 ++++++++++++++--
10563 4 files changed, 52 insertions(+), 8 deletions(-)
10565 commit 0580dbe015768d63a856b91718652717b4c6b2f9
10566 Author: Robert Bragg <robert@linux.intel.com>
10567 Date: Thu Mar 12 13:34:36 2009 +0000
10569 Finish GLES{1,2} support for client side matrix stacks
10571 Adds glFrustum wrappers (GLES only accepts floats not doubles, and GLES2
10572 needs to use our internal cogl_wrap_glFrustumf)
10574 Adds GL_TEXTURE_MATRIX getter code in cogl_wrap_glGetFloatv
10576 Adds a GL_TEXTURE_MATRIX define for GLES2
10578 clutter/cogl/common/cogl-current-matrix.c | 13 +++++++++++++
10579 clutter/cogl/gles/cogl-gles2-wrapper.c | 10 ++++++++++
10580 clutter/cogl/gles/cogl-gles2-wrapper.h | 1 +
10581 3 files changed, 24 insertions(+)
10583 commit 3a9b18ef51005d9bea7d35347569c35c6573bf64
10584 Author: Robert Bragg <robert@linux.intel.com>
10585 Date: Thu Mar 12 13:32:10 2009 +0000
10587 Use Cogl enum when making modelview-matrix current in cogl_{rotate,transform,etc}
10589 My previous patch incorrectly used the GL enum with the _cogl_set_current_matrix
10592 clutter/cogl/common/cogl-current-matrix.c | 10 +++++-----
10593 1 file changed, 5 insertions(+), 5 deletions(-)
10595 commit 2f34d14cb46d8ccaff94b1bbf03c9bcf72c5f970
10596 Author: Robert Bragg <robert@linux.intel.com>
10597 Date: Fri Mar 6 03:43:24 2009 +0000
10599 Explicitly make the modelview-matrix current in cogl_{rotate,transform,etc}
10601 Its not intended that users should use these with any other matrix mode, and
10602 internally we now have the _cogl_current_matrix API if we need to play with
10605 clutter/cogl/common/cogl-current-matrix.c | 5 +++++
10606 1 file changed, 5 insertions(+)
10608 commit 0d88ecb45928d9decb3ab7fc52493a24cd81334c
10609 Author: Robert Bragg <robert@linux.intel.com>
10610 Date: Fri Mar 6 03:29:51 2009 +0000
10612 Avoid casting CoglMatrix to a GLfloat * when calling glGetFloatv
10614 If we later add internal flags to CoglMatrix then this code wouldn't
10615 initialize those flags. The ways it's now done adds a redundant copy, but
10616 if that turns out to be something worth optimizing we can look again at
10617 using a cast but adding another way for initializing internal flags.
10619 clutter/cogl/common/cogl-current-matrix.c | 11 ++++++++---
10620 1 file changed, 8 insertions(+), 3 deletions(-)
10622 commit 61b867442b0ed067dcb17cf52816e2f406509b78
10623 Author: Robert Bragg <robert@linux.intel.com>
10624 Date: Fri Mar 6 03:29:35 2009 +0000
10628 clutter/cogl/common/cogl-current-matrix.c | 3 ++-
10629 1 file changed, 2 insertions(+), 1 deletion(-)
10631 commit 20a2f76e1fb27b18c5157d50f12cf9833163c4dc
10632 Author: Robert Bragg <robert@linux.intel.com>
10633 Date: Fri Mar 6 02:39:24 2009 +0000
10635 Removes need for casting (const float *) to (GLfloat *) in _cogl_set_clip_planes
10637 This removes cogl.c:apply_matrix(), and makes cogl.c:project_vertex() use
10638 cogl_matrix_transform_point instead.
10640 clutter/cogl/gl/cogl.c | 43 ++++++++++++-------------------------------
10641 1 file changed, 12 insertions(+), 31 deletions(-)
10643 commit 08932584b557aa041f8a0ab7417eecaf2e83865c
10644 Author: Havoc Pennington <hp@pobox.com>
10645 Date: Tue Feb 24 13:51:25 2009 -0500
10647 Virtualize GL matrix operations and use a client-side matrix when GL is indirect
10649 This is useful because sometimes we need to get the current matrix, which
10650 is too expensive when indirect rendering.
10652 In addition, this virtualization makes it easier to clean up the API in
10655 clutter/cogl/cogl-matrix.h | 21 ++
10656 clutter/cogl/cogl.h.in | 18 ++
10657 clutter/cogl/common/Makefile.am | 4 +
10658 clutter/cogl/common/cogl-current-matrix.c | 452 +++++++++++++++++++++++++++++
10659 clutter/cogl/common/cogl-current-matrix.h | 91 ++++++
10660 clutter/cogl/common/cogl-material.c | 6 +-
10661 clutter/cogl/common/cogl-matrix-stack.c | 327 +++++++++++++++++++++
10662 clutter/cogl/common/cogl-matrix-stack.h | 67 +++++
10663 clutter/cogl/common/cogl-matrix.c | 42 +++
10664 clutter/cogl/common/cogl-util.c | 23 ++
10665 clutter/cogl/common/cogl-vertex-buffer.c | 4 +
10666 clutter/cogl/gl/cogl-context.c | 37 +++
10667 clutter/cogl/gl/cogl-context.h | 8 +
10668 clutter/cogl/gl/cogl-fbo.c | 42 +--
10669 clutter/cogl/gl/cogl-primitives.c | 20 +-
10670 clutter/cogl/gl/cogl-texture.c | 5 +-
10671 clutter/cogl/gl/cogl.c | 233 +++------------
10672 clutter/cogl/gles/cogl-context.c | 37 +++
10673 clutter/cogl/gles/cogl-context.h | 8 +
10674 clutter/cogl/gles/cogl-fbo.c | 36 +--
10675 clutter/cogl/gles/cogl-primitives.c | 20 +-
10676 clutter/cogl/gles/cogl-texture.c | 33 ++-
10677 clutter/cogl/gles/cogl.c | 235 +++------------
10678 clutter/glx/clutter-stage-glx.c | 3 +
10679 24 files changed, 1318 insertions(+), 454 deletions(-)
10681 commit 5895048f65c7ec8028575f60b7b4a7d58a87077e
10682 Author: Øyvind Kolås <pippin@linux.intel.com>
10683 Date: Thu Mar 12 11:48:44 2009 +0000
10685 [clutter-texture] updated documentation.
10687 Rewrote documentation, with the smallest amount of documentation for
10688 load-data-async which is considered a special case of load-async.
10690 clutter/clutter-texture.c | 50 +++++++++++++++++++++++----------------------
10691 1 file changed, 26 insertions(+), 24 deletions(-)
10693 commit 25d54a650de130c463d562f07de8b5083e2e8495
10694 Merge: c418b23 93d8f62
10695 Author: Øyvind Kolås <pippin@linux.intel.com>
10696 Date: Thu Mar 12 11:18:11 2009 +0000
10698 Merge commit 'origin/async-texture-thread-pool' into async-size
10700 commit 93d8f62f6bf9ade7e3049d8c30b5a1e38bf17561
10701 Author: Øyvind Kolås <pippin@linux.intel.com>
10702 Date: Thu Mar 12 10:38:39 2009 +0000
10704 [clutter-texture] remove load-size-async property
10706 Only have load-data-async and load-async properties, both are construct
10707 only and the latter adds the former load-size-async behavior on top of
10710 clutter/clutter-texture.c | 51 +++++++-------------------------
10711 tests/interactive/test-texture-async.c | 23 ++++----------
10712 2 files changed, 16 insertions(+), 58 deletions(-)
10714 commit d3b68298ace856938efd7fe8293194582fc7f50c
10715 Author: Øyvind Kolås <pippin@linux.intel.com>
10716 Date: Thu Mar 12 10:14:40 2009 +0000
10718 [clutter-texture] add option to not block on size for loaded images
10720 Added a construct time property to indicate that we do not want
10721 to block on loading images.
10723 clutter/clutter-texture.c | 86 ++++++++++++++++-----------
10724 tests/interactive/test-texture-async.c | 99 ++++++++++++++++++++++----------
10725 2 files changed, 122 insertions(+), 63 deletions(-)
10727 commit 5d3d9713899919d4cc7e42c5b08a9835b15e5c9c
10728 Author: Øyvind Kolås <pippin@linux.intel.com>
10729 Date: Wed Mar 11 18:26:30 2009 +0000
10731 [tests] Added test-texture-async
10733 clutter/clutter-texture.c | 74 ++++++++++++++++++++++++++++---
10734 tests/interactive/Makefile.am | 1 +
10735 tests/interactive/test-texture-async.c | 76 ++++++++++++++++++++++++++++++++
10736 3 files changed, 144 insertions(+), 7 deletions(-)
10738 commit c418b23baf635b9d94cdc50f62dc4380e0f5e41c
10739 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10740 Date: Thu Mar 12 09:29:39 2009 +0000
10742 [docs] Add a bindings coding practices
10744 When writing language bindings for Clutter some rules should be
10745 observed to guarantee the same levels of quality across different
10748 HACKING | 18 ++++++++++++++++++
10749 1 file changed, 18 insertions(+)
10751 commit d036d088aad5aa9ac159d4346a7d923b9c823080
10752 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10753 Date: Thu Mar 12 09:27:39 2009 +0000
10755 [docs] Reword some of the coding practices
10757 Update with the new fixed point and units rules. Also, fix the
10758 grammar and clarify what to do with non-static private functions.
10760 HACKING | 35 +++++++++++++++++++++++------------
10761 1 file changed, 23 insertions(+), 12 deletions(-)
10763 commit 77579bbc5fc693c4c8d4d076ace4362c57b2762d
10764 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10765 Date: Wed Mar 11 22:12:36 2009 +0000
10767 [tests] Animate the color during easing
10769 The easing modes test should also tweak the color to show the
10770 progress of the animation.
10772 tests/interactive/test-easing.c | 7 +++++++
10773 1 file changed, 7 insertions(+)
10775 commit 2c95b378a598c81ea29ffe129fedb9fc54281f9c
10776 Author: Geoff Gustafson <geoff@linux.intel.com>
10777 Date: Tue Mar 10 14:25:37 2009 -0700
10779 [animation] Broken fixed:: properties
10781 This commit yesterday:
10783 89e3e3a4cc06c10c2573f3d115c5b03ee4890524
10784 [animation] Add vector variants for ::animate()
10786 broke the "fixed::" attribute on properties in clutter_actor_animate(),
10787 because the fixed:: part is still on the string when it checks to see if
10788 it's a valid property the class knows about.
10790 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
10792 clutter/clutter-animation.c | 6 ++++++
10793 1 file changed, 6 insertions(+)
10795 commit 168499742ab329f4bff1d6e13d97cf6b972a3f34
10796 Author: Damien Lespiau <damien.lespiau@gmail.com>
10797 Date: Wed Mar 11 18:39:10 2009 +0000
10801 This update fixes a few issues:
10802 - the use of shave with mingw32 bash on windows,
10803 - fix the unmangling of libtool names
10804 - fix build on solaris
10805 - add an --enable/disable-shave configure option (while still
10806 defaulting to enabled)
10808 build/autotools/shave-libtool.in | 5 +--
10809 build/autotools/shave.in | 28 ++++++++-----
10810 build/autotools/shave.m4 | 85 +++++++++++++++++++++++++++-----------
10811 configure.ac | 2 +-
10812 4 files changed, 81 insertions(+), 39 deletions(-)
10814 commit d88bc30b87b640fb4c11ebbb68d146810c379fde
10815 Author: Owen W. Taylor <otaylor@fishsoup.net>
10816 Date: Fri Feb 27 11:56:39 2009 -0500
10818 Allow NULL for clutter_text_set_text()
10820 As a convenience, if NULL is passed for the text argument of
10821 clutter_text_set_text() (and for consistency,
10822 clutter_text_set_markup()), treat that the same as "".
10824 clutter/clutter-text.c | 14 +++++---------
10825 1 file changed, 5 insertions(+), 9 deletions(-)
10827 commit 0d874312d32f7c887286ddc28dcb8bbad6c4d33d
10828 Author: Gordon Williams <gordon.williams@collabora.co.uk>
10829 Date: Wed Mar 11 18:16:21 2009 +0000
10831 [group] Output the group name when debugging paint
10833 Bug 1480 - Clutter groups don't output their name when
10834 CLUTTER_DEBUG=paint
10836 This is a really useful thing to do debugging-wise - as you can see
10837 istantly when (and if) clutter objects are being drawn - as often
10838 there's quite a hierarchy of objects in groups.
10840 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
10842 clutter/clutter-group.c | 8 ++++++--
10843 1 file changed, 6 insertions(+), 2 deletions(-)
10845 commit 02b2b664d8e00679dda08c1a83f6b8ebd5147086
10846 Author: Owen W. Taylor <otaylor@fishsoup.net>
10847 Date: Thu Feb 26 14:42:19 2009 -0500
10849 Add (out) annotations for ClutterActor
10851 Add missing (out) annotations to the doc comments for ClutterActor methods
10852 with multiple return values.
10854 Fix the definition of clutter_actor_get_allocation_vertices() to be
10855 consistent with the declaration and have verts[4] rather than verts[].x
10857 http://bugzilla.openedhand.com/show_bug.cgi?id=1481
10859 clutter/clutter-actor.c | 92 +++++++++++++++++++++++------------------------
10860 1 file changed, 46 insertions(+), 46 deletions(-)
10862 commit 75e5b805ab6ed4ab82e75b4306045065e0620b9f
10863 Author: Raymond Liu <raymond.liu@intel.com>
10864 Date: Mon Mar 9 14:10:45 2009 +0800
10866 [text] Insertion of multi-byte characters broken
10868 Bug 1501 - clutter_text_insert_text not working right with non-onebyte
10871 In clutter_text_insert_text(), the position is expressed in characters, not
10874 Actually, it turns out to be working on bytes, so when there are already
10875 multi-byte character in the text buffer, insert text at the position after
10876 the multi-byte character will not work right.
10878 Also, the position is not updated after the insert work is done.
10880 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
10882 clutter/clutter-text.c | 11 ++++++++++-
10883 1 file changed, 10 insertions(+), 1 deletion(-)
10885 commit 039e282a40c4f1a0f0d58fd0d46d713ffb8ea36b
10886 Author: Raymond Liu <raymond.liu@intel.com>
10887 Date: Wed Mar 11 14:35:26 2009 +0800
10889 [text] Crash when multi-byte utf8 text exceeds max_length
10891 Bug 1500 - [Patch] clutter_text crash with non one-byte utf8 text exceed
10894 In clutter_text_set_text_internal(), when text length in character is greater
10895 than max_length, and there are multi-byte character in it, then the new text
10896 string buffer is not malloc()'ed with right length. This will cause the app to
10897 crash with segmention fault.
10899 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
10901 clutter/clutter-text.c | 3 ++-
10902 1 file changed, 2 insertions(+), 1 deletion(-)
10904 commit a83a5d55935a7dfd54de52368b4a1cd6768a257a
10905 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10906 Date: Wed Mar 11 14:01:55 2009 +0000
10908 [docs] Document the commit message format
10910 Clutter uses the standard git format for commit messages:
10914 long description...
10916 And everyone asking for their patches or trees to be merged upstream
10917 should conform to the same commit messages format, just like they
10918 should conform to the coding style.
10920 HACKING | 15 +++++++++++++++
10921 1 file changed, 15 insertions(+)
10923 commit 7a5cea44dd547ea15a51dd2ee49bc15d41e84546
10924 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10925 Date: Wed Mar 11 13:55:01 2009 +0000
10927 [docs] Calling g_object_ref() will not dispose an object
10929 The right way to dispose a PangoContext is to call g_object_unref(),
10930 not g_object_ref().
10932 clutter/clutter-actor.c | 2 +-
10933 1 file changed, 1 insertion(+), 1 deletion(-)
10935 commit e430903acd4b7f7da8cbb5e0f6f95e1eff0b9bba
10936 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10937 Date: Wed Mar 11 13:53:27 2009 +0000
10939 [color] Fixed HLS to RGB conversion
10941 The fixed-point values are converted to integers, which obviously
10942 messes up the conversion. Instead, they should be converted to
10943 floating point values before normalizing to bytes for the assignment
10944 to ClutterColor components.
10946 clutter/clutter-color.c | 30 +++++++++++++++---------------
10947 1 file changed, 15 insertions(+), 15 deletions(-)
10949 commit 5e9894fbace4379b8c2c1b30c826858009187689
10950 Author: Neil Roberts <neil@linux.intel.com>
10951 Date: Tue Mar 10 18:28:56 2009 +0000
10953 Remove use of $(builddir)
10955 $(builddir) isn't always defined in earlier versions of Automake
10956 (although I can't track down exactly which version it appeared
10957 in). According to the autoconf docs it is "rigorously equal to `.'" so
10958 we might as well not use it.
10960 clutter/Makefile.am | 6 +++---
10961 1 file changed, 3 insertions(+), 3 deletions(-)
10963 commit a41361269fb32bd386285d553154c48a84295eb5
10964 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10965 Date: Tue Mar 10 18:05:08 2009 +0000
10967 [cogl] Initialize all members of CoglContext
10969 Some members of CoglContext still escape initialization.
10971 clutter/cogl/gl/cogl-context.c | 1 +
10972 clutter/cogl/gles/cogl-context.c | 1 +
10973 2 files changed, 2 insertions(+)
10975 commit d3245c66244970d04922572c47d68efc9ad19122
10976 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10977 Date: Tue Mar 10 17:53:51 2009 +0000
10979 [cogl] Initialize boolean flag in CoglContext
10981 The private CoglContext is created using g_malloc() and not
10982 zeroed; this means we have to initialize the values we are
10983 going to check, to avoid hitting garbage.
10985 Thanks to Tommi Komulainen.
10987 clutter/cogl/gl/cogl-context.c | 2 ++
10988 clutter/cogl/gles/cogl-context.c | 2 ++
10989 2 files changed, 4 insertions(+)
10991 commit 57c3e84289fd3a705a01c74c6924ed0b100da4de
10992 Author: Neil Roberts <neil@linux.intel.com>
10993 Date: Tue Mar 10 14:40:33 2009 +0000
10995 Fix out of tree builds
10997 Commit a383929 added the $(srcdir) prefix to all of the source files
10998 but some files are generated by the configure script and other make
10999 rules so they actually live in $(builddir). Out-of-tree builds
11002 clutter/Makefile.am | 10 +++++-----
11003 1 file changed, 5 insertions(+), 5 deletions(-)
11005 commit e744066e7d82813d9d70d032068c7e6d51fc9f14
11006 Author: Øyvind Kolås <pippin@linux.intel.com>
11007 Date: Tue Mar 10 13:00:57 2009 +0000
11009 Change the default size of thread pool from 3 to 1
11011 Concurrently decoding three image files can stall animations even on a
11012 dual core system, reducing to 1 concurrent image decoding thread.
11014 clutter/clutter-texture.c | 2 +-
11015 1 file changed, 1 insertion(+), 1 deletion(-)
11017 commit 89e3e3a4cc06c10c2573f3d115c5b03ee4890524
11018 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11019 Date: Mon Mar 9 21:11:40 2009 +0000
11021 [animation] Add vector variants for ::animate()
11023 Bug 1438 - Implicit Animation API could use animatev variants
11025 The clutter_actor_animate* family of functions use va_lists to
11026 handle the property/value pairs for the final state of the
11029 Language bindings have problems with variadic arguments functions,
11030 and usually prefer vector-based API which allow a greater level
11031 of control and conversion from native data types.
11033 For each variadic arguments function in the clutter_actor_animate*
11034 family there should be a vector-based version that takes:
11036 - the number of property/value pairs
11037 - a constant array of constant strings
11038 - an array of GValues
11040 Most of the internal implementation can be refactored from the
11041 current one, thus both the var_args and the vector entry points
11042 share a common implementation of the code; then, both versions
11043 of the API are just loops over a list of arguments.
11045 Based on a patch by: Robert Carr <carrr@rpi.edu>
11047 clutter/clutter-animation.c | 418 +++++++++++++++++++++++-----
11048 clutter/clutter-animation.h | 18 ++
11049 doc/reference/clutter/clutter-sections.txt | 3 +
11050 3 files changed, 374 insertions(+), 65 deletions(-)
11052 commit c46106f6dd550b684cd53676e6173c8a8d03255e
11053 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11054 Date: Mon Mar 9 18:28:15 2009 +0000
11056 [docs] Update API reference
11058 The API reference was still listing some symbols that have been
11061 clutter/clutter-types.h | 2 --
11062 doc/reference/clutter/clutter-sections.txt | 6 ++----
11063 2 files changed, 2 insertions(+), 6 deletions(-)
11065 commit f1b237b2ec7c9aafcd55c481602870c589ee3c8e
11066 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11067 Date: Mon Mar 9 17:56:48 2009 +0000
11069 [docs] Remove ClutterFixed from the documentation
11071 Now that ClutterFixed has finally gone the way of the Dodo, we
11072 can safely remove it from the API reference as well.
11074 clutter/clutter-behaviour-ellipse.c | 29 ++++++-----
11075 clutter/clutter-fixed.c | 37 +-------------
11076 doc/reference/clutter/clutter-docs.xml | 1 -
11077 doc/reference/clutter/clutter-sections.txt | 74 +++++-----------------------
11078 4 files changed, 29 insertions(+), 112 deletions(-)
11080 commit bb83bf282d7b4f6b05ae71b3b1cf8febb228914b
11081 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11082 Date: Mon Mar 9 17:47:21 2009 +0000
11084 [cogl] Fix hardcoded paths in the pc file
11086 The commit 24ce193836 fixed the Clutter pkg-config file. Since
11087 COGL now ships its own, we need to fix that as well.
11089 clutter/cogl/cogl.pc.in | 6 +++---
11090 1 file changed, 3 insertions(+), 3 deletions(-)
11092 commit 9b83a6f291663577426a26d5adae8712566dba2d
11093 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11094 Date: Mon Mar 9 17:36:22 2009 +0000
11096 [fixed] Remove ClutterFixed API
11098 Since the switch from fixed point to floating point, and the introduction
11099 of CoglFixed, ClutterFixed has been typedef'd into a float. This makes
11100 ClutterFixed the worst fixed point API ever.
11102 Now that Clutter has been migrated to CoglFixed and gfloat whenever needed,
11103 ClutterFixed can be safely removed.
11105 The only thing that Clutter should still provide is ClutterParamSpecFixed,
11106 for installing fixed point properties into GObject classes.
11108 The ClutterFixed symbols have been entirely removed from the API.
11110 clutter/clutter-fixed.c | 174 +++---------------------------
11111 clutter/clutter-fixed.h | 269 ++---------------------------------------------
11112 2 files changed, 28 insertions(+), 415 deletions(-)
11114 commit d1f3190f5b9b93b6da32c0afa8c2544b5c1c8415
11115 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11116 Date: Mon Mar 9 17:35:08 2009 +0000
11118 [units] Add more conversion functions
11120 A GValue containing a ClutterUnit should be transformable into a
11121 GValue holding an integer, a floating point value or a fixed point
11124 This means adding more transformation functions when registering
11125 the ClutterUnit GType.
11127 clutter/clutter-units.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++-
11128 clutter/clutter-units.h | 23 ++++++++-------
11129 2 files changed, 85 insertions(+), 11 deletions(-)
11131 commit 6bee140e7458e92e3cf3b884cc06f2dc4c4a99a5
11132 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11133 Date: Mon Mar 9 17:34:23 2009 +0000
11135 [tests] Use floats, not ClutterFixed
11137 The COGL API expects floats, not ClutterFixed, so we need
11138 to use the right type when calling it.
11140 tests/interactive/test-clip.c | 58 +++++++++++++-------------
11141 tests/interactive/test-cogl-multitexture.c | 27 ++++++------
11142 tests/interactive/test-cogl-offscreen.c | 19 +++------
11143 tests/interactive/test-cogl-primitives.c | 61 ++++++++--------------------
11144 tests/interactive/test-cogl-tex-convert.c | 23 +++--------
11145 tests/interactive/test-cogl-tex-foreign.c | 11 +----
11146 tests/interactive/test-cogl-tex-getset.c | 11 +----
11147 tests/interactive/test-cogl-tex-polygon.c | 57 ++++++++++++--------------
11148 tests/interactive/test-cogl-tex-tile.c | 27 +++++-------
11149 tests/interactive/test-text-field.c | 6 +--
11150 10 files changed, 112 insertions(+), 188 deletions(-)
11152 commit f82c9e7dba8d060506c36af185de6be387eddeaa
11153 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11154 Date: Mon Mar 9 17:32:15 2009 +0000
11156 [text] Convert units to the right type
11158 The COGL API expects a floating point value, so Units should be
11159 converted to floats, not to ClutterFixed.
11161 clutter/clutter-text.c | 4 ++--
11162 1 file changed, 2 insertions(+), 2 deletions(-)
11164 commit 97d0a4845ab971c032d55d4268c92bf311e51c47
11165 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11166 Date: Mon Mar 9 17:31:44 2009 +0000
11168 [texture] Fix ClutterFixed usage
11170 Do not use ClutterFixed and its macros inside the Texture.
11172 clutter/clutter-texture.c | 18 ++++++++----------
11173 1 file changed, 8 insertions(+), 10 deletions(-)
11175 commit 52811b240feba30ad1640294655a9f3086fe07d6
11176 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11177 Date: Mon Mar 9 17:24:44 2009 +0000
11179 [stage] Coalesce fog and perspective API
11181 The fog and perspective API is currently split in two parts:
11183 - the floating point version, using values
11185 - the fixed point version, using structures
11187 The relative properties are using the structure types, since they
11188 are meant to set multiple values at the same time. Instead of
11189 using bare values, the whole API should be coalesced into two
11190 simple calls using structures to match the GObject properties.
11194 clutter_stage_set_fog (ClutterStage*, const ClutterFog*)
11195 clutter_stage_get_fog (ClutterStage*, ClutterFog*)
11197 clutter_stage_set_perspective (ClutterStage*, const ClutterPerspective*)
11198 clutter_stage_get_perspective (ClutterStage*, ClutterPerspective*)
11200 Which supercedes the fixed point and floating point variants.
11202 More importantly, both ClutterFog and ClutterPerspective should
11203 using floating point values, since that's what get passed to
11206 ClutterFog should also drop the "density" member, since ClutterStage
11207 only allows linear fog; non-linear fog distribution can be achieved
11208 using a signal handler and calling cogl_set_fog() directly; this keeps
11209 the API compact yet extensible.
11211 Finally, there is no ClutterStage:fog so it should be added.
11213 clutter/clutter-main.c | 2 +-
11214 clutter/clutter-stage.c | 355 +++++++++++-------------------
11215 clutter/clutter-stage.h | 43 +---
11216 clutter/clutter-texture.c | 45 ++--
11217 tests/interactive/test-depth.c | 3 +-
11218 tests/interactive/test-texture-quality.c | 3 +-
11219 6 files changed, 172 insertions(+), 279 deletions(-)
11221 commit 628e54fa9ff1af99ca505d135bcc6f87bcd8ff11
11222 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11223 Date: Mon Mar 9 17:08:41 2009 +0000
11225 [interval] Update fixed-point handling
11227 Do not use ClutterFixed when dealing with fixed point values. Use
11230 clutter/clutter-interval.c | 8 ++++----
11231 1 file changed, 4 insertions(+), 4 deletions(-)
11233 commit fc40d75956e130a39c50cdaccc7af739a4591ac9
11234 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11235 Date: Mon Mar 9 17:07:47 2009 +0000
11237 [tests] Test CoglFixed, not ClutterFixed
11239 We really want to test the CoglFixed implementation, not the
11240 to-be-deprecated ClutterFixed one.
11242 tests/conform/test-clutter-fixed.c | 10 +++++-----
11243 1 file changed, 5 insertions(+), 5 deletions(-)
11245 commit 99110335056b5dce43822a6c64c3a457cca915bc
11246 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11247 Date: Mon Mar 9 17:06:22 2009 +0000
11249 [cogl-fixed] Implement the CoglFixed fundamental GType
11251 The type machinery for CoglFixed should be implemented by COGL
11252 itself, now that COGL exports the GType of its types.
11254 This allows moving most of what ClutterFixed did directly to
11255 CoglFixed where it belongs.
11257 clutter/cogl/cogl-types.h | 44 ++++++++-
11258 clutter/cogl/cogl.h.in | 33 -------
11259 clutter/cogl/common/cogl-util.c | 186 +++++++++++++++++++++++++++++++++++++--
11260 3 files changed, 223 insertions(+), 40 deletions(-)
11262 commit 720341b3018dfa2698642c4266a399c035a9ff24
11263 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11264 Date: Mon Mar 9 17:05:13 2009 +0000
11266 Move ClutterTimeline to CoglFixed
11268 The ClutterTimeline::get_progressx() method should return a
11269 CoglFixed, now that ClutterFixed is being deprecated.
11271 clutter/clutter-timeline.c | 25 ++++++++++---------------
11272 clutter/clutter-timeline.h | 29 +++++++----------------------
11273 2 files changed, 17 insertions(+), 37 deletions(-)
11275 commit 849e916d6fc568286223cab015ee1d3c0a1cb592
11276 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11277 Date: Mon Mar 9 17:03:37 2009 +0000
11279 Move ClutterBehaviourRotate to CoglFixed
11281 Remove the wrong usage of ClutterFixed and use CoglFixed instead
11282 in the API and the implementation.
11284 clutter/clutter-behaviour-rotate.c | 234 +++++++++++++++++++-----------------
11285 clutter/clutter-behaviour-rotate.h | 54 ++++++---
11286 2 files changed, 160 insertions(+), 128 deletions(-)
11288 commit 764dc3bac4683d972f04ed7f4e815d40513d189b
11289 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11290 Date: Mon Mar 9 17:03:00 2009 +0000
11292 Move ClutterBehaviourEllipse to CoglFixed
11294 Remove the wrong usage of ClutterFixed, and use CoglFixed instead
11295 in the API and the implementation.
11297 clutter/clutter-behaviour-ellipse.c | 482 +++++++++++++++++------------------
11298 clutter/clutter-behaviour-ellipse.h | 55 ++--
11299 2 files changed, 265 insertions(+), 272 deletions(-)
11301 commit 045ad21921edf047ec43825a3c1b5b0dba79b6c7
11302 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11303 Date: Thu Mar 5 20:17:11 2009 +0000
11305 Move BehaviourScale to CoglFixed
11307 ClutterFixed as a type is going away, superceded by CoglFixed. The
11308 fixed point entry points in the API should be ported to the
11309 CoglFixed type so that they are useful again.
11311 clutter/clutter-behaviour-scale.c | 278 ++++++++++++++++++-------------------
11312 clutter/clutter-behaviour-scale.h | 81 ++++++-----
11313 2 files changed, 177 insertions(+), 182 deletions(-)
11315 commit 7bf385a06700f152018626021cd2f2367572b3a2
11316 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11317 Date: Thu Mar 5 20:15:00 2009 +0000
11319 [cogl-fixed] Add a double-to-fixed conversion macro
11321 Since the conversion of a floating point value to a fixed point
11322 value is already done in double precision we can safely expose
11323 a macro that converts a double precision floating point value to
11326 clutter/cogl/cogl-fixed.h | 15 +++++++++++++--
11327 1 file changed, 13 insertions(+), 2 deletions(-)
11329 commit 4e98fc5e7931688da11be60a36c583c529ad8335
11330 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11331 Date: Tue Mar 3 22:51:17 2009 +0000
11333 [docs] Note that grabs are evil
11335 Grabs are an entirely evil way to override the whole event delivery
11336 machinery that Clutter has in place.
11338 A pointer grab can be effectively replaced by a much more reliable
11339 ::captured-event signal handler, for instance.
11341 Sometimes, grabs are a necessary evil -- and that is why Clutter
11342 exposes them in the API; that should not fool anyone into thinking
11343 that they should be used unless strictly necessary.
11345 clutter/clutter-main.c | 25 +++++++++++++++++++------
11346 1 file changed, 19 insertions(+), 6 deletions(-)
11348 commit c0adf4582ca41f046bfb67458ac1ca5d6d416f33
11349 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11350 Date: Thu Feb 26 15:35:20 2009 +0000
11352 [docs] Clarify clutter_actor_animate() behaviour
11354 When calling clutter_actor_animate() on an actor that is being
11355 currently animated the default behaviour is to update the duration
11356 of the animation; the easing mode; update all the common properties;
11357 and finally add the new properties.
11361 clutter_actor_animate (actor, 500, CLUTTER_LINEAR,
11366 clutter_actor_animate (actor, 250, CLUTTER_EASE_IN_CUBIC,
11372 Is logically equivalent to:
11374 clutter_actor_animate (actor, 250, CLUTTER_EASE_IN_CUBIC,
11381 The documentation of the function should be slightly more verbose
11382 in describing the default behaviour.
11384 clutter/clutter-animation.c | 26 +++++++++++++++++++++++++-
11385 1 file changed, 25 insertions(+), 1 deletion(-)
11387 commit a3839296c4311bb15091c52e59c214a6f4d33bd2
11388 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11389 Date: Sat Feb 28 19:13:18 2009 +0000
11391 [build] Various fixes for distcheck
11393 The generation of the GObject introspection data has broken
11394 the distcheck phase.
11396 The location of the header and source files should always be
11397 depending on the $(top_srcdir) and $(srcdir) variables,
11398 respectively; the special handling of the COGL API inside the
11399 GIR generation should also take those two variables into
11402 clutter/Makefile.am | 137 ++++++++++++++++++++++++----------------------
11403 clutter/json/Makefile.am | 22 ++++----
11404 2 files changed, 82 insertions(+), 77 deletions(-)
11406 commit 4a3a3e1cf344b992b2f978e5f2676cb0957b504a
11407 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11408 Date: Sat Feb 28 17:54:27 2009 +0000
11410 Add pkg-config file for COGL
11412 COGL should ship its own pkg-config file, obviously still pointing
11413 to Clutter's compiler flags and linking options, for COGL-specific
11414 variables that might be queried at configure time.
11416 For instance, it's easier (and less verbose) to do:
11418 PKG_CHECK_EXISTS([cogl-gl-1.0],
11419 [has_gl_backend=yes],
11420 [has_gl_backend=no])
11424 AC_MSG_CHECKING([for GL support in COGL])
11425 cogl_backend=`$PKG_CONFIG --variable=cogl clutter-0.9`
11426 if test x$cogl_backend = xgl; then
11428 AC_MSG_RESULT([found])
11431 AC_MSG_RESULT([not found])
11435 clutter/cogl/Makefile.am | 17 ++++++++++++++++-
11436 clutter/cogl/cogl.pc.in | 15 +++++++++++++++
11438 4 files changed, 33 insertions(+), 1 deletion(-)
11440 commit b030756dca23594e612fcfc3aac1ba3115f5893c
11441 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11442 Date: Sat Feb 28 17:19:05 2009 +0000
11444 [shader] Unify code paths
11446 ClutterShader contains a lot of duplication, as the vertex and fragment
11447 shader code paths are mostly the same.
11449 The code should be simplified by adding new internal functions that can
11450 be called with a value from the already present ClutterShaderType
11453 In the future it'll also be possible to deprecate the current split API
11454 and expose the generic accessors instead.
11456 clutter/clutter-shader.c | 343 ++++++++++++++++++++++++++--------------------
11457 po/POTFILES.in | 2 +
11458 2 files changed, 200 insertions(+), 145 deletions(-)
11460 commit 7d674db9d2c960a55e332b7ec631a01db317f013
11461 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11462 Date: Sat Feb 28 16:16:09 2009 +0000
11464 Clean up of the ClutterColor API
11466 The ClutterColor API has some inconsistencies:
11468 - the string deserialization function does not match the rest of
11469 the conversion function naming policy; the naming should be:
11471 clutter_color_parse() -> clutter_color_from_string()
11473 and the first parameter should be the ClutterColor that will
11474 be set from the string, not the string itself (a GDK-ism).
11476 - the fixed point API should not be exposed, especially in the
11477 form of ClutterFixed values
11479 - the non-fixed point HLS conversion functions do not make any
11480 sense. The values returned should be:
11482 hue := range [ 0, 360 ]
11483 luminance := range [ 0, 1 ]
11484 saturation := range [ 0, 1 ]
11486 like the current fixed point API does. Returning a value in
11487 the [ 0, 255 ] range is completely useless
11489 - the clutter_color_equal() should be converted for its use inside
11490 a GHashTable; a clutter_color_hash() should be added as well
11492 - the second parameter of the clutter_color_shade() function should
11493 be the shading factor, not the result (another GDK-ism). this way
11494 the function call can be translated from this:
11496 color.shade(out result, factor)
11498 to the more natural:
11500 color.shade(factor, out result)
11502 This somewhat large commit fixes all these issues and updates the
11503 internal users of the API.
11505 clutter/clutter-color.c | 592 +++++++++++++++-------------
11506 clutter/clutter-color.h | 99 +++--
11507 clutter/clutter-deprecated.h | 2 +
11508 clutter/clutter-script.c | 2 +-
11509 doc/reference/clutter/clutter-sections.txt | 16 +-
11510 tests/interactive/test-behave.c | 2 +-
11511 tests/interactive/test-layout.c | 2 +-
11512 7 files changed, 374 insertions(+), 341 deletions(-)
11514 commit 8a1eca72877471af08da8c1874e4b718e5640628
11515 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11516 Date: Sat Feb 28 16:03:11 2009 +0000
11518 [cogl] Add a PANGO debug flag for CoglPango use
11520 The CoglPango code falls under the COGL "jurisdiction"; this means
11521 that it cannot include Clutter headers unless strictly necessary.
11523 The CoglPangoRenderer code was using the CLUTTER_NOTE() macro. Now
11524 that COGL has it's own COGL_NOTE() similar macro, CoglPango should
11525 use that and avoid including clutter-debug.h (which pulls in
11526 clutter-private.h which in turn pulls in clutter-actor.h).
11528 A new flag, COGL_DEBUG_PANGO, has been added to the COGL debug
11531 clutter/cogl/cogl-debug.h | 3 ++-
11532 clutter/cogl/common/cogl-debug.c | 3 ++-
11533 clutter/pango/cogl-pango-render.c | 5 ++---
11534 3 files changed, 6 insertions(+), 5 deletions(-)
11536 commit 3a4538e4f25a406d65b5956d379a696067d4cdd2
11537 Author: Colin Walters <walters@verbum.org>
11538 Date: Mon Mar 9 14:17:18 2009 -0400
11540 Typo in clutter-win32.pc.in introduced by commit 24ce19383
11542 clutter/win32/clutter-win32.pc.in | 2 +-
11543 1 file changed, 1 insertion(+), 1 deletion(-)
11545 commit ee6145c795abf1814297a3e3a5b01620e06b58c1
11546 Author: Neil Roberts <neil@linux.intel.com>
11547 Date: Mon Mar 9 18:40:58 2009 +0000
11549 Set the mapped flag on the stage in the SDL and eglnative backends
11551 Bug 1493 - GL ES does not work since Jan 9 in PowerVR SGX 535, Intel
11553 The mapped flag needs to be set on the stage otherwise
11554 clutter_actor_queue_redraw will never queue a redraw and never draw
11557 In these two backends there is not really a way to hide the stage so
11558 they both set the mapped flag immediatly when clutter_actor_show is
11561 clutter/eglnative/clutter-stage-egl.c | 4 ++++
11562 clutter/sdl/clutter-stage-sdl.c | 4 ++++
11563 2 files changed, 8 insertions(+)
11565 commit f9d996a4603bef1f52e32e99f9f69a32b7c823ba
11566 Author: Owen W. Taylor <otaylor@redhat.com>
11567 Date: Fri Feb 27 13:39:53 2009 -0500
11569 Use COGL to establish GL state for ClutterGLXTexturePixmap
11571 Using glEnable() directly confuses COGL and can result in problems
11572 like subsequent pick operations not working correctly. Get the
11573 material for the ClutterTexture and call cogl_material_flush_gl_state()
11576 http://bugzilla.openedhand.com/show_bug.cgi?id=1483
11578 clutter/glx/clutter-glx-texture-pixmap.c | 26 +++++++++-----------------
11579 1 file changed, 9 insertions(+), 17 deletions(-)
11581 commit 65c5188c7e6edf4b77887234035ae6a30fca9cb1
11582 Author: Neil Roberts <neil@linux.intel.com>
11583 Date: Mon Mar 9 12:28:22 2009 +0000
11585 [eglnative] Add -I flags for the clutter dir in the src and build dirs
11587 These are required to include the Cogl header files.
11589 clutter/eglnative/Makefile.am | 2 ++
11590 1 file changed, 2 insertions(+)
11592 commit 67523ddc6e6714629cd3582b6bb4d9dc42740ba5
11593 Author: Neil Roberts <neil@linux.intel.com>
11594 Date: Mon Mar 9 10:59:52 2009 +0000
11596 Fix warning in clutter-backend-sdl
11598 Removed direct use of SDL_GetError as a format string for g_set_error
11599 to fix a compiler warning.
11601 clutter/sdl/clutter-backend-sdl.c | 2 +-
11602 1 file changed, 1 insertion(+), 1 deletion(-)
11604 commit 24ce19383600df952dc5b3eb6055b8851b9cbd21
11605 Author: Colin Walters <walters@verbum.org>
11606 Date: Fri Mar 6 00:19:12 2009 -0500
11608 Bug 1491 - Fix hardcoded lib path in .pc files
11610 We should instead use @libdir@ from configure to be correct
11611 on multilib systems.
11613 clutter.pc.in | 6 +++---
11614 clutter/win32/clutter-win32.pc.in | 6 +++---
11615 clutter/x11/clutter-x11.pc.in | 6 +++---
11616 3 files changed, 9 insertions(+), 9 deletions(-)
11618 commit 9df3fb993c222d35171fe6067257fc17e3c3979e
11619 Author: Øyvind Kolås <pippin@linux.intel.com>
11620 Date: Fri Feb 27 17:59:16 2009 +0000
11622 Add a warning for recursive emit_event
11624 When event delivery is invoked by synthetic events through
11625 clutter_do_event from inside an event handler clutter was silently
11626 ignoring it, this warning will hopefully help resolving some issues.
11628 clutter/clutter-main.c | 5 ++++-
11629 1 file changed, 4 insertions(+), 1 deletion(-)
11631 commit af0726480c29ac8c327ce302a55ef4eaed757594
11632 Author: Robert Bragg <robert@linux.intel.com>
11633 Date: Wed Feb 25 16:23:09 2009 +0000
11635 [cogl-matrix] Documents that CoglMatrix members should be considered read only
11637 In the future if we want to annotate matrices with internal flags, and add
11638 caching of the inverse matrix then we need to ensure that all matrix
11639 modifications are done by cogl_matrix API so we'd know when to dirty the
11640 cache or update the flags.
11642 This just adds documentation to that effect, and assuming the most likley
11643 case where someone would try and directly write to matrix members would
11644 probably be to load a constant matrix other than the identity matrix; I
11645 renamed cogl_matrix_init_from_gl_matrix to cogl_matrix_init_from_array to
11646 make it seem more general purpose.
11648 clutter/cogl/cogl-matrix.h | 23 +++++++++++++++--------
11649 clutter/cogl/common/cogl-matrix.c | 6 +++---
11650 clutter/cogl/gl/cogl.c | 6 +++---
11651 clutter/cogl/gles/cogl.c | 6 +++---
11652 doc/reference/cogl/cogl-sections.txt | 2 ++
11653 5 files changed, 26 insertions(+), 17 deletions(-)
11655 commit 0a218a64e2730e55953deedefbaa6f62ebbf5c4a
11656 Author: Robert Bragg <robert@linux.intel.com>
11657 Date: Tue Feb 24 11:33:58 2009 +0000
11659 [cogl-matrix] Adds padding to CoglMatrix
11661 This adds enough padding to allow us to potentially add a cache of the inverse
11662 matrix in the future and private flags to annotate matrices.
11664 clutter/cogl/cogl-matrix.h | 4 ++++
11665 1 file changed, 4 insertions(+)
11667 commit b39223d8cbdb104df4a1f5791c3d4f8acd5b31d1
11668 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11669 Date: Thu Feb 26 15:32:48 2009 +0000
11671 [backend] Constify font options
11673 The font options accessors in ClutterBackend only deal with const
11674 cairo_font_options_t values, since:
11676 - set_font_options() will copy the font options
11677 - get_font_options() will return a pointer to the internal
11680 Not using const in these cases makes the API confusing and might lead
11681 to erroneous calls to cairo_font_options_destroy().
11683 clutter/clutter-backend.c | 17 +++++++++++------
11684 clutter/clutter-backend.h | 30 +++++++++++++++---------------
11685 clutter/clutter-main.c | 23 +++++++++++++----------
11686 3 files changed, 39 insertions(+), 31 deletions(-)
11688 commit 83542959869374376361ae0a05b93a9aaafe472a
11689 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11690 Date: Fri Jan 9 15:02:50 2009 +0000
11692 Intern the ClutterScriptable type name
11694 Like we do for other types, use the I_() macro to intern the
11695 type name during the GType registration for ClutterScriptable.
11697 clutter/clutter-scriptable.c | 13 ++++++++-----
11698 1 file changed, 8 insertions(+), 5 deletions(-)
11700 commit 28a3cbf38e299f56f52bd9f0cff9f91e96275d23
11701 Author: Bastian Winkler <buz@netbuz.org>
11702 Date: Tue Feb 24 20:07:31 2009 +0100
11704 Remove redundant declaration in clutter-text.h
11706 clutter-text.h declares clutter_text_get_layout twice.
11708 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
11710 clutter/clutter-text.h | 1 -
11711 1 file changed, 1 deletion(-)
11713 commit 0fc9452b034808c51980cabd99573d67d9963936
11714 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11715 Date: Thu Feb 26 12:46:36 2009 +0000
11717 [build] Do not shave typelib generation
11719 Bug 1478 - typelib creation shaved out of existence
11721 Add a 'GEN' output rule for the typelib files created when
11722 introspection is enabled.
11724 clutter/Makefile.am | 2 +-
11725 1 file changed, 1 insertion(+), 1 deletion(-)
11727 commit 259443b1453e5094cf7016141df39ceba65cd5cb
11728 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11729 Date: Thu Feb 26 11:55:53 2009 +0000
11731 [build] Put the X11 pc dependencies in another variable
11733 If X11 comes with pkg-config files (like it should) we should not add
11734 those dependencies to the generic BACKEND_PC_FILES variable: that
11735 variable is meant only for backend-specific dependencies handled by
11736 pkg-config -- and Clutter supports non-X11 backends as well.
11738 The X11_PC_FILES variable will only contain X11-related dependencies,
11739 and will be set as part of BACKEND_PC_FILES only inside the GLX and
11740 EGLX backends sections.
11742 configure.ac | 15 ++++++++++-----
11743 1 file changed, 10 insertions(+), 5 deletions(-)
11745 commit 402e2e0d82024f79c0b9b5f76056b331abec0caa
11746 Author: Owen W. Taylor <otaylor@fishsoup.net>
11747 Date: Wed Feb 25 15:46:09 2009 -0500
11749 Fix x/y confusion for GL_TEXTURE_RECTANGLE_ARB
11751 When "denormalizing" for texture rectangles, multiple X coordinates
11752 by the X size and Y coordinates by the Y size.
11754 http://bugzilla.openedhand.com/show_bug.cgi?id=1479
11756 clutter/cogl/gl/cogl-texture.c | 4 ++--
11757 1 file changed, 2 insertions(+), 2 deletions(-)
11759 commit ce83007c1d140e91250d933ba9e533a00ffb9e84
11760 Author: Neil Roberts <neil@linux.intel.com>
11761 Date: Thu Feb 26 10:56:42 2009 +0000
11763 [cogl-pango-glyph-cache] Fix compiler warning on 64-bit
11765 gcc warns about casting a pointer to a guint because it is a different
11766 size on 64-bit machines. However the pointer is only used as a hash so
11767 it doesn't matter if we lose the most significant bits. The patch
11768 makes it use GPOINTER_TO_UINT instead which first casts it to a gulong
11769 and avoids the warning.
11771 clutter/pango/cogl-pango-glyph-cache.c | 2 +-
11772 1 file changed, 1 insertion(+), 1 deletion(-)
11774 commit 1626d6132e9bab267463b5f532567e22006771db
11775 Author: Neil Roberts <neil@linux.intel.com>
11776 Date: Wed Feb 25 17:10:54 2009 +0000
11778 [clutter-texture] Use a GThreadPool for loading async textures
11780 Instead of creating a separate thread for each texture load, the loads
11781 are now queued in a thread pool which will use at most 3 textures at a
11782 time. This avoids the potentially large overhead of creating and
11783 destroying a thread for every image while still avoiding throttling
11784 the CPU if a large number of textures are loaded at the same time.
11786 If the load is cancelled the old code needed to join the thread which
11787 effectively meant it had to wait for the load to finish. With this
11788 model the threads are owned by the thread pool so there is no need to
11789 wait for them to finish. Instead, each thread is given its own thread
11790 data which we can use to mark the thread as aborted. Once the load is
11791 finished the thread will check whether it is aborted before setting
11792 the texture data. That way the ClutterTexture can just disown threads
11793 that it needs to cancel.
11795 clutter/clutter-texture.c | 295 ++++++++++++++++++++++++++++-----------------
11796 1 file changed, 184 insertions(+), 111 deletions(-)
11798 commit 3425331cc167f029bc4b86a66d95d3e498f52514
11799 Author: Neil Roberts <neil@linux.intel.com>
11800 Date: Tue Feb 24 16:44:30 2009 +0000
11802 [tests/tools] Don't install libdisable-npots.so
11804 The libdisable-npots library is just used as a helper as part of
11805 make test so it should not be installed.
11807 If noinst_* is used then automake will generate a static library but
11808 this won't work with LD_PRELOAD so we then need an extra custom rule
11809 to link that into a shared library. The custom rule uses the $(LINK)
11810 Makefile var which gets put in the Makefile because of the static
11811 library. We pass libtool a stub -rpath option which causes it to
11812 generate a shared library.
11814 tests/tools/Makefile.am | 22 ++++++++++++++++------
11815 1 file changed, 16 insertions(+), 6 deletions(-)
11817 commit bff6ce414af6cc3e5d12d9eaed36ff64e5e16fc0
11818 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11819 Date: Tue Feb 24 16:16:25 2009 +0000
11821 [media] Add sub-second resolution for the duration
11823 The duration in ClutterMedia is currently expressed in integer multiples
11824 of a second. This does not offer enough granularity for media playback
11825 that has fractionary durations -- 2.3 seconds; 1 minute, 23.4 seconds;
11826 1 hour, 23 minutes, 4.5 seconds; etc.
11828 The duration value should be expressed in seconds with a sub-second
11829 granularity; for this reason, a double should be used insted of an
11832 The semantics haven't changed: the :duration property still exposes
11835 clutter/clutter-media.c | 14 +++++++-------
11836 clutter/clutter-media.h | 2 +-
11837 2 files changed, 8 insertions(+), 8 deletions(-)
11839 commit dd3c760cc5ef26378ac71d9b33ed961ebc542ab8
11840 Author: Bastian Winkler <buz@netbuz.org>
11841 Date: Tue Feb 24 15:58:40 2009 +0000
11843 [media] Fix the interface cast macro
11845 Bug 1474 - ClutterMedia interface
11847 The GET_INTERFACE() macro is still using the old type name of
11848 the ClutterMedia interface structure in the cast.
11850 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
11852 clutter/clutter-media.h | 2 +-
11853 1 file changed, 1 insertion(+), 1 deletion(-)
11855 commit eaf202c886293035e875c7e940fa97ee970dd046
11856 Author: Jonathan Matthew <notverysmart@gmail.com>
11857 Date: Tue Feb 24 09:25:53 2009 +0000
11859 Declare the EnumValues for PixelFormat static
11861 Bug 1473 - CoglPixelFormat enum data must be declared static
11863 When registering an enumeration GType, the GEnumValue or GFlagsValue
11864 arrays must be declared static; otherwise, you get a segmentation
11865 fault when calling the function again.
11867 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
11869 clutter/cogl/common/cogl-util.c | 2 +-
11870 1 file changed, 1 insertion(+), 1 deletion(-)
11872 commit 3409a941a4161562e6020e47c482a6b01b7eff11
11873 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11874 Date: Mon Feb 23 15:22:08 2009 +0000
11876 Use a dynamic array for the actors when delivering events
11878 Instead of using a fixed size array for storing the scenegraph sub-node
11879 during event delivery we should use a GPtrArray. The benefits are:
11881 - a smaller allocation
11882 - no undocumented yet binding constraint on the scenegraph size
11884 clutter/clutter-main.c | 35 +++++++++++++++--------------------
11885 1 file changed, 15 insertions(+), 20 deletions(-)
11887 commit 64db7896dbd4286d94367fbf173bb18f1c793a70
11888 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11889 Date: Mon Feb 23 15:19:11 2009 +0000
11891 Remove stray fixed point macro usage
11893 The CoglPango renderer is using a CLUTTER_FIXED macro, but the
11894 whole code has been Clutter-free for a while, now.
11896 clutter/pango/cogl-pango-render.c | 8 ++++----
11897 1 file changed, 4 insertions(+), 4 deletions(-)
11899 commit 62ac234ca9b109c98773d2029357c110cf000aab
11900 Author: Robert Bragg <robert@linux.intel.com>
11901 Date: Mon Feb 23 16:33:42 2009 +0000
11903 [test-vertex-buffer-contiguous] Improves the texturing test
11905 The test now explicitly reads back from the framebuffer to sanity check that
11906 texturing is happening as expected, and it now uses a fixed 2x2 texture instead
11907 of redhand.png since redhand.png doesn't have a power of two size which can
11908 cause the vertex buffer code to complain on hardware not supporting npot
11911 tests/conform/Makefile.am | 7 ------
11912 tests/conform/test-vertex-buffer-contiguous.c | 29 +++++++++++++++++++++++--
11913 2 files changed, 27 insertions(+), 9 deletions(-)
11915 commit 0bc1f36ead2909ac89e163f3592654c6ac78a112
11916 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11917 Date: Mon Feb 23 13:44:03 2009 +0000
11919 [docs] Document envvars and command line switches
11921 Clutter uses checks on various environment variables and installs
11922 various command line switches. The API reference should list them
11923 and document them both.
11925 doc/reference/clutter/Makefile.am | 6 +-
11926 doc/reference/clutter/clutter-docs.xml | 2 +-
11927 doc/reference/clutter/running-clutter.xml | 172 +++++++++++++++++++++++++++++
11928 3 files changed, 177 insertions(+), 3 deletions(-)
11930 commit 7d181636ed29d60eacd3e5a27a7a2dc06cb867c8
11931 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11932 Date: Mon Feb 23 13:17:06 2009 +0000
11934 Make fuzzy picking a command line switch
11936 The CLUTTER_FUZZY_PICK environment variable is the last one used
11937 by Clutter without a corresponding command line switch.
11939 clutter/clutter-main.c | 21 ++++++++++++++++-----
11940 1 file changed, 16 insertions(+), 5 deletions(-)
11942 commit 42fa1e035b25f195a5da8e6ac7148079db4c8080
11943 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11944 Date: Mon Feb 23 13:08:59 2009 +0000
11946 Make disable text mipmapping a command line switch
11948 The environment variable to disable mipmapping should also be
11949 a command line switch, and be handled like the rest of Clutter's
11950 environment variables/command line switches.
11952 clutter/clutter-main.c | 16 +++++++++++++---
11953 1 file changed, 13 insertions(+), 3 deletions(-)
11955 commit a1f0b25d142cc4f52b9d50f86441a429e5f5b263
11956 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11957 Date: Mon Feb 23 12:55:01 2009 +0000
11959 [actor] Remove usage of ClutterFixed
11961 The ClutterFixed type and symbols are now equivalent to the native
11962 float type. In order to remove ambiguity and clean up the code, any
11963 usage of ClutterFixed and relative macros has been removed.
11965 clutter/clutter-actor.c | 364 +++++++++++++++++++++--------------------------
11966 1 file changed, 164 insertions(+), 200 deletions(-)
11968 commit 605dfb8fd0451dd087a13cb21032a288ce5a3ea3
11969 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11970 Date: Mon Feb 23 12:47:02 2009 +0000
11972 Add runtime debug messages for COGL
11974 Clutter is able to show debug messages written using the CLUTTER_NOTE()
11975 macro at runtime, either by using an environment variable:
11979 or by using a command line switch:
11981 --clutter-debug=...
11982 --clutter-no-debug=...
11984 Both are parsed during the initialization process by using the
11987 COGL would benefit from having the same support.
11989 In order to do this, we need a cogl_get_option_group() function in
11990 COGL that sets up a GOptionGroup for COGL and adds a pre-parse hook
11991 that will check the COGL_DEBUG environment variable. The OptionGroup
11992 will also install two command line switches:
11997 With the same semantics of the Clutter ones.
11999 During Clutter initialization, the COGL option group will be attached
12000 to the GOptionContext used to parse the command line options passed
12001 to a Clutter application.
12003 Every debug message written using:
12005 COGL_NOTE (SECTION, "message format", arguments);
12007 Will then be printed only if SECTION was enabled at runtime.
12009 This whole machinery, like the equivalent one in Clutter, depends on
12010 a compile time switch, COGL_ENABLE_DEBUG, which is enabled at the same
12011 time as CLUTTER_ENABLE_DEBUG. Having two different symbols allows
12012 greater granularity.
12014 clutter/clutter-main.c | 10 +++-
12015 clutter/cogl/cogl-debug.h | 45 +++++++++++++++++
12016 clutter/cogl/cogl.h.in | 18 ++++++-
12017 clutter/cogl/common/Makefile.am | 3 +-
12018 clutter/cogl/common/cogl-debug.c | 98 ++++++++++++++++++++++++++++++++++++++
12019 clutter/cogl/gl/Makefile.am | 4 +-
12020 clutter/cogl/gles/Makefile.am | 4 +-
12021 configure.ac | 4 +-
12022 8 files changed, 177 insertions(+), 9 deletions(-)
12024 commit a4c8e7847710a3818e3839224251cafe24c4ceb6
12025 Author: Neil Roberts <neil@linux.intel.com>
12026 Date: Mon Feb 23 11:36:03 2009 +0000
12028 Add an environment variable to disable mipmapped text
12030 Mipmapped text is enabled by default in Clutter but it can cause
12031 problems on some drivers so it is convenient to have an environment
12032 variable to disable it for all apps.
12034 clutter/clutter-main.c | 3 ++-
12035 1 file changed, 2 insertions(+), 1 deletion(-)
12037 commit 8d04fbb05eedaf54380c12fee46ffd3fa9ae61a3
12038 Author: Robert Bragg <robert@linux.intel.com>
12039 Date: Sun Feb 22 15:25:00 2009 +0000
12041 [Cogl] Remove a debugging assert that was triggering on false positives
12043 An assert to verify there was no error when generating a buffer object
12044 for the vertex buffer API was being hit when running the GLES1 conformance
12047 clutter/cogl/common/cogl-vertex-buffer.c | 2 --
12048 1 file changed, 2 deletions(-)
12050 commit 5e956a88b822ce9d9eecbd432a0141375bed5ab6
12051 Author: Robert Bragg <robert@linux.intel.com>
12052 Date: Thu Feb 19 09:20:20 2009 +0000
12054 [cogl-material] Always glBindTexture when flushing material state
12056 Bug #1457 - Creating a new texture messes up the cogl material state
12057 cache; reported by Neil Roberts
12059 We still don't have caching of bound texture state so we always have to
12060 re-bind the texture when flushing the GL state of any material layers.
12062 clutter/cogl/common/cogl-material.c | 42 +++++++++++++++++++----------------
12063 1 file changed, 23 insertions(+), 19 deletions(-)
12065 commit d13b9de2e27d3db21f4515bf579927df5b42c330
12066 Author: Robert Bragg <robert@linux.intel.com>
12067 Date: Thu Feb 19 09:01:18 2009 +0000
12069 [Cogl] Fixes automatic handling of the GL blend enable state.
12071 Bug #1460 - Handling of flags in cogl_material_set_color
12073 Cogl automatically enables/disables blending based on whether the source color
12074 has an alhpa < 1.0, or if any textures with an alpha component are in use, but
12075 it wasn't doing it quite right.
12077 At the same time I removed some of the dirty flags which on second thought
12078 are nothing more than micro-optimsations that only helped clutter the code.
12080 thanks to Owen Taylor for reporting the bug
12082 clutter/cogl/common/cogl-material-private.h | 10 ++--
12083 clutter/cogl/common/cogl-material.c | 78 ++++++++++-----------------
12084 clutter/cogl/gl/cogl-context.c | 1 -
12085 clutter/cogl/gles/cogl-context.c | 1 -
12086 4 files changed, 31 insertions(+), 59 deletions(-)
12088 commit 34e53736edb3579822ef36f39cce42ca7dc87d70
12089 Author: Robert Bragg <robert@linux.intel.com>
12090 Date: Wed Feb 18 18:54:54 2009 +0000
12092 [Cogl] the cogl_get_*_matrix functions now work with CoglMatrix types
12094 Since the CoglMatrix type was added for supporting texture matrices recently
12095 it made sense to be consistent accross the Cogl API and use the Cogl type
12096 over the GL style GLfloat m[16] arrays.
12099 clutter/clutter-actor.c | 117 +++++++++++----------------------
12100 clutter/cogl/cogl-matrix.h | 36 ++++++++++
12101 clutter/cogl/cogl.h.in | 14 ++--
12102 clutter/cogl/common/cogl-clip-stack.c | 14 ++--
12103 clutter/cogl/common/cogl-matrix.c | 46 ++++++++-----
12104 clutter/cogl/gl/cogl.c | 27 +++++---
12105 clutter/cogl/gles/cogl.c | 27 +++++---
12106 8 files changed, 160 insertions(+), 124 deletions(-)
12108 commit 4af0717b0022b58797bfbd1df12917840c3fb9c3
12109 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12110 Date: Sat Feb 21 13:47:02 2009 +0000
12112 [ignore] Update with the introspection files
12114 .gitignore | 4 ++++
12115 1 file changed, 4 insertions(+)
12117 commit 82f83ffbfb7c8ea63d04e0b0d655bc251abf4a66
12118 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12119 Date: Sat Feb 21 13:44:14 2009 +0000
12121 [build] Move all the compiler flags to AM_CFLAGS
12123 The INCLUDES directive should only contain pre-processor flags, since
12124 we're passing it also to the introspection scanner.
12126 Using AM_CFLAGS for compiler flags, like debug flags and maintainer
12127 flags, is more indicated.
12129 clutter/Makefile.am | 4 +---
12130 1 file changed, 1 insertion(+), 3 deletions(-)
12132 commit f4df307ddd6e0c977c57aaba1b1e4adfa143c1b0
12133 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12134 Date: Fri Feb 20 15:39:32 2009 +0000
12136 [backend] Update the viewport when updating the GL context
12138 Bug 1442 - multistage, same-window resize events invalidate stage
12140 When ensuring that the GL context is attached to the correct
12141 ClutterStage we need to set the SYNC_MATRICES flag on the stage
12142 itself. This is needed in case the size of the new stage does
12143 not match the size of the old -- thus requiring a call to
12144 glViewport() when the paint cycle starts.
12146 clutter/clutter-backend.c | 11 +++++++++++
12147 1 file changed, 11 insertions(+)
12149 commit fa996734cff073a8acb7adb1d758059be25cb025
12150 Author: Neil Roberts <neil@linux.intel.com>
12151 Date: Fri Feb 20 16:37:20 2009 +0000
12153 [cogl-gles2-wrapper] Actually call glActiveTexture
12155 cogl_wrap_glActiveTexture needs to call the GL version of
12156 glActiveTexture otherwise the subsequent calls to glBindTexture will
12157 all be using texture unit 0. This fixes test-cogl-multitexture.
12159 clutter/cogl/gles/cogl-gles2-wrapper.c | 2 ++
12160 1 file changed, 2 insertions(+)
12162 commit b0df99fbad39b56bbe65b61063d30c3013debd0f
12163 Author: Neil Roberts <neil@linux.intel.com>
12164 Date: Fri Feb 20 15:56:57 2009 +0000
12166 [cogl-gles2-wrapper] Convert texture unit settings to be a static sized array
12168 Previously the texture unit settings were stored in growable GArrays
12169 and every time a new texture unit was encountered it would expand the
12170 arrays. However the array wasn't copied when stored in a
12171 CoglGles2WrapperSettings struct so all settings had the same
12172 array. This meant that it wouldn't detect that a different program is
12173 needed if a texture unit is disabled or enabled.
12175 The texture unit settings arrays are all now a fixed size and the
12176 enabledness of each unit is stored in a bit mask. Therefore the
12177 settings can just be copied around by assignment as before.
12179 This puts a limit on the number of texture units accessible by Cogl
12180 but I think it is worth it to make the code simpler and more
12181 efficient. The material API already poses a limit on the number of
12182 texture units it can use.
12184 clutter/cogl/gles/cogl-gles2-wrapper.c | 444 +++++++++++++++-----------------
12185 clutter/cogl/gles/cogl-gles2-wrapper.h | 36 +--
12186 2 files changed, 229 insertions(+), 251 deletions(-)
12188 commit 21aa09748c95912de5f32fdaa84183c3e8b0f412
12189 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12190 Date: Fri Feb 20 14:39:51 2009 +0000
12192 Add build machinery for gobject-introspection data
12194 configure.ac: Check for gobject-introspection
12196 build/introspection.m4: Include the file that defines the
12197 GOBJECT_CHECK_INTROSPECTION m4 macro in case we want to disable
12198 the introspection data generation.
12200 clutter/json/Makefile.am: Build the .gir for "ClutterJson"
12201 (json-glib as part of the Clutter library)
12203 clutter/Makefile.am: Build the .gir for clutter, compile the
12204 Clutter and ClutterJson girs into typelibs, and install them.
12205 Also move GCC_FLAGS from $(INCLUDES) to $(AM_CFLAGS) since it includes
12206 non-preprocessor flag like -Wall.
12210 http://bugzilla.openedhand.com/show_bug.cgi?id=1450
12212 Based on a patch by: Owen W. Taylor <otaylor@fishsoup.net>
12214 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
12216 build/autotools/Makefile.am | 1 +
12217 build/autotools/introspection.m4 | 88 ++++++++++++++++++++++++++++++++++++++
12218 clutter/Makefile.am | 61 +++++++++++++++++++++++++-
12219 clutter/json/Makefile.am | 24 +++++++++++
12220 configure.ac | 4 ++
12221 5 files changed, 177 insertions(+), 1 deletion(-)
12223 commit c5afd98416f9c9299eaedf21a4e16f06f1b52418
12224 Author: Owen W. Taylor <otaylor@fishsoup.net>
12225 Date: Mon Feb 16 19:25:20 2009 -0500
12227 Add gobject-introspection annotations
12229 Add annotations such as (transfer-none) (out) (element-type ClutterActor),
12230 and so forth to the doc comments as appropriate.
12232 The annotations added here are a combination of the annotations previously
12233 in gir-repository for Clutter and annotations found in a review of all
12234 return values with that were being parsed with a transfer of "full".
12236 http://bugzilla.openedhand.com/show_bug.cgi?id=1452
12238 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
12240 clutter/clutter-actor.c | 32 ++++++++++++++++----------------
12241 clutter/clutter-alpha.c | 2 +-
12242 clutter/clutter-animation.c | 24 +++++++++++++-----------
12243 clutter/clutter-backend.c | 10 +++++-----
12244 clutter/clutter-behaviour-path.c | 2 +-
12245 clutter/clutter-behaviour.c | 8 ++++----
12246 clutter/clutter-binding-pool.c | 8 ++++----
12247 clutter/clutter-child-meta.c | 4 ++--
12248 clutter/clutter-clone.c | 2 +-
12249 clutter/clutter-color.c | 20 ++++++++++----------
12250 clutter/clutter-container.c | 23 ++++++++++++-----------
12251 clutter/clutter-event.c | 6 +++---
12252 clutter/clutter-group.c | 2 +-
12253 clutter/clutter-interval.c | 8 ++++----
12254 clutter/clutter-main.c | 32 ++++++++++++++++++--------------
12255 clutter/clutter-model.c | 32 ++++++++++++++++----------------
12256 clutter/clutter-path.c | 2 +-
12257 clutter/clutter-score.c | 13 +++++++------
12258 clutter/clutter-script.c | 8 ++++----
12259 clutter/clutter-shader-types.c | 8 ++++----
12260 clutter/clutter-stage-manager.c | 12 ++++++------
12261 clutter/clutter-stage.c | 6 +++---
12262 clutter/clutter-text.c | 7 +++----
12263 clutter/clutter-timeline.c | 6 +++---
12264 clutter/json/json-array.c | 8 ++++----
12265 clutter/json/json-node.c | 6 +++---
12266 clutter/json/json-object.c | 11 ++++++-----
12267 clutter/json/json-parser.c | 4 ++--
12268 28 files changed, 157 insertions(+), 149 deletions(-)
12270 commit 1d68dcab1f341e17e88c62d555d7f072aa66d875
12271 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12272 Date: Fri Feb 20 12:01:32 2009 +0000
12274 [docs] Rename cogl-docs from sgml to xml
12276 The cogl-docs.sgml file has always been XML, so it's only fitting that
12277 we actually call it cogl-docs.xml.
12279 doc/reference/cogl/Makefile.am | 2 +-
12280 doc/reference/cogl/cogl-docs.sgml | 106 -------------------------------------
12281 doc/reference/cogl/cogl-docs.xml | 106 +++++++++++++++++++++++++++++++++++++
12282 3 files changed, 107 insertions(+), 107 deletions(-)
12284 commit 255faf602f7aa2a0c9add3e4200dc21c2d77494b
12285 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12286 Date: Fri Feb 20 12:00:41 2009 +0000
12288 [docs] Add the 1.0 symbols index
12290 Add the index of symbols available since 1.0 to the Clutter
12293 doc/reference/clutter/clutter-docs.xml | 4 ++++
12294 1 file changed, 4 insertions(+)
12296 commit 6b2c8f68e0298ae9382de1b31720bbb5c7cd58ac
12297 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12298 Date: Fri Feb 20 11:58:04 2009 +0000
12300 [docs] Use the --name-space option
12302 Now that we depend on gtk-doc 1.11 we can use the --name-space
12303 command line option for the mkdb utility.
12305 doc/reference/clutter/Makefile.am | 2 +-
12306 doc/reference/cogl/Makefile.am | 2 +-
12307 2 files changed, 2 insertions(+), 2 deletions(-)
12309 commit 38faebf7e9993bc392bb8ebe0ede09ffce5b23ee
12310 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12311 Date: Fri Feb 20 11:55:54 2009 +0000
12313 [docs] Require gtk-doc 1.11
12315 The new stable release of gtk-doc provides the --name-space
12316 option for the mkdb utility. This option allows to specify a
12317 namespace for the symbols that will get stripped, so that we
12318 don't get a symbols index containing only "C".
12320 configure.ac | 2 +-
12321 1 file changed, 1 insertion(+), 1 deletion(-)
12323 commit 3bfbcedec8c0426406d52d073131feeeed560f32
12324 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12325 Date: Fri Feb 20 11:39:47 2009 +0000
12327 Do not use GL types in Clutter headers
12329 Bug 1451 - clutter_value_get_shader_matrix() return value
12331 The return value of the get_shader_matrix() function should be
12332 gfloat, not GLfloat.
12334 clutter/clutter-shader-types.h | 2 +-
12335 1 file changed, 1 insertion(+), 1 deletion(-)
12337 commit 181610604738918d5e0aff91a353047c3a60607d
12338 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12339 Date: Fri Feb 20 11:36:54 2009 +0000
12341 [timeline] Set the n_markers out paramater
12343 Bug 1464 - clutter_timeline_list_markers should set n_markers=0 when
12344 there are no markers
12346 If no markers are registered and we bail out we should also set the
12347 n_markers out parameter to 0 so that code checking the number of
12348 markers will still work.
12350 clutter/clutter-timeline.c | 3 +++
12351 1 file changed, 3 insertions(+)
12353 commit effbbe2e1e4205927f7f4f588eeea52f3940a5ce
12354 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12355 Date: Fri Feb 20 11:17:52 2009 +0000
12357 [path] Do not accept NULL descriptions
12359 Bug 1465 - clutter_path_parse_description should check p==NULL
12361 When accepting a stringified path description, ClutterPath methods
12362 and the parser should not accept NULL or empty strings.
12364 clutter/clutter-path.c | 10 ++++++++--
12365 1 file changed, 8 insertions(+), 2 deletions(-)
12367 commit 96317854c8ed385b2091ede209915e90e8a0044c
12368 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12369 Date: Tue Feb 10 18:05:21 2009 +0000
12371 [behaviour] Do not notify empty behaviours
12373 If a behaviour does not have actors associated to it then it should
12374 not invoke the ::alpha_notify() implementation.
12376 clutter/clutter-behaviour.c | 4 ++++
12377 1 file changed, 4 insertions(+)
12379 commit 97431b46700fbbe966f33fae13f9728d77cb2687
12380 Author: Neil Roberts <neil@linux.intel.com>
12381 Date: Fri Feb 20 11:07:23 2009 +0000
12383 Replaced ClutterFixed constants in color_{darken,lighten} with float
12385 Bug 1463 - clutter_color_lighten(darken) unexpected because of
12386 ClutterFixed=>float
12388 These two functions contained ClutterFixed constants represented as
12389 integers which are no longer valid since the cogl-float branch
12390 merge. They are now converted to ClutterFixed from float constants
12391 using CLUTTER_FLOAT_TO_FIXED (which is now a no-op).
12393 Thanks to Zhang Wei for reporting.
12395 clutter/clutter-color.c | 6 ++----
12396 1 file changed, 2 insertions(+), 4 deletions(-)
12398 commit f4222c3cfce7ff1214aeac27a77b33c22549f8e6
12399 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12400 Date: Thu Feb 19 17:24:06 2009 +0000
12402 [build] Do not overwrite BUILT_SOURCES
12404 The conformance test suite Makefile template already defines the
12405 BUILT_SOURCES variable, so we need to append redhand.png to it.
12407 tests/conform/Makefile.am | 2 +-
12408 1 file changed, 1 insertion(+), 1 deletion(-)
12410 commit 5643a47cb6ee85a3f4ec93e58582ddf6a6e34d24
12411 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12412 Date: Thu Feb 19 17:15:04 2009 +0000
12414 [build] Fix the ChangeLog generation rule
12416 The ChangeLog should only be generated by dist-hook and as a temporary
12417 file to avoid overwriting the stub we use to direct people to the
12418 commit log when cloning the repository.
12420 When generated, the ChangeLog should be copied inside the distdir so
12421 that the autotools will not freak out.
12423 Makefile.am | 61 +++++++++++++++++++++++------------------------------------
12424 1 file changed, 24 insertions(+), 37 deletions(-)
12426 commit 01cf52c44c630d92b7b896b8365dafbc5ee49743
12427 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12428 Date: Thu Feb 19 17:07:09 2009 +0000
12430 [build] Update the EXTRA_DIST list
12432 Remove the files we don't ship or have, to avoid distcheck failing.
12434 build/autotools/Makefile.am | 19 ++++++++-----------
12435 1 file changed, 8 insertions(+), 11 deletions(-)
12437 commit d0ae6b421cb3f2b6f69901c80da5c4b71f09efe5
12438 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12439 Date: Thu Feb 19 17:06:25 2009 +0000
12441 [docs] Update build for COGL API reference
12443 We need to initialize the type system for gtk-doc-scan, now that
12444 COGL exposes GTypes.
12446 doc/reference/cogl/Makefile.am | 4 ++--
12447 1 file changed, 2 insertions(+), 2 deletions(-)
12449 commit 5123608e2296b90f68d4634b2b518101c574e43d
12450 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12451 Date: Thu Feb 19 17:02:12 2009 +0000
12453 [build] Reference the headers with their full path
12455 Do not assume locality of the files, but use their whole path.
12457 clutter/x11/Makefile.am | 4 ++--
12458 1 file changed, 2 insertions(+), 2 deletions(-)
12460 commit b72b6e88f70a1839bb5eeb50a3b98f3335830696
12461 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12462 Date: Thu Feb 19 17:00:22 2009 +0000
12464 [build] Show pkg-config file being generated
12466 The current Makefile hides the console messages for the pkg-config
12467 files generated from the clutter.pc file. We should show them,
12470 Makefile.am | 4 ++--
12471 1 file changed, 2 insertions(+), 2 deletions(-)
12473 commit c229de8dde3e448a5c9619bde720f23665a17f4d
12474 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12475 Date: Thu Feb 19 16:51:37 2009 +0000
12477 [tests] Add TEST_CONFORM_TODO macro
12479 The TEST_CONFORM_TODO macro is a simple placeholder macro that
12480 adds the test function to the "/todo" namespace and skips the
12483 It can be used for tests that are known to fail because of bugs
12484 that haven't been fixed yet, or because of features not yet
12487 tests/conform/test-conform-main.c | 8 ++++++++
12488 1 file changed, 8 insertions(+)
12490 commit 1ead85f6f63ac52bbef1a37cbe1aa934e8e6ddcb
12491 Author: Neil Roberts <neil@linux.intel.com>
12492 Date: Thu Feb 19 17:14:00 2009 +0000
12494 [tests/conform] Copy in redhand.png
12496 test-vertex-buffer-configuous now needs redhand.png so it should be
12497 copied in to the build directory. This is copied from similar code in
12498 the tests/interactive Makefile.
12500 tests/conform/Makefile.am | 7 +++++++
12501 1 file changed, 7 insertions(+)
12503 commit 84ecb5081f2e30d43880832a7d632a694400f9f6
12504 Author: Øyvind Kolås <pippin@linux.intel.com>
12505 Date: Thu Feb 19 15:44:16 2009 +0000
12507 Bail early in clutter_texture_paint if opacity == 0
12509 This causes clutter to skip all the GL work of state changes and
12510 texturing if the opacity was 0. This is done in ClutterTexture and not
12511 ClutterActor to ensure that pre and post paint signals work correctly.
12512 Other expensive actors should be doing the same thing.
12514 clutter/clutter-texture.c | 12 ++++++++++--
12515 1 file changed, 10 insertions(+), 2 deletions(-)
12517 commit ef7df4b736b56c2f503b5e2d7c069efa0cacd79a
12518 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12519 Date: Thu Feb 19 15:01:33 2009 +0000
12521 [docs] Update the sections file
12523 The newly added symbols should also be added to the section file.
12525 The CairoTexture section was referenced twice.
12527 doc/reference/clutter/clutter-sections.txt | 42 ++++++----------------------
12528 1 file changed, 9 insertions(+), 33 deletions(-)
12530 commit 3009d029ba6ee1514e2ba521ebf9b28f5477de65
12531 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12532 Date: Thu Feb 19 15:00:23 2009 +0000
12534 Remove type functions for removed types
12536 The CoglHandle wrapper GTypes have been removed in commit a0800b44
12537 so we can safely remove the declarations.
12539 clutter/clutter-texture.h | 2 --
12540 1 file changed, 2 deletions(-)
12542 commit cf48935cf5a954e627f8f84eb5c47d8edc3c8e54
12543 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12544 Date: Thu Feb 19 14:57:43 2009 +0000
12546 [build] Pass the -s switch to cmp
12548 The call to "cmp" to compare a built file with its current version
12549 should use the -s (silent) command line switch. This avoids a ugly
12550 message on the console when building Clutter the first time.
12552 clutter/Makefile.am | 2 +-
12553 clutter/x11/Makefile.am | 6 +++---
12554 2 files changed, 4 insertions(+), 4 deletions(-)
12556 commit 4aecece48d94b32ec482487a55d5d30042c83c99
12557 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12558 Date: Thu Feb 19 14:56:07 2009 +0000
12560 [docs] Add a missing "return" annotation
12562 The documentation for the get_anchor_point_gravity() method is
12563 missing the "Return value:" section.
12565 clutter/clutter-actor.c | 2 ++
12566 1 file changed, 2 insertions(+)
12568 commit 9bdbe8a06a66a44b06bf6b04ea24604cda0f342e
12569 Merge: c18e756 3794324
12570 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12571 Date: Thu Feb 19 14:42:40 2009 +0000
12573 Merge branch 'build-enhancements'
12575 * build-enhancements:
12576 [build] Fix dist for the newly introduced m4 macro directory
12577 [build] Fix interaction between shave, gtk-doc and libtool 1.x
12579 [build] Beautify autotools' output
12580 [gitignore] update gitignore files for tests/
12582 commit c18e7562672061e2c7a7e7035108fa9f515ec830
12583 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12584 Date: Thu Feb 19 13:44:29 2009 +0000
12586 [docs] Clarify the set_cogl_texture() documentation
12588 When setting the COGL texture handle for a ClutterTexture the
12589 texture will be set as the first layer of the material used
12590 by the ClutterTexture. The documentation should clarify this
12593 clutter/clutter-texture.c | 13 +++++++++----
12594 1 file changed, 9 insertions(+), 4 deletions(-)
12596 commit a0800b44ad81861539264ddd0ff3297b29980d46
12597 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12598 Date: Thu Feb 19 12:05:20 2009 +0000
12600 [texture] Use COGL_TYPE_HANDLE for the handle properties
12602 The :texture and :material properties of ClutterTexture use a
12603 Clutter-provided GType shielding from CoglHandle. Since CoglHandle
12604 now has a GType we can use COGL_TYPE_HANDLE instead.
12606 This commit also removes the conditional compilation of the
12607 :material property, as it makes little sense now that the
12608 Materials API has landed.
12610 clutter/clutter-texture.c | 51 ++++++---------------------------------------
12611 clutter/clutter-texture.h | 3 ---
12612 2 files changed, 6 insertions(+), 48 deletions(-)
12614 commit 3c073d82c79c6d2c109d14c1b44d8c4c707c2bb6
12615 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12616 Date: Thu Feb 19 12:02:42 2009 +0000
12618 [cogl] Provide GTypes for COGL types
12620 COGL types should be registered inside the GType system, for
12621 bindings and type checking inside properties and signals.
12623 CoglHandle is a boxed type with a ref+unref semantics; slightly evil
12624 from a bindings perspective (we cannot associate custom data to it),
12625 but better than nothing.
12627 The rest of the exposed types are enumerations or bitmasks.
12629 clutter/cogl/cogl-types.h | 21 ++++-
12630 clutter/cogl/common/cogl-util.c | 175 +++++++++++++++++++++++++++++++++++++++
12631 2 files changed, 194 insertions(+), 2 deletions(-)
12633 commit 63ae25972e5393dd0252db3702fa9d675fe41e25
12634 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12635 Date: Thu Feb 19 11:55:54 2009 +0000
12637 [cogl] Add cogl_is_material to cogl-material.h
12639 The COGL_DEFINE_HANDLE macro generates a cogl_is_<type> function
12640 as well, to check whether a CoglHandle opaque pointer is of type
12643 The handle for CoglMaterial does not export cogl_is_material() in
12644 its installed header.
12646 clutter/cogl/cogl-material.h | 11 ++++++++++-
12647 doc/reference/cogl/cogl-sections.txt | 1 +
12648 2 files changed, 11 insertions(+), 1 deletion(-)
12650 commit 3794324e8b6deef5821e4534beda57acfa901a4a
12651 Author: Damien Lespiau <damien.lespiau@gmail.com>
12652 Date: Thu Feb 19 10:59:50 2009 +0000
12654 [build] Fix dist for the newly introduced m4 macro directory
12656 Makefile.am | 4 ++--
12657 build/autotools/Makefile.am | 1 +
12658 2 files changed, 3 insertions(+), 2 deletions(-)
12660 commit 9787660351c60bb684180b44a998ea847a1bdca1
12661 Author: Damien Lespiau <damien.lespiau@gmail.com>
12662 Date: Thu Feb 19 10:47:38 2009 +0000
12664 [build] Fix interaction between shave, gtk-doc and libtool 1.x
12666 gtk-doc.make does not specify --tag=CC when invoking libtool, letting
12667 it decide which tag to use. Something that fails with libtool 1.x and
12668 when having CC set to funny things.
12670 autogen.sh | 8 ++++++++
12671 1 file changed, 8 insertions(+)
12673 commit 5bdcfd288cbd20a88e4ee2a37602d51abc67baf3
12674 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12675 Date: Wed Feb 18 18:45:58 2009 +0000
12677 Initialize a variable to avoid warnings
12679 The gl_mode variable was not initialized, and the compiler complained
12680 when using the anal-retentive compiler flags.
12682 clutter/cogl/gl/cogl.c | 2 +-
12683 1 file changed, 1 insertion(+), 1 deletion(-)
12685 commit a86b9834d3c3dd7e83378a120ff53cb179b4e1fc
12686 Author: Neil Roberts <neil@linux.intel.com>
12687 Date: Wed Feb 18 17:57:17 2009 +0000
12689 [ClutterBehaviourRotate] Fix up some breakage from the cogl-float branch merge
12691 The rotation angle calculated in clutter_behaviour_rotate_alpha_notify
12692 gets applied to each actor using clutter_behaviour_actors_foreach. The
12693 angle is a ClutterFixed value. Before the cogl float branch merge it
12694 was stuffed into a gpointer using GPOINTER_TO_UINT. The pointer was
12695 then converted back to a uint and cast to a ClutterFixed which worked
12696 out fine even for negative numbers.
12698 After the cogl-float merge the angle is effectively a gfloat. This
12699 gets cast to a uint and stored in a pointer and converted back to a
12700 float via a uint at the other end. However this fails for negative
12701 numbers because a uint -> float conversion can't take advantage of
12702 overflow to preserve the sign so you end up with a large number.
12704 It also had the side effect that it only rotated in whole degrees.
12706 This commit fixes the problem by just passing the ClutterFixed value
12707 inside a closure struct instead of trying to stuff it into a pointer.
12709 clutter/clutter-behaviour-rotate.c | 24 ++++++++++++++----------
12710 1 file changed, 14 insertions(+), 10 deletions(-)
12712 commit 21768fb95751961cfa60abbc8a71d8e235798f10
12713 Author: Damien Lespiau <damien.lespiau@gmail.com>
12714 Date: Tue Feb 17 15:05:03 2009 +0000
12718 From the homepage (http://dolt.freedesktop.org): Dolt provides a drop-in
12719 replacement for libtool that significantly decreases compile times on
12720 the platforms it supports.
12723 build/autotools/dolt.m4 | 178 +++++++++++++++++++++++++++++++++++++++++++++++
12725 3 files changed, 181 insertions(+)
12727 commit 8eec75efded2269a2b067175b2bdade03a022905
12728 Author: Damien Lespiau <damien.lespiau@gmail.com>
12729 Date: Tue Feb 17 14:56:35 2009 +0000
12731 [build] Beautify autotools' output
12733 Use shave (http://git.lespiau.name/cgit/shave) to make compilation more
12737 build/Makefile.am | 1 +
12738 build/autotools/.gitignore | 8 +++++
12739 build/autotools/Makefile.am | 11 ++++++
12740 build/autotools/shave-libtool.in | 70 ++++++++++++++++++++++++++++++++++++++
12741 build/autotools/shave.in | 70 ++++++++++++++++++++++++++++++++++++++
12742 build/autotools/shave.m4 | 36 ++++++++++++++++++++
12743 clutter/Makefile.am | 13 ++++---
12744 configure.ac | 7 ++++
12745 tests/conform/Makefile.am | 2 +-
12746 10 files changed, 214 insertions(+), 6 deletions(-)
12748 commit 468b6210b4c9b1a952553e7c6447c1db8a4b7037
12749 Author: Damien Lespiau <damien.lespiau@gmail.com>
12750 Date: Tue Feb 17 14:02:55 2009 +0000
12752 [gitignore] update gitignore files for tests/
12755 tests/.gitignore | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
12756 2 files changed, 50 insertions(+)
12758 commit deed85035fc153287f73de46fdbac0c537a93a27
12759 Author: Neil Roberts <neil@linux.intel.com>
12760 Date: Wed Feb 18 17:26:10 2009 +0000
12762 Allow rotation angle properties to be negative
12764 Bug 1167 - clutter_effect_rotate improperly clamps negative angles
12766 The rotation angle properties had a minimum value of 0.0 but the
12767 rotation works fine with a negative value so the limitation is
12768 unnecessary. This makes rotation using the ClutterAnimation API more
12769 flexible because it was previously not possible to rotate
12770 counter-clockwise from the 0.0 position.
12772 clutter/clutter-actor.c | 6 +++---
12773 1 file changed, 3 insertions(+), 3 deletions(-)
12775 commit 99248fa90f0b1418129e02bba8bd9bd5bdf18aea
12776 Author: Neil Roberts <neil@linux.intel.com>
12777 Date: Wed Feb 18 16:41:01 2009 +0000
12779 Override the opacity when painting a clone instead of combining
12781 When rendering a clone before this commit the clone's opacity was
12782 combined with the opacity of the source but this is not usually the
12783 desired effect. Instead the clone's opacity (combined with its
12784 parents) should completely override the opacity of the source.
12786 clutter/clutter-actor.c | 6 +++---
12787 1 file changed, 3 insertions(+), 3 deletions(-)
12789 commit c0672b66834a8457976c451b42e99982a9357563
12790 Author: Tomas Frydrych <tf@linux.intel.com>
12791 Date: Wed Feb 18 16:54:18 2009 +0000
12793 [x11] Only update cached last event time if we have a real timestamp.
12795 Ignore the timestamp if it is set to CurrentTime (e.g., when the last event
12796 did not carry a timestamp).
12798 clutter/x11/clutter-event-x11.c | 3 ++-
12799 1 file changed, 2 insertions(+), 1 deletion(-)
12801 commit d2fe1fda3154a5dcfb72d154ec9b1211a2199444
12802 Author: Robert Bragg <robert@linux.intel.com>
12803 Date: Wed Feb 18 16:06:11 2009 +0000
12805 [cogl-color.c] #include fix for the cogl_set_source_color prototype
12807 cogl.h wasn't being included so we got a compiler warning
12809 clutter/cogl/common/cogl-color.c | 1 +
12810 1 file changed, 1 insertion(+)
12812 commit 03018f0c2a88f56ac02058a46fe226df0d33bdbf
12813 Author: Robert Bragg <robert@linux.intel.com>
12814 Date: Thu Feb 12 13:23:20 2009 +0000
12816 [Cogl] Renames cogl_paint_init to cogl_clear and adds a cogl_disable_fog function
12818 cogl_paint_init was a bit too miscellaneous; it mainly cleared the color, depth
12819 and stencil buffers but arbitrarily it also disabled fogging and lighting.
12821 It no longer disables lighting, since we know Cogl never enables lighting and
12822 disabling of fog is now handled with a seperate function.
12824 Since I noticed cogl_set_fog was taking a density argument documented as
12825 "Ignored" I've also added a mode argument to cogl_set_fog which exposes the
12826 exponential fog modes which can make use of the density.
12829 clutter/clutter-main.c | 3 +-
12830 clutter/clutter-stage.c | 5 +-
12831 clutter/clutter-texture.c | 5 +-
12832 clutter/cogl/cogl.h.in | 245 +++++++++++++++++++++-------------
12833 clutter/cogl/gl/cogl.c | 27 +++-
12834 clutter/cogl/gles/cogl.c | 32 ++++-
12835 doc/reference/cogl/cogl-sections.txt | 29 ++--
12836 8 files changed, 234 insertions(+), 119 deletions(-)
12838 commit 2b5a72dde5d6e33bed7935755a10905bcc2b0c23
12839 Author: Robert Bragg <robert@linux.intel.com>
12840 Date: Thu Feb 12 11:08:00 2009 +0000
12842 [Cogl] cogl_clip_{set*,unset} renamed to cogl_clip_{push*,pop}
12844 This is so they self document the stacking semantics of the cogl clip API
12847 clutter/clutter-actor.c | 10 +++++-----
12848 clutter/clutter-text.c | 8 ++++----
12849 clutter/cogl/cogl.h.in | 28 ++++++++++++++--------------
12850 clutter/cogl/common/cogl-clip-stack.c | 22 +++++++++++-----------
12851 doc/reference/cogl/cogl-sections.txt | 8 ++++----
12852 tests/interactive/test-clip.c | 12 ++++++------
12853 7 files changed, 47 insertions(+), 44 deletions(-)
12855 commit 57ffcdf014d3a1be3fc2ee6b85aa03b9a813dbdc
12856 Author: Øyvind Kolås <pippin@linux.intel.com>
12857 Date: Tue Feb 17 12:00:08 2009 +0000
12859 Added a mutex for clutter asynchronous textures threads.
12861 Bug #1453 - Asynchronous texture loading can starve cpu.
12863 Add a mutex that is held in the loader threads during the image
12864 decoding. We were spawning and starting a thread for each asynchronously
12865 loaded texture. This can cause cpu / memory starvation when many pixbuf
12866 loaders allocate their temporary memory at the same time.
12868 Also added -fno-strict-aliasing to MAINTAINER_CFLAGS in configure.ac
12869 to avoid incorrect warnings caused by the static mutex code.
12871 clutter/clutter-texture.c | 18 +++++++++++++++++-
12872 configure.ac | 2 +-
12873 2 files changed, 18 insertions(+), 2 deletions(-)
12875 commit 2fe0228f92e5511df64dd010eb5ae5685a551631
12876 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12877 Date: Wed Feb 18 09:45:26 2009 +0000
12879 [x11] Add backend-specific get_current_event_time()
12881 The clutter_get_current_event_time() function will return the event
12882 timestamp coming from a Clutter event. Clutter might synthesize or
12883 throttle events, so the function cannot be used when dealing with
12884 backend-specific use cases.
12886 The X11 backend is the only backend supported by Clutter that makes
12887 use of timestamps, so it's altogether fitting that it should come
12888 with a specific function to deal with the timestamps of the X events.
12890 clutter/x11/clutter-backend-x11.c | 2 ++
12891 clutter/x11/clutter-backend-x11.h | 1 +
12892 clutter/x11/clutter-event-x11.c | 67 ++++++++++++++++++++++++++++++++++++-
12893 clutter/x11/clutter-x11.h | 2 ++
12894 4 files changed, 71 insertions(+), 1 deletion(-)
12896 commit 747233a8ace1a35233038fc55b0a8594fb1f4fea
12897 Author: Neil Roberts <neil@linux.intel.com>
12898 Date: Mon Feb 16 16:34:31 2009 +0000
12900 [clutter-main] Fix the input device passed to set_motion_last_actor
12902 In generate_enter_leave_events it passes the device pointer from the
12903 event to set_motion_last_actor but it was reading it directly from
12904 event->motion.device. However the function is also used to process
12905 button events so it would read from the wrong location in this case.
12907 The device location in the union happened to be in the same place as
12908 the click_count field of ClutterButtonEvent so it only mattered if the
12909 click_count is non-zero. The X11 backend doesn't set this but
12910 Clutter-GTK does so it was causing a crash.
12912 clutter/clutter-main.c | 2 +-
12913 1 file changed, 1 insertion(+), 1 deletion(-)
12915 commit 1fcddb3b100d2d9d4e907f982988b4a15385d652
12916 Author: Neil Roberts <neil@linux.intel.com>
12917 Date: Mon Feb 16 12:46:00 2009 +0000
12919 [win32] Track mouse leave messages
12921 Bug 1178 - No enter / leave events on actors when pointer leaves the
12924 This patch causes the Win32 backend to emit CLUTTER_LEAVE events when
12925 a WM_MOUSELEAVE event is received in the same way that f505536 does
12926 for the X11 backend.
12928 Windows will only send WM_MOUSELEAVE events if they are previously
12929 requested using TrackMouseEvent so this needs to be called whenever
12930 the mouse enters the window. There is no WM_MOUSELEAVE event but we
12931 can detect when the mouse enters because we get a WM_MOUSEMOVE event.
12933 clutter/win32/clutter-event-win32.c | 25 +++++++++++++++++++++++++
12934 clutter/win32/clutter-stage-win32.h | 1 +
12935 2 files changed, 26 insertions(+)
12937 commit 9e10dc402f4402f65d9ecfc0714b4a00c8bccf8e
12938 Author: Neil Roberts <neil@linux.intel.com>
12939 Date: Mon Feb 16 12:42:08 2009 +0000
12941 Call glActiveTexture and glClientActiveTexture through cogl_get_proc_address
12943 All GL functions that are defined in a version later than 1.1 need to
12944 be called through cogl_get_proc_address because the Windows GL DLL
12945 does not export them to directly link against.
12947 clutter/cogl/common/cogl-material.c | 5 +++++
12948 clutter/cogl/common/cogl-vertex-buffer.c | 2 ++
12949 clutter/cogl/gl/cogl-context.c | 2 ++
12950 clutter/cogl/gl/cogl-context.h | 3 +++
12951 clutter/cogl/gl/cogl-defines.h.in | 8 ++++++++
12952 clutter/cogl/gl/cogl-texture.c | 2 ++
12953 clutter/cogl/gl/cogl.c | 12 +++++++++---
12954 clutter/cogl/gles/cogl-texture.c | 2 ++
12955 8 files changed, 33 insertions(+), 3 deletions(-)
12957 commit 5d6a11e1bfad43d20b3a2cc4d8dbda09200c6cb8
12958 Author: Neil Roberts <neil@linux.intel.com>
12959 Date: Thu Feb 12 17:21:18 2009 +0000
12961 Emit CLUTTER_LEAVE events when the pointer leaves the stage
12963 Bug 1178 - No enter / leave events on actors when pointer leaves the
12966 The patch is mostly thanks to Johan Bilien with small modifications
12967 based on suggestions by Owen Taylor.
12969 The X11 backend now listens for enter and leave notifications. Leave
12970 notifications get translated directly to a CLUTTER_LEAVE
12971 event. Clutter can detect these special events because the source
12972 actor is NULL in which case it sets the source actor to the last known
12973 actor and then sets the last known actor to NULL.
12975 Enter notifications just get translated to CLUTTER_MOTION events which
12976 will cause Clutter to generate an enter event through the usual code
12979 clutter/clutter-main.c | 68 +++++++++++++++++++++++++++-----------
12980 clutter/eglx/clutter-stage-egl.c | 2 ++
12981 clutter/glx/clutter-stage-glx.c | 2 ++
12982 clutter/x11/clutter-event-x11.c | 18 ++++++++++
12983 4 files changed, 70 insertions(+), 20 deletions(-)
12985 commit 0c7e4172ab17ed2bfff625efce135c57e8fc3505
12986 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12987 Date: Mon Feb 16 11:02:20 2009 +0000
12989 [animation] Do not bind construct-only properties
12991 ClutterAnimation should not try to bind construct-only properties,
12992 since it only manipulates existing instances.
12994 clutter/clutter-animation.c | 8 ++++++++
12995 1 file changed, 8 insertions(+)
12997 commit 8f59f25beb3cfe8c7775e044050ff865f21991f3
12998 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12999 Date: Sat Feb 14 13:11:13 2009 +0000
13001 [actor] Revert part of commit 402e022c
13003 An unintended chunk of commit 402e022c got committed before I looked
13006 clutter/clutter-actor.c | 6 +++---
13007 1 file changed, 3 insertions(+), 3 deletions(-)
13009 commit 839d1e00b18528dd3da3694a5ca3b987cc0bee33
13010 Author: Christian Persch <chpe@gnome.org>
13011 Date: Sat Feb 14 12:55:20 2009 +0000
13013 Bug 1429 - Redundant declaration in clutter-x11.h
13015 clutter-x11.h declares clutter_x11_set_display twice, which means code using
13016 clutter doesn't compile cleanly with -Wredundant-decls.
13018 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
13020 clutter/x11/clutter-x11.h | 2 --
13021 1 file changed, 2 deletions(-)
13023 commit cd0fdbb7d50d2fae6b6d8b9099aa4a43105538e3
13024 Author: Owen W. Taylor <otaylor@fishsoup.net>
13025 Date: Fri Feb 13 14:14:43 2009 -0500
13027 Honor ACLOCAL_FLAGS in autogen.sh
13029 autoreconf doesn't pay attention to the ACLOCAL_FLAGS variable that
13030 jhbuild (for example) sets. Pass those flags into autoreconf by
13031 setting ACLOCAL appropriately.
13034 1 file changed, 1 insertion(+), 1 deletion(-)
13036 commit 46ce2ee737541554b75801c8797c41d3aed85661
13037 Author: Shane Bryan <shane.bryan@linux.intel.com>
13038 Date: Tue Feb 3 17:04:58 2009 -0800
13040 Bug 1434 - _NET_WM_NAME not set before realize
13042 Moved clutter_stage_set_title() before call to clutter_actor_realize()
13043 to ensure _NET_WM_NAME is set early enough for use by interested WM's,
13045 Signed-off-by: Shane Bryan <shane.bryan@linux.intel.com>
13046 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
13048 clutter/clutter-main.c | 4 ++--
13049 1 file changed, 2 insertions(+), 2 deletions(-)
13051 commit 888d900cb3086e046dd102c115c9ab4443289c48
13052 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13053 Date: Sat Feb 14 11:47:53 2009 +0000
13055 [ignore] Add the newly created conformance units
13058 1 file changed, 3 insertions(+)
13060 commit e16e9b8bfcb2c47e4a440e2c4c1e9f0223dcf59e
13061 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13062 Date: Sat Feb 14 11:45:27 2009 +0000
13064 [tests] Add conformance tests for ClutterModel
13066 ClutterModel has an interactive test but lacks a conformance
13067 unit for automatic testing.
13069 This is the beginning of that unit, which covers the population
13070 and iteration over a ListModel.
13072 tests/conform/Makefile.am | 1 +
13073 tests/conform/test-conform-main.c | 3 +
13074 tests/conform/test-model.c | 211 +++++++++++++++++++++++++++++++++++++
13075 3 files changed, 215 insertions(+)
13077 commit 28dd557d8fea0041ca15c9297be60632806c9102
13078 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13079 Date: Sat Feb 14 11:41:55 2009 +0000
13081 [tests] Add TEST_CONFORM_SKIP() macro
13083 Sometimes a test unit should not be executed depending on a
13084 condition. It would be good to have a macro doing this, along
13085 with TEST_CONFORM_SIMPLE().
13087 Additionally, the skipped unit should be added to a specific
13088 namespace, so that any coverage report will be able to catch it.
13090 For this reason, here's TEST_CONFORM_SKIP() which follows the
13093 TEST_CONFORM_SKIP (condition, namespace, function);
13095 If condition evaluates to FALSE the test is skipped and the
13096 unit added to the "/skipped" namespace.
13098 tests/conform/test-conform-main.c | 36 +++++++++++++++++++++++++++---------
13099 1 file changed, 27 insertions(+), 9 deletions(-)
13101 commit 9da564b391fc860492c08ff4a779c4d6163e28d2
13102 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13103 Date: Sat Feb 14 11:38:16 2009 +0000
13105 Bug 1440 - Add clutter_get_current_event_time()
13107 The clutter_get_current_event_time() is a global function for
13108 retrieving the timestamp of the current event being propagated
13109 by Clutter. Such function avoids the need to propagate the
13110 timestamp from within user code.
13112 clutter/clutter-event.c | 22 ++++++++++++++++++++++
13113 clutter/clutter-event.h | 2 ++
13114 clutter/clutter-main.c | 2 ++
13115 clutter/clutter-private.h | 2 ++
13116 4 files changed, 28 insertions(+)
13118 commit 0ac6d6637e4c0c4c41cc320a8ac59a4e9ca5836c
13119 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13120 Date: Sat Feb 14 11:31:00 2009 +0000
13122 [list-model] Make ClutterListModel subclassable
13124 ClutterListModel has been added as a terminal class in case we
13125 decided to change API or implementation.
13127 Apparently, it's a lot more resilient than we expected -- or far
13128 too few are using it and reporting bugs. Once common issue, though,
13129 is that it cannot be subclassed, hence it's fairly limited in its
13132 In the hope that more developers will start using it, here's a
13133 patch that makes ListModel a fully subclassable object.
13135 May whatever god you believe in have mercy on your eventual soul.
13137 clutter/clutter-list-model.c | 63 ++++++++++++++++++++----------------------
13138 clutter/clutter-list-model.h | 41 ++++++++++++++++++++++++---
13139 2 files changed, 67 insertions(+), 37 deletions(-)
13141 commit f17437124ecc4d8cd41c098d10fa8b630e9bea9d
13142 Author: Robert Staudinger <robsta@openedhand.com>
13143 Date: Thu Feb 12 12:42:58 2009 +0000
13145 [build] Add cogl.h to the built sources list
13147 The main COGL header file is generated at configure time. If something
13148 changes in the template, though, the file will not be regenerated.
13150 Adding cogl.h to the BUILT_SOURCES list will allow the regeneration to
13153 clutter/cogl/Makefile.am | 2 ++
13154 1 file changed, 2 insertions(+)
13156 commit 402e022c36a4b38864cddf6bd8299f75268c5519
13157 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13158 Date: Wed Feb 11 17:56:22 2009 +0000
13160 [actor] Check out parameters before setting them
13162 The clutter_actor_get_rotation() out parameters may be NULL, so
13163 we need to check before dereferencing them.
13165 clutter/clutter-actor.c | 17 +++++++++++------
13166 1 file changed, 11 insertions(+), 6 deletions(-)
13168 commit 82db27874b3feda0c3b35400699d83e7668987cc
13169 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13170 Date: Wed Feb 11 17:54:52 2009 +0000
13172 [event] Extend KeyEvent for multi-input support
13174 Key events can come from different input devices, so they need a
13175 ClutterInputDevice member like the pointer-related events. This
13176 field is reserved for future use.
13178 clutter/clutter-event.h | 2 ++
13179 1 file changed, 2 insertions(+)
13181 commit 55909581020cb66c9f97f8f3485c4b46fb6ccb2b
13182 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13183 Date: Wed Feb 11 17:52:50 2009 +0000
13185 [texture] Check if the material is valid
13187 The CoglMaterial handle might be invalid when we are disposing
13188 the ClutterTexture, so we need to check before calling any
13189 cogl_material_* API on it.
13191 clutter/clutter-texture.c | 3 ++-
13192 1 file changed, 2 insertions(+), 1 deletion(-)
13194 commit 29bff6890add38daaf83ab3d3695286d54c98e2f
13195 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13196 Date: Fri Feb 6 13:50:16 2009 +0000
13198 [texture] Consolidate the quality to filter conversions
13200 To convert from a TextureQuality to a COGL filter enumeration
13201 we need to perform two function calls. Since we need both filters
13202 when calling cogl_texture_set_filters() we can safely consolidate
13203 the two conversion functions into one. This also allows using a
13204 shorter function name, thus reducing the lenght of the lines
13205 involved and, more importantly preventing Emmanuele from crying.
13207 clutter/clutter-texture.c | 100 ++++++++++++++++++++++++++-------------------
13208 1 file changed, 59 insertions(+), 41 deletions(-)
13210 commit 41ef2ef58788eb3ef6c7cb25c706dfbfa8d14b71
13211 Author: Robert Bragg <robert@linux.intel.com>
13212 Date: Wed Feb 11 12:58:18 2009 +0000
13214 [tests] Some improvements for test-pixmap
13216 The test no longer requires an XID argument to run; instead it creates its
13217 own X Window. The test now also aims to demonstrate whether mipmapping is
13218 working, and clearly informs you if fallbacks are being used for GLX tfp.
13220 tests/interactive/test-pixmap.c | 163 +++++++++++++++++++++++++++------------
13221 1 file changed, 115 insertions(+), 48 deletions(-)
13223 commit b4f9c8204de6fbcf20c2dcb5074e035fb8859668
13224 Author: Robert Bragg <bob@o-hand.com>
13225 Date: Fri Feb 6 11:16:42 2009 +0000
13227 [docs] Various gtk-doc updates for Cogl
13229 This hides a number of internal structs and enums from the docs, and moves
13230 some functions to more appropriate sections as well as misc description
13231 updates (mostly for the vertex buffer api)
13233 clutter/cogl/cogl-color.h | 55 ------------
13234 clutter/cogl/cogl-material.h | 109 ++++++++++++------------
13235 clutter/cogl/cogl-matrix.h | 8 +-
13236 clutter/cogl/cogl-vertex-buffer.h | 154 +++++++++++++++++-----------------
13237 clutter/cogl/cogl.h.in | 94 +++++++++++++++++++++
13238 doc/reference/cogl/cogl-docs.sgml | 10 +--
13239 doc/reference/cogl/cogl-sections.txt | 104 +++++++++++------------
13240 7 files changed, 283 insertions(+), 251 deletions(-)
13242 commit d01e3cd802619fb2bcccc5503c49f3d22165dd29
13243 Author: Robert Bragg <robert@linux.intel.com>
13244 Date: Fri Feb 6 16:10:28 2009 +0000
13246 [cogl-vertex-buffer] Some fixes for texturing and color arrays
13248 Fixes some blending issues when using color arrays since we were
13249 conflicting with the cogl_enable state + fixes a texture layer
13252 Adds a basic textured triangle to test-vertex-buffer-contiguous.
13254 clutter/cogl/common/cogl-vertex-buffer.c | 19 +++++------
13255 tests/conform/test-vertex-buffer-contiguous.c | 42 +++++++++++++++++++++++--
13256 2 files changed, 47 insertions(+), 14 deletions(-)
13258 commit 4a110afe08f9e141ae1ac596f030592aaac65769
13259 Author: Robert Bragg <robert@linux.intel.com>
13260 Date: Fri Feb 6 16:05:08 2009 +0000
13262 [cogl-material] Fixes some dirty flag checks
13264 Flushing material layers wasn't clearing the right dirty flag and
13265 some of the tests used to avoid re-submitting GL state weren't
13268 clutter/cogl/common/cogl-material.c | 98 ++++++++++++++++++++++-------------
13269 1 file changed, 63 insertions(+), 35 deletions(-)
13271 commit fa55c096d87796ce904ece831547f0cdb2799ff1
13272 Author: Robert Bragg <robert@linux.intel.com>
13273 Date: Wed Feb 4 09:21:37 2009 +0000
13275 [Cogl] Renames cogl_fog_set to cogl_set_fog for consistency
13277 More things follow the <object>_set_<property> convention.
13279 clutter/clutter-stage.c | 2 +-
13280 clutter/cogl/cogl.h.in | 10 +++++-----
13281 clutter/cogl/gl/cogl.c | 8 ++++----
13282 clutter/cogl/gles/cogl.c | 8 ++++----
13283 4 files changed, 14 insertions(+), 14 deletions(-)
13285 commit 51edcc525115e431bb22d996af1e01a1cf8de4ac
13286 Author: Neil Roberts <neil@linux.intel.com>
13287 Date: Mon Feb 9 12:47:41 2009 +0000
13289 Added a test for non-power-of-two sized textures
13291 The test simply creates an odd sized texture with different colors at
13292 each of the four corners. It then renders the texture and verifies
13293 that the colors are the expected values. This should help ensure that
13294 the sliced texture rendering code is working properly.
13296 tests/conform/Makefile.am | 1 +
13297 tests/conform/test-conform-main.c | 1 +
13298 tests/conform/test-npot-texture.c | 210 +++++++++++++++++++++++++++++++++++++
13299 3 files changed, 212 insertions(+)
13301 commit 0be6f42070c3aa0ba6bcb02aa65e63c6572d83d0
13302 Author: Neil Roberts <neil@linux.intel.com>
13303 Date: Thu Feb 5 23:01:59 2009 +0000
13305 [cogl-texture] Fix uninitialised priv var in texture_finalize
13307 Fix my failure to initialise the priv var which was some causing
13310 clutter/clutter-texture.c | 2 +-
13311 1 file changed, 1 insertion(+), 1 deletion(-)
13313 commit a2168686b918b8f66210650296d299603db3eab8
13314 Author: Neil Roberts <neil@linux.intel.com>
13315 Date: Thu Feb 5 20:24:18 2009 +0000
13317 [cogl-texture] Move the destruction of the material to _finalize
13319 Otherwise if the dipose method is called twice the material will
13320 already be destroyed when texture_free_gl_resources is called so it
13321 will issue a warning about an invalid handle.
13323 clutter/clutter-texture.c | 16 +++++++++++++---
13324 1 file changed, 13 insertions(+), 3 deletions(-)
13326 commit 05c7e5a97c0c059ed2f1fd20f55beae22eaf83c1
13327 Author: Neil Roberts <neil@linux.intel.com>
13328 Date: Thu Feb 5 19:48:00 2009 +0000
13330 [cogl-texture] Fix offset to next quad when flushing the log
13332 When the quad log contains multiple textures (such as when a sliced
13333 texture is drawn) it dispatches the log with multiple calls to
13334 flush_quad_batch and walks a pointer along the list of vertices.
13335 However this pointer was being incremented by only one vertex so the
13336 next quad would be drawn with three of the vertices from the last
13339 clutter/cogl/gl/cogl-texture.c | 4 ++--
13340 clutter/cogl/gles/cogl-texture.c | 4 ++--
13341 2 files changed, 4 insertions(+), 4 deletions(-)
13343 commit a4de12dbe8165c3acd453804af36d46e4405b1ba
13344 Author: Neil Roberts <neil@linux.intel.com>
13345 Date: Thu Feb 5 20:00:05 2009 +0000
13347 [clutter-texture] Fix the no_slice property
13349 The 'no_slice' property means the texture should never be sliced. We
13350 want cogl to create a texture with any amount of waste so we pass
13351 max_waste as -1. However this got broken in commit 168d55 so that the
13352 meaning got negated (no_slice enabled slicing).
13354 clutter/clutter-texture.c | 4 ++--
13355 1 file changed, 2 insertions(+), 2 deletions(-)
13357 commit 6bc7f4c723de90c41afa622dc3451ad7697786e0
13358 Author: Chris Lord <chris@linux.intel.com>
13359 Date: Thu Feb 5 11:04:34 2009 +0000
13361 [actor] Force a relayout on set_parent()
13363 The current code that handles the invariant that the new parent
13364 of an actor needing a layout should also be queued for relayout
13365 is hitting the short-circuiting we do in the queue_relayout()
13368 In order to fix this we can forcibly set the actor to need a
13369 width/height request and an allocation; then we queue a relayout
13372 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
13374 clutter/clutter-actor.c | 10 +++++++++-
13375 1 file changed, 9 insertions(+), 1 deletion(-)
13377 commit 9cf02bfdb9a65500688fde1c4485f6cc968c385f
13378 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13379 Date: Mon Feb 2 23:55:30 2009 +0000
13381 [text] Rename :alignment to :line-alignment
13383 The :alignment property is prone to generate confusion: developers
13384 will set it thinking that the contents of a ClutterText will
13385 automagically align themselves.
13387 Instead of using the generic term :alignment, and following the
13388 GTK+ convention, we should use a more specific term, conveying the
13389 actual effect of the property: alignment of the lines with respect
13390 to each other, and not to the overall allocated area.
13394 http://bugzilla.openedhand.com/show_bug.cgi?id=1428
13396 clutter/clutter-text.c | 40 +++++++++++++++-------------
13397 clutter/clutter-text.h | 4 +--
13398 doc/reference/clutter/clutter-sections.txt | 4 +--
13399 tests/conform/test-text-cache.c | 3 ++-
13400 tests/interactive/test-rotate.c | 7 +++--
13401 5 files changed, 32 insertions(+), 26 deletions(-)
13403 commit e3496429372b565724b20a3df50720ff434e543e
13404 Author: Neil Roberts <neil@linux.intel.com>
13405 Date: Thu Feb 5 18:27:04 2009 +0000
13407 [clutter-texture] Unref the Cogl material on dispose
13409 The material is created in the _init function and is owned by the
13410 ClutterTexture so it will be leaked if not freed.
13412 clutter/clutter-texture.c | 6 ++++++
13413 1 file changed, 6 insertions(+)
13415 commit ee0bf5e26d73b47627f0655dd3c8a4c2377b3256
13416 Author: Neil Roberts <neil@linux.intel.com>
13417 Date: Thu Feb 5 18:26:08 2009 +0000
13419 [clutter-texture] Release the temporary ref taken when setting a texture
13421 When setting the cogl texture, the ClutterTexture takes a reference to
13422 the Cogl handle but the material takes an additional reference when it
13423 is set as the layer. Nothing was unrefing the temporary reference so
13424 the textures were being leaked.
13426 clutter/clutter-texture.c | 4 ++++
13427 1 file changed, 4 insertions(+)
13429 commit 8feb99722c9c0308f5be4ec9f78106c30c909a79
13430 Author: Neil Roberts <neil@linux.intel.com>
13431 Date: Wed Feb 4 00:14:16 2009 +0000
13433 [clutter-clone] Override the parent opacity to self not self->parent
13435 The opacity of the source actor when painted from the clone should be
13436 combined with the opacity of the clone as well as the clone's parents,
13437 instead of just the parents.
13439 clutter/clutter-clone.c | 10 ++++------
13440 1 file changed, 4 insertions(+), 6 deletions(-)
13442 commit 8e44874a934d1bae5d90c31b230e3741b863d662
13443 Author: Neil Roberts <neil@linux.intel.com>
13444 Date: Mon Feb 2 22:02:47 2009 +0000
13446 [cogl-gles2-wrapper] Remove the FIXME to adjust the fragment color
13448 Removed some debugging code which sets the r and g values to 1 in the
13451 clutter/cogl/gles/cogl-gles2-wrapper.c | 3 ---
13452 1 file changed, 3 deletions(-)
13454 commit 49359407b0b1e4c56d2af56cbb62e8d855c58812
13455 Author: Neil Roberts <neil@linux.intel.com>
13456 Date: Mon Feb 2 22:01:47 2009 +0000
13458 [cogl-texture] Fix the count for the number of enabled arrays
13460 The quad drawing code keeps track of the number of texture units that
13461 have the tex coord array enabled so that in the next call it can
13462 disabled any that are no longer enabled. However it was using 'i+1' as
13463 the count but 'i' is already set to 'n_layers' from the previous for
13466 Therefore it was disabling an extra texture unit. This doesn't
13467 normally matter but it was causing GLES 2 to pointlessly realize an
13470 clutter/cogl/gles/cogl-texture.c | 2 +-
13471 1 file changed, 1 insertion(+), 1 deletion(-)
13473 commit e88de5f5fd97823c8bb6fe1452421a455212da86
13474 Author: Neil Roberts <neil@linux.intel.com>
13475 Date: Thu Jan 29 13:40:37 2009 +0000
13477 Fix building GLES 2 after the material branch merge
13479 - In cogl-material.h it directly sets the values of the
13480 CoglMaterialLayerCombineFunc to some GL_* constants. However these
13481 aren't defined in GLES 2 beacuse it has no fixed function texture
13482 combining. Instead the CGL_* versions are now used. cogl-defines.h
13483 now sets these to either the GL_* version if it is available,
13484 otherwise it directly uses the number.
13486 - Under GLES 2 cogl-material.c needs to access the CoglTexture struct
13487 so it needs to include cogl-texture-private.h
13489 - There are now #define's in cogl-gles2-wrapper.h to remap the GL
13490 function names to the wrapper names. These are disabled in
13491 cogl-gles2-wrapper.c by defining COGL_GLES2_WRAPPER_NO_REMAP.
13493 - Added missing wrappers for glLoadMatrixf and glMaterialfv.
13495 - Renamed the TexEnvf wrapper to TexEnvi because the latter is used
13496 instead from the material API.
13498 clutter/cogl/cogl-material.h | 22 ++--
13499 clutter/cogl/common/cogl-material.c | 3 +-
13500 clutter/cogl/common/cogl-vertex-buffer.c | 9 +-
13501 clutter/cogl/gl/cogl-defines.h.in | 3 +
13502 clutter/cogl/gles/cogl-defines.h.in | 199 +++++++++++++++++++++++++++---
13503 clutter/cogl/gles/cogl-gles2-wrapper.c | 32 ++++-
13504 clutter/cogl/gles/cogl-gles2-wrapper.h | 106 ++++++++++------
13505 7 files changed, 297 insertions(+), 77 deletions(-)
13507 commit edbe9a0377981d279d129f825e61f51f16d198de
13508 Author: Neil Roberts <neil@linux.intel.com>
13509 Date: Mon Feb 2 14:51:52 2009 +0000
13511 [cogl-material] Always bind the new texture handle
13513 Cogl previously tried to cache the currently bound texture when
13514 drawing through the material API to avoid excessive GL calls. However,
13515 a few other places in Cogl and Clutter rebind the texture as well so
13516 this can cause problems.
13518 This was causing shaped windows to fail in Mutter because
13519 ClutterGLXTexturePixmap was binding a different texture to update it
13520 while the second texture unit was still active which meant the mask
13521 texture would not be selected when the shaped window was drawn
13524 Ideally we would fix this by providing a wrapper around glBindTexture
13525 which would affect the cached value. The cache would also have to be
13526 cleared if a selected texture was deleted.
13528 clutter/cogl/common/cogl-material.c | 20 +++++++++++---------
13529 1 file changed, 11 insertions(+), 9 deletions(-)
13531 commit 2747aa7be235de77b33433821f1756b9c923a2ae
13532 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13533 Date: Mon Feb 2 12:04:34 2009 +0000
13535 [text] Use create_pango_layout()
13537 Since we added clutter_actor_get_pango_layout() it would be a
13538 good idea to use it in the ClutterText actor to cut down the
13539 PangoContext-related calls.
13541 clutter/clutter-text.c | 5 +----
13542 1 file changed, 1 insertion(+), 4 deletions(-)
13544 commit 6e12722a9b7135abdd43f3777476780c74080163
13545 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13546 Date: Mon Feb 2 11:59:39 2009 +0000
13548 [clone] Allow cloning unparented actors
13550 If the source of a ClutterClone does not have a parent actor the
13551 clone will be unable to paint it because it's missing an allocation.
13553 A simple way to fix it is to make the ClutterClone act like a
13554 "foster parent": when it is allocated it will check if the source
13555 actor has a parent and if not it will allocate the source with
13556 its preferred size.
13558 clutter/clutter-clone.c | 52 ++++++++++++++++++++++++++++++++++++++---------
13559 1 file changed, 42 insertions(+), 10 deletions(-)
13561 commit b053d513214e764a44b82b312c948199f6a1f03f
13562 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13563 Date: Mon Feb 2 11:08:37 2009 +0000
13565 [docs] Add clutter_text_set_markup()
13567 The clutter_text_set_markup() has been added to the public API, and
13568 should be listed in the ClutterText section of the API reference.
13570 doc/reference/clutter/clutter-sections.txt | 1 +
13571 1 file changed, 1 insertion(+)
13573 commit 801e535e947e32fea5fe2859e94c58f7b7c8af4f
13574 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13575 Date: Mon Feb 2 09:01:41 2009 +0000
13577 Add Actor::create_pango_layout()
13579 Final bit of integration between ClutterActor and Pango: a simple
13580 method for creating a PangoLayout, pre-filled with text and ready
13581 to be rendered using cogl_pango_render_layout().
13583 This should make writing new Actors rendering custom text in their
13584 paint() implementation easy and reliable.
13586 clutter/clutter-actor.c | 38 ++++++++++++++++++++++++++++
13587 clutter/clutter-actor.h | 2 ++
13588 doc/reference/clutter/clutter-sections.txt | 1 +
13589 3 files changed, 41 insertions(+)
13591 commit 52d04b575094e2ad742af132e32e79497afa89de
13592 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13593 Date: Thu Jan 29 13:29:43 2009 +0000
13595 [tests] Update the text-field interactive test
13597 We should also display the results of calling set_markup() or
13598 set_use_markup() on ClutterText actors.
13600 tests/interactive/test-text-field.c | 11 +++++++----
13601 1 file changed, 7 insertions(+), 4 deletions(-)
13603 commit 488de99fc6be704d2817ffbfc380f876cb028e05
13604 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13605 Date: Thu Jan 29 13:18:57 2009 +0000
13607 [text] Merge the attributes with markup enabled
13609 ClutterText should merge the PangoAttributes set by using
13610 clutter_text_set_attributes() with the attributes generated by
13611 parsing Pango markup.
13613 For this to work we must parse the markup and merge the attributes
13614 we get out of pango_parse_markup() with the attributes set by
13617 Setting the markup or the attributes on an editable text should
13618 not work for the time being.
13620 clutter/clutter-text.c | 267 ++++++++++++++++++++++++++++++++++--------------
13621 clutter/clutter-text.h | 2 +
13622 2 files changed, 195 insertions(+), 74 deletions(-)
13624 commit e8ef5153b162a05d18d8763003c7ad3cced5132a
13625 Author: Tomas Frydrych <tf@o-hand.com>
13626 Date: Thu Jan 29 12:25:18 2009 +0000
13628 Fix clutter_x11_texture_pixmap_get/set_property() following change of PROP_WINDOW type.
13629 PROP_WINDOW is now gulong, so we need to use appropriate GValue accessors.
13631 clutter/x11/clutter-x11-texture-pixmap.c | 4 ++--
13632 1 file changed, 2 insertions(+), 2 deletions(-)
13634 commit c1de33fafeab620a146346c38b5b1637276d90c4
13635 Author: Tomas Frydrych <tf@o-hand.com>
13636 Date: Tue Jan 27 16:37:55 2009 +0000
13638 Fixed handling of enter and leave events in clutter_x11_handle_event()
13639 When processing a motion event, we need to spin the event loop two extra
13640 times to ensure that any enter/leave events that might have been synthesized
13641 are pumped through (otherwise they end up being pushed down the queue and
13644 clutter/x11/clutter-event-x11.c | 13 +++++++++++--
13645 1 file changed, 11 insertions(+), 2 deletions(-)
13647 commit 7233ca48a8686a972d6eaed41aa70452d0447273
13648 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13649 Date: Fri Jan 30 14:18:46 2009 +0000
13651 Post-release bump to 0.9.1
13653 configure.ac | 2 +-
13654 1 file changed, 1 insertion(+), 1 deletion(-)
13656 commit 81cfccd29094bb7dff69b60dcdd0bbfeb92f6b40
13657 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13658 Date: Fri Jan 30 12:39:29 2009 +0000
13663 1 file changed, 1 insertion(+), 1 deletion(-)
13665 commit f77428991c36b05e7e289c6f69df4bb2da3d5e0a
13666 Author: Robert Bragg <robert@linux.intel.com>
13667 Date: Thu Jan 29 16:24:24 2009 +0000
13669 Some updates for the 1.0 release notes regarding Cogl
13671 Documents that the cogl_rectangle arguments changed from x1, y1, width, height
13672 to x1, y1, x2, y2; notes that cogl_scale now accepts a z-scale; adds a note
13673 about the new vertex buffer API and fixes a s/CoglMesh/CoglMatrix/ typo.
13675 README | 11 ++++++++++-
13676 1 file changed, 10 insertions(+), 1 deletion(-)
13678 commit bec9b32e73eb521ba7dc06af825b1643bfc5b6c4
13679 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13680 Date: Thu Jan 29 16:15:05 2009 +0000
13682 [build] Fix distcheck of ChangeLog
13684 Relax the copy failure condition.
13686 Makefile.am | 6 ++++--
13687 1 file changed, 4 insertions(+), 2 deletions(-)
13689 commit bb6202a1a177c2537954f9db577c2712f7cd47ee
13690 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13691 Date: Thu Jan 29 16:00:15 2009 +0000
13693 Add cogl-material-private.h to the source files
13695 The material-private.h file was not added to the dist files and
13696 caused a build failure.
13698 clutter/cogl/common/Makefile.am | 3 ++-
13699 1 file changed, 2 insertions(+), 1 deletion(-)
13701 commit 2b02dfce840810f8651fc77fbf1260d8d0fa3984
13702 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13703 Date: Thu Jan 29 15:44:11 2009 +0000
13705 [gitignore] Update ignore file
13707 .gitignore | 7 +++++++
13708 1 file changed, 7 insertions(+)
13710 commit cf80105ab0e913c1642481f36d328ec31684eed0
13711 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13712 Date: Thu Jan 29 15:38:28 2009 +0000
13714 [build] Add automatic ChangeLog generation on dist
13716 Since we moved to Git from Subversion we've abandoned the ChangeLog
13717 file in favour of a more detailed commit log.
13719 In order to maintain a ChangeLog for users of the tarballs, we need
13720 to generate a ChangeLog file out of the commit log when distchecking
13723 For this reason, we use a simple Perl script that is invoked by the
13724 dist-hook and generates a ChangeLog file starting from the previous
13727 Makefile.am | 31 ++++++++++
13728 build/gen-changelog.pl | 148 ++++++++++++++++++++++++++++++++++++++++++++++++
13729 2 files changed, 179 insertions(+)
13731 commit 86aba661bd2b7eb4506aeeb9cd0d884db6118267
13732 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13733 Date: Thu Jan 29 13:31:11 2009 +0000
13735 Fix a variable masking warning
13737 The usual issue with math.h defined symbols.
13739 clutter/cogl/common/cogl-primitives.c | 15 +++++++--------
13740 1 file changed, 7 insertions(+), 8 deletions(-)
13742 commit 945d2616e3e417ff0550911b5a7d04d4817aa7a3
13743 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13744 Date: Wed Jan 28 17:01:26 2009 +0000
13746 Move the old ChangeLog into its own file
13748 The old ChangeLog is there to track the project history when it
13749 was in SVN -- also because the commit messages we imported from
13750 Subversion were not that great.
13752 Unfortunately, we need a ChangeLog for autotools to work in
13753 GNU mode; for this reason, we can use a dummy ChangeLog redirecting
13756 The ChangeLog will be generated on release from the commit
13757 messages, for users of the tarballs.
13759 ChangeLog |15747 +--------------------------------------------------------
13760 ChangeLog.SVN |15737 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
13762 3 files changed, 15746 insertions(+), 15745 deletions(-)
13764 commit f1bae778cea59a652af34948ed4addba212f8e89
13765 Author: Neil Roberts <neil@linux.intel.com>
13766 Date: Thu Jan 29 12:21:56 2009 +0000
13768 [cogl] Add an NULL terminator to the call to material_flush_gl_state
13770 This fixes a compiler warning and a potential crash.
13772 clutter/cogl/gl/cogl.c | 2 +-
13773 clutter/cogl/gles/cogl.c | 2 +-
13774 2 files changed, 2 insertions(+), 2 deletions(-)
13776 commit 6516dd3033f3b8e85a7b53e5576b11323b8a4579
13777 Author: Robert Bragg <robert@linux.intel.com>
13778 Date: Wed Jan 28 14:09:51 2009 +0000
13780 Another Cogl gl vs gles normalizaion pass
13782 This tries to make a number of files more comparable with the intention of
13783 moving some code into cogl/common/
13791 clutter/cogl/gl/cogl-context.h | 13 +-
13792 clutter/cogl/gl/cogl-texture.c | 33 ++++--
13793 clutter/cogl/gl/cogl.c | 43 +++++--
13794 clutter/cogl/gles/cogl-context.c | 8 +-
13795 clutter/cogl/gles/cogl-texture.c | 244 +++++++++++++++++++++-----------------
13796 clutter/cogl/gles/cogl.c | 26 +++-
13797 6 files changed, 233 insertions(+), 134 deletions(-)
13799 commit 081f2056bc1c1b98337b6a18a37cfe4e76fd3cd4
13800 Author: Robert Bragg <robert@linux.intel.com>
13801 Date: Tue Jan 27 11:07:22 2009 +0000
13803 Removes cogl_color_set_from_4d as it may mislead people.
13805 Someone not sure which cogl_color_set_from_* version is "best" may use
13806 set_from_4d because taking doubles implies higher precision. Currently
13807 it doesn't have any advantage.
13809 clutter/cogl/cogl-color.h | 17 -----------------
13810 clutter/cogl/common/cogl-color.c | 15 ---------------
13811 2 files changed, 32 deletions(-)
13813 commit ef4052c18d54e6ee6cf96c2c1b3d7db81b98dc1e
13814 Author: Robert Bragg <robert@linux.intel.com>
13815 Date: Wed Jan 28 14:47:03 2009 +0000
13817 Changes cogl_rectangle to take x1, y1, x2, y2 args not x1, y1, width, height
13819 This makes it consistent with cogl_rectangle_with_{multi,}texture_coords.
13820 Notably the reason cogl_rectangle_with_{multi,}texture_coords wasn't changed
13821 instead is that the former approach lets you describe back facing rectangles.
13822 (though technically you could pass negative width/height values to achieve
13823 this; it doesn't seem as neat.)
13825 clutter/clutter-rectangle.c | 12 ++++----
13826 clutter/clutter-text.c | 9 +++---
13827 clutter/cogl/cogl-path.h | 16 +++++------
13828 clutter/cogl/common/cogl-primitives.c | 13 ++++-----
13829 clutter/cogl/gl/cogl-primitives.c | 10 ++++---
13830 clutter/cogl/gles/cogl-primitives.c | 10 ++++---
13831 clutter/cogl/gles/cogl.c | 8 ++++--
13832 clutter/pango/cogl-pango-render.c | 2 +-
13833 tests/conform/test-backface-culling.c | 6 ++--
13834 tests/conform/test-binding-pool.c | 4 +--
13835 tests/interactive/test-binding-pool.c | 4 +--
13836 tests/interactive/test-cogl-offscreen.c | 48 +++++++++++++++----------------
13837 tests/interactive/test-paint-wrapper.c | 2 +-
13838 13 files changed, 75 insertions(+), 69 deletions(-)
13840 commit 6048a0544a3eaf8e83c6be9889b624525476cec6
13841 Author: Robert Bragg <robert@linux.intel.com>
13842 Date: Wed Jan 28 13:46:39 2009 +0000
13844 Adds some debug code to _cogl_journal_flush_quad_batch
13846 The code is #if 0 guarded, but when uncommented it outlines all drawn
13847 rectangles with an un-blended red, green or blue border. This may e.g. help
13848 with debugging texture slicing issues or blending issues, plus it looks quite
13851 clutter/cogl/gl/cogl-texture.c | 27 +++++++++++++++++++++++++++
13852 1 file changed, 27 insertions(+)
13854 commit 0530405899d0399f97ff744eb88cb8674a423821
13855 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13856 Date: Wed Jan 28 16:44:22 2009 +0000
13858 [clutter-docs] Update the animation tutorial
13860 The Alpha API and usage has been changed by the recent overhaul
13861 of the ClutterAlpha class; hence, we need to update the relative
13862 documentation in the animation tutorial.
13864 .../clutter/clutter-animation-tutorial.xml | 84 +++-----------------
13865 1 file changed, 13 insertions(+), 71 deletions(-)
13867 commit b09ee495a5f0914b347b053533c6ebd3d6922012
13868 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13869 Date: Wed Jan 28 16:43:05 2009 +0000
13871 [cogl-docs] Add the Materials section
13873 The COGL Materials API was not linked from the COGL reference
13876 doc/reference/cogl/cogl-docs.sgml | 1 +
13877 1 file changed, 1 insertion(+)
13879 commit 7f6870fb4b6ddcdad2977582a6f533c928bdf0ff
13880 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13881 Date: Wed Jan 28 15:19:24 2009 +0000
13883 Update the pkg-config requires list
13885 Clutter depends on various libraries, some of them backend-specific
13886 like the X11 libraries.
13888 Whenever possible, we should add those requirements to the pkg-config
13889 file. For this reason, we have a variable inside the configure.ac
13890 template file which should be filled with the backend-specific modules
13891 we check for during configure time, and then added to the standard
13892 list of dependencies that we write inside the clutter.pc file.
13894 configure.ac | 14 ++++++++++++--
13895 1 file changed, 12 insertions(+), 2 deletions(-)
13897 commit e30c5b33b90ee27a95d46d156a41e5d14c6c69ed
13898 Author: Neil Roberts <neil@linux.intel.com>
13899 Date: Wed Jan 28 16:24:02 2009 +0000
13901 Undeprecate clutter_actor_set_scale_with_gravity
13903 The scale center has returned so this function is available again but
13904 it was still deprecated so you couldn't use it.
13906 clutter/clutter-deprecated.h | 3 +--
13907 1 file changed, 1 insertion(+), 2 deletions(-)
13909 commit 3e68b23ea8f290a70ba67dff4ed304fe1eb72bb6
13910 Merge: 811dd7e 1cd3134
13911 Author: Neil Roberts <neil@linux.intel.com>
13912 Date: Wed Jan 28 09:08:19 2009 +0000
13914 Merge branch 'scale-center'
13916 Bug 1349 - Using the anchor point to set the scale center is messy
13918 The branch adds an extra center point for scaling which can be used
13919 for example to set a scale about the center without affecting the
13920 position of the actor.
13922 The scale center can be specified as a unit offset from the origin or
13923 as a gravity. If specified as a gravity it will be stored as a
13924 fraction of the actor's size so that the position will track when the
13925 actor changes size.
13927 The anchor point and rotation centers have been modified so they can
13928 be set with a gravity in the same way. However, only the Z rotation
13929 exposes a property to set using a gravity because the other two
13930 require a Z coordinate which doesn't make sense to interpret as a
13931 fraction of the actor's width or height.
13935 clutter/clutter-actor.c
13937 commit 1cd313477b2818b9117a1f0bbeeb113553ac447e
13938 Author: Neil Roberts <neil@linux.intel.com>
13939 Date: Wed Jan 28 15:25:38 2009 +0000
13941 [clutter-actor] Use G_STMT_START/END instead of do { } while (0)
13943 In the TRANSFORM_ABOUT_ANCHOR_COORD macro it now uses G_STMT_START and
13944 G_STMT_END instead of directly using do/while because it's more
13947 clutter/clutter-actor.c | 5 +++--
13948 1 file changed, 3 insertions(+), 2 deletions(-)
13950 commit 811dd7eedc9338110510f02967270ffb5b4d09b7
13951 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13952 Date: Wed Jan 28 14:36:45 2009 +0000
13956 NEWS | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
13957 1 file changed, 137 insertions(+), 1 deletion(-)
13959 commit 8b0de3491e2a857891f8fbc155886a8922ca5dff
13960 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13961 Date: Wed Jan 28 14:07:23 2009 +0000
13963 Update the release notes for 1.0
13965 Add items about the ClutterBehaviourBspline and ClutterEffect
13969 1 file changed, 7 insertions(+)
13971 commit d7c275f5e55ac90e0ca89b637eabc9d8edce4d77
13972 Author: Neil Roberts <neil@linux.intel.com>
13973 Date: Wed Jan 28 12:57:06 2009 +0000
13975 [cogl-texture] Fix order of tex coords when compensating for waste
13977 When drawing a texture with waste in _cogl_multitexture_unsliced_quad
13978 it scales the texture coordinates so that the waste is not
13979 included. However the formula was the wrong way around so it was
13980 calculating as if the texture coordinates are ordered x1,x2,y1,y2 but
13981 it is actually x1,y1,x2,y2.
13983 clutter/cogl/gl/cogl-texture.c | 4 ++--
13984 clutter/cogl/gles/cogl-texture.c | 4 ++--
13985 2 files changed, 4 insertions(+), 4 deletions(-)
13987 commit 561c441241a2d6510075f07d154a8bbaa89a0596
13988 Author: Neil Roberts <neil@linux.intel.com>
13989 Date: Wed Jan 28 12:06:39 2009 +0000
13991 [text-backface-culling] Fix width/height parameters to cogl_rectangle
13993 During the upgrade to cogl material, test-backface-culling was
13994 switched to use cogl_rectangle instead of cogl_texture_rectangle to
13995 draw the textures. However, cogl_rectangle takes a width and height
13996 instead of the the top-left and bottom-right vertices so the
13997 rectangles were being drawn in the wrong place.
13999 tests/conform/test-backface-culling.c | 7 +++----
14000 1 file changed, 3 insertions(+), 4 deletions(-)
14002 commit e72042648c2d481e7be3f395f080e798cea82c46
14003 Author: Neil Roberts <neil@linux.intel.com>
14004 Date: Wed Jan 28 12:00:01 2009 +0000
14006 [cogl-texture] Reset size of vertex log after drawing a polygon
14008 Otherwise trying to render a rectangle after a polygon doesn't work
14009 because it expects the array to be empty when it starts logging
14012 clutter/cogl/gl/cogl-texture.c | 4 ++++
14013 clutter/cogl/gles/cogl-texture.c | 4 ++++
14014 2 files changed, 8 insertions(+)
14016 commit eda1d08f76f0636b9a273f3c673214f9c5def11d
14017 Author: Neil Roberts <neil@linux.intel.com>
14018 Date: Wed Jan 28 11:29:49 2009 +0000
14020 Fix rectangles_with_multitexture_coords for sliced without tex coords
14022 When the texture is sliced it drops back to a fallback function and
14023 passes it the texture coordinates from the rectangle. However if no
14024 tex coords are given it would crash. Now it passes the default
14025 0.0->1.0 tex coords instead.
14027 clutter/cogl/gl/cogl-texture.c | 23 +++++++++++++++--------
14028 clutter/cogl/gles/cogl-texture.c | 23 +++++++++++++++--------
14029 2 files changed, 30 insertions(+), 16 deletions(-)
14031 commit 7df19876522dcbfc2c158ec6dacf0f7d98ca3365
14032 Author: Neil Roberts <neil@linux.intel.com>
14033 Date: Wed Jan 28 11:09:47 2009 +0000
14035 Fix _cogl_texture_unsliced_quad when no texture coordinates are given
14037 If no texture coordinates are given then texture_unsliced_quad tries
14038 to generate its own coordinates. However it also tries to read the
14039 texture coordinates to check if they are in [0.0,1.0] range so it will
14040 crash before it reaches that.
14042 clutter/cogl/gl/cogl-texture.c | 11 +++++++----
14043 clutter/cogl/gles/cogl-texture.c | 11 +++++++----
14044 2 files changed, 14 insertions(+), 8 deletions(-)
14046 commit 9b7fa2cb048f7318a701db8664982423202d0e11
14047 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14048 Date: Wed Jan 28 11:56:12 2009 +0000
14050 Reuse the layers list
14052 Instead of getting the layers list twice from the Material, we
14053 can reuse the list when we need to retrieve the first layer.
14055 clutter/cogl/gl/cogl-texture.c | 4 ++--
14056 1 file changed, 2 insertions(+), 2 deletions(-)
14058 commit b3e02869cd00c0f5a163cdaffe6b9837bb1e9982
14059 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14060 Date: Wed Jan 28 11:55:19 2009 +0000
14062 Remove gtk-doc annotation
14064 The _cogl_material_flush_layers_gl_state() function is static,
14065 so it should not have a gtk-doc annotation.
14067 clutter/cogl/common/cogl-material.c | 2 +-
14068 1 file changed, 1 insertion(+), 1 deletion(-)
14070 commit b08a0115128cb68cfb92813d2325a490802e606a
14071 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14072 Date: Tue Jan 27 20:06:58 2009 +0000
14074 Fix typo in the :clone getter method
14076 The :clone property getter method, clutter_clone_get_source(), was
14077 defined using the wrong name of clutter_clone_get_clone_source().
14079 clutter/clutter-clone.c | 2 +-
14080 1 file changed, 1 insertion(+), 1 deletion(-)
14082 commit bba85d47f93a004c355f4f53166b809940a0ebab
14083 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14084 Date: Tue Jan 27 17:44:49 2009 +0000
14086 Update the release notes for 1.0
14088 Add entries for the removal of:
14092 - ClutterCloneTexture
14094 README | 8 ++++++++
14095 1 file changed, 8 insertions(+)
14097 commit 2722909b7668f5f566b1907f3c8fc1447adc192c
14098 Author: Neil Roberts <neil@linux.intel.com>
14099 Date: Wed Jan 28 10:52:55 2009 +0000
14101 Fix building GLES after _cogl_texture_handle_from_pointer got removed
14103 Commit a688b1db removed the function and replaced it with a direct
14104 cast. This was also being used in the GL ES so the build broke.
14106 clutter/cogl/gles/cogl-texture.c | 2 +-
14107 1 file changed, 1 insertion(+), 1 deletion(-)
14109 commit 6b9da72ab053eb96bed20655d8894c614a3077f1
14110 Author: Neil Roberts <neil@linux.intel.com>
14111 Date: Tue Jan 27 16:55:25 2009 +0000
14113 Directly set backend font options in clutter_set_font_flags
14115 Instead of having a separate set of font options that override the
14116 backend options when clutter_set_font_flags is called, it now just
14117 directly sets the backend font options. So now the font flags are just
14118 a convenience wrapper around the backend font options.
14120 This also makes the ClutterText labels automatically update when the
14121 font flags are changed because they will respond to the 'font-changed'
14122 signal from the backend.
14124 clutter/clutter-main.c | 28 +++++++++-------------------
14125 clutter/clutter-private.h | 3 ---
14126 2 files changed, 9 insertions(+), 22 deletions(-)
14128 commit 89b0b00dd14cde4f2a7d6bfab5bbdc78bc21f315
14129 Author: Neil Roberts <neil@linux.intel.com>
14130 Date: Tue Jan 27 16:47:20 2009 +0000
14132 Listen for the font-changed signal on the backend in ClutterText
14134 Whenever a ClutterText is created it now connects to the font-changed
14135 signal. When it is emitted the layout cache is dirtied and a relayout
14136 is queued. That way changes to the font options or resolution will
14137 cause an immediate update to the labels in the scene.
14139 clutter/clutter-text.c | 26 ++++++++++++++++++++++++++
14140 1 file changed, 26 insertions(+)
14142 commit 1b578fb9c7c19defdbec670fec86956c4987972f
14143 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14144 Date: Tue Jan 27 16:53:01 2009 +0000
14146 [docs] Documentation fixes
14148 Update the COGL API reference to avoid a lot of warnings coming
14151 clutter/cogl/common/cogl-matrix.c | 12 +++++++-----
14152 doc/reference/cogl/cogl-sections.txt | 35 ++++++++++++++++++++++++++--------
14153 2 files changed, 34 insertions(+), 13 deletions(-)
14155 commit f9588b24876b40fd48687cfdb3497af50987b4da
14156 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14157 Date: Tue Jan 27 16:41:51 2009 +0000
14159 [docs] Update Clutter API reference symbols
14161 Add the new symbols from the ClutterClone and COGL material API
14162 to the API reference.
14164 doc/reference/clutter/clutter-sections.txt | 4 ++++
14165 doc/reference/clutter/clutter.types | 2 +-
14166 2 files changed, 5 insertions(+), 1 deletion(-)
14168 commit 865f04decd4baa5b2876a9a917fea12ede1e31c2
14169 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14170 Date: Tue Jan 27 16:40:51 2009 +0000
14172 Removed unused conditional
14174 USE_COGL_MATERIAL is a left-over from the development branch.
14176 clutter/clutter-texture.h | 8 --------
14177 1 file changed, 8 deletions(-)
14179 commit 3cfc7fb1ca428c73ff2434f178cb8cc4e01728d4
14180 Merge: a688b1d 86e95a7
14181 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14182 Date: Tue Jan 27 16:12:30 2009 +0000
14184 Merge branch 'generic-actor-clone'
14186 * generic-actor-clone:
14187 Remove CloneTexture from the API
14188 [tests] Clean up the Clone interactive test
14189 Rename ActorClone to Clone/2
14190 Rename ActorClone to Clone/1
14191 Improves the unit test to verify more awkward scaling and some corresponding fixes
14192 Implements a generic ClutterActorClone that doesn't need fbos.
14194 commit a688b1db01adf935867ea9f7907d785a771cbce8
14195 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14196 Date: Tue Jan 27 16:02:04 2009 +0000
14198 Fallout from cogl-material merge
14200 When enabling the maintainer CFLAGS the compiler got very angry
14201 at the code that has been merged.
14203 clutter/clutter-clone-texture.c | 3 +--
14204 clutter/cogl/common/cogl-handle.h | 6 ------
14205 clutter/cogl/common/cogl-material.c | 13 ++++++-------
14206 clutter/cogl/gl/cogl-context.c | 8 ++++----
14207 clutter/cogl/gl/cogl-texture.c | 8 +++-----
14208 tests/interactive/test-cogl-multitexture.c | 1 -
14209 6 files changed, 14 insertions(+), 25 deletions(-)
14211 commit 840941fdfe62dc9d086e64ae98c304f87224b9c3
14212 Author: Robert Bragg <robert@linux.intel.com>
14213 Date: Tue Jan 27 11:01:23 2009 +0000
14215 Adds padding to CoglColor to future proof it a bit
14217 This adds enough padding to allow us to change to an internal float storage
14218 for the color components if needs be in the future.
14220 clutter/cogl/cogl-types.h | 6 ++++++
14221 1 file changed, 6 insertions(+)
14223 commit 70d7d16f13d35392e1f46d87dc245713fd4e68f3
14224 Author: Robert Bragg <robert@linux.intel.com>
14225 Date: Mon Jan 26 22:52:38 2009 +0000
14227 Support scaling on the z axis with cogl_scale
14229 This simply adds a z argument to cogl_scale and updates clutter-actor.c
14230 to pass 1.0 for the z scale.
14233 clutter/clutter-actor.c | 2 +-
14234 clutter/cogl/cogl.h.in | 8 +++++---
14235 clutter/cogl/gl/cogl.c | 4 ++--
14236 clutter/cogl/gles/cogl.c | 4 ++--
14237 5 files changed, 12 insertions(+), 8 deletions(-)
14239 commit e9a45c77449fab4ab911a136004155429f6d5bbf
14240 Merge: 418fb99 9266e11
14241 Author: Robert Bragg <robert@linux.intel.com>
14242 Date: Tue Jan 27 15:19:34 2009 +0000
14244 Merge branch 'cogl-material'
14248 clutter/cogl/gl/cogl-texture.c
14249 clutter/cogl/gles/cogl-primitives.c
14252 clutter-{clone-,}texture weren't updating their material opacity.
14253 Updates GLES1 support for CoglMaterial
14254 Normalizes gl vs gles code in preperation for synching material changes
14255 Removes cogl_blend_func and cogl_alpha_func
14256 Fully integrates CoglMaterial throughout the rest of Cogl
14257 [cogl-material] Restore the GL_TEXTURE_ENV_MODE after material_rectangle
14258 [cogl-material] Make the user_tex_coords parameter of _rectangle const
14259 [test-cogl-material] Remove return value from material_rectangle_paint
14260 Add cogl-material.h and cogl-matrix.h to libclutterinclude_HEADERS
14261 [cogl-material] improvements for cogl_material_rectangle
14262 [cogl-material] Adds a cogl_material_set_color function
14263 [cogl-material] Some improvements for how we sync CoglMaterial state with OpenGL
14264 [cogl-material] Converts clutter-texture/clutter-clone-texture to the material API
14265 [doc] Hooks up cogl-material reference documentation
14266 Updates previous GLES multi-texturing code to use CoglMaterial
14267 Adds a CoglMaterial abstraction, which includes support for multi-texturing
14268 [doc] Hooks up cogl-matrix reference documentation
14269 Adds CoglMatrix utility code
14270 [tests] Adds an interactive unit test for multi-texturing
14271 [multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2
14273 commit 86e95a779a87b0d02337c55548152883b6f944aa
14274 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14275 Date: Tue Jan 27 15:18:45 2009 +0000
14277 Remove CloneTexture from the API
14279 ClutterClone supercedes ClutterCloneTexture, since it can clone
14280 every kind of actor -- including composite ones.
14282 This is another "brain surgery with a shotgun" kind of commit: it
14283 removes CloneTexture and updates every test case using CloneTexture
14284 to ClutterClone. The API fallout is minimal, luckily for us.
14286 clutter/Makefile.am | 2 -
14287 clutter/clutter-clone-texture.c | 455 ----------------------------
14288 clutter/clutter-clone-texture.h | 76 -----
14289 clutter/clutter-clone.c | 14 +-
14290 clutter/clutter.h | 1 -
14291 doc/reference/clutter/clutter-docs.xml | 9 +-
14292 doc/reference/clutter/clutter-sections.txt | 30 +-
14293 tests/interactive/test-actors.c | 151 ++++-----
14294 tests/interactive/test-depth.c | 19 +-
14295 tests/interactive/test-fbo.c | 2 +-
14296 tests/interactive/test-layout.c | 3 +-
14297 tests/interactive/test-paint-wrapper.c | 4 +-
14298 12 files changed, 122 insertions(+), 644 deletions(-)
14300 commit 9266e110ded6b7308596eea2dd194736adf72641
14301 Author: Robert Bragg <robert@linux.intel.com>
14302 Date: Tue Jan 27 15:17:16 2009 +0000
14304 Removes test-simple from tests/interactive/Makefile.am
14306 The addition was accidental
14308 tests/interactive/Makefile.am | 3 +--
14309 1 file changed, 1 insertion(+), 2 deletions(-)
14311 commit 418fb995c86e4d3c6e76398bac95e980e42d8125
14312 Author: Neil Roberts <neil@linux.intel.com>
14313 Date: Tue Jan 27 14:25:50 2009 +0000
14315 Replace clutter_set_use_mipmapped_text with clutter_set_font_flags
14317 The hope is that this function makes it easier to extend the font
14318 settings with more flags without having to add a function for every
14321 A new flag for enabling hinting has been added. If set, this changes
14322 the font options on the global PangoContext and any newly created
14323 PangoContexts. The options are only set if the flag is changed from
14324 the default so it won't override any detailed setting chosen by the
14327 clutter/clutter-deprecated.h | 3 +
14328 clutter/clutter-main.c | 91 ++++++++++++++++++++++------
14329 clutter/clutter-main.h | 4 +-
14330 clutter/clutter-private.h | 3 +
14331 clutter/clutter-types.h | 16 +++++
14332 doc/reference/clutter/clutter-sections.txt | 5 +-
14333 6 files changed, 99 insertions(+), 23 deletions(-)
14335 commit cd5c1bd98b41572ddadda2cde0d59bf189eb54c9
14336 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14337 Date: Tue Jan 27 14:36:12 2009 +0000
14339 [tests] Clean up the Clone interactive test
14341 Do not assume the default stage, and store more data inside the
14342 "application" structure that gets passed around instead of relying
14345 tests/interactive/test-actor-clone.c | 121 ++++++++++++++++++----------------
14346 1 file changed, 64 insertions(+), 57 deletions(-)
14348 commit 28f9749e8eb26e2e9215fedd7d4bd28490e1a80d
14349 Author: Robert Bragg <robert@linux.intel.com>
14350 Date: Mon Jan 26 15:25:55 2009 +0000
14352 clutter-{clone-,}texture weren't updating their material opacity.
14354 cogl_set_source_color4ub was previously used to set a transparent
14355 white source color according to the actors opacity, but since
14356 cogl_set_source_color now always implies you want a solid fill we
14357 we use cogl_material_set_color4ub to achieve the same result.
14359 clutter/clutter-clone-texture.c | 24 ++++---------
14360 clutter/clutter-texture.c | 75 +++++----------------------------------
14361 2 files changed, 15 insertions(+), 84 deletions(-)
14363 commit 4a7fa6d0fa30b6510e997ed3e2fd0ec7ec1a6354
14364 Author: Robert Bragg <robert@linux.intel.com>
14365 Date: Mon Jan 26 11:07:35 2009 +0000
14367 Updates GLES1 support for CoglMaterial
14369 This updates cogl/gles in line with the integration of CoglMaterial throughout
14370 Cogl that has been done for cogl/gl.
14372 Note: This is still buggy, but at least it builds again and test-actors works.
14373 Some GLES2 specific changes were made, but these haven't been tested yet.
14375 clutter/cogl/common/cogl-material.c | 35 +-
14376 clutter/cogl/gl/cogl-texture.c | 25 +-
14377 clutter/cogl/gles/cogl-context.c | 128 ++-
14378 clutter/cogl/gles/cogl-context.h | 92 +-
14379 clutter/cogl/gles/cogl-gles2-wrapper.h | 5 +
14380 clutter/cogl/gles/cogl-internal.h | 11 +-
14381 clutter/cogl/gles/cogl-primitives.c | 75 +-
14382 clutter/cogl/gles/cogl-texture-private.h | 39 +-
14383 clutter/cogl/gles/cogl-texture.c | 1642 +++++++++++++++++++-----------
14384 clutter/cogl/gles/cogl.c | 49 +-
14385 10 files changed, 1312 insertions(+), 789 deletions(-)
14387 commit 60e81f0fda48d192d7ee701e80f0709fa509ca03
14388 Author: Robert Bragg <robert@linux.intel.com>
14389 Date: Sat Jan 24 16:55:04 2009 +0000
14391 Normalizes gl vs gles code in preperation for synching material changes
14393 This changes all GLES code to use the OpenGL function names instead of
14394 the cogl_wrap_* names. For GLES2 we now define the OpenGL name to point
14395 to the wrapper, as opposed to defining the wrapper to point to the
14396 OpenGL name for GLES1.
14398 I've also done a quick pass through gl/cogl.c and gles/cogl.c to make
14399 them more easily comparable. (most of the code is now identical)
14401 clutter/cogl/gl/cogl-primitives.c | 43 ++-
14402 clutter/cogl/gl/cogl.c | 144 ++++-----
14403 clutter/cogl/gles/cogl-context.c | 2 +-
14404 clutter/cogl/gles/cogl-fbo.c | 32 +-
14405 clutter/cogl/gles/cogl-primitives.c | 34 +-
14406 clutter/cogl/gles/cogl-texture.c | 585 +++++++++++++++++------------------
14407 clutter/cogl/gles/cogl.c | 286 +++++++++--------
14408 7 files changed, 561 insertions(+), 565 deletions(-)
14410 commit 427fff032eaedaf4489633d6a775413343b878a6
14411 Author: Robert Bragg <robert@linux.intel.com>
14412 Date: Sat Jan 24 15:09:43 2009 +0000
14414 Removes cogl_blend_func and cogl_alpha_func
14416 The GL blend function and alpha function are now controlled by the material
14417 code, and even internally Cogl should now be using the material API when
14418 it needs control of these.
14421 clutter/cogl/cogl.h.in | 13 -------------
14422 clutter/cogl/common/cogl-material.c | 8 ++++++++
14423 clutter/cogl/gl/cogl-context.c | 3 ---
14424 clutter/cogl/gl/cogl-context.h | 2 --
14425 clutter/cogl/gl/cogl.c | 24 ------------------------
14426 clutter/cogl/gles/cogl.c | 24 ------------------------
14427 7 files changed, 11 insertions(+), 66 deletions(-)
14429 commit 5985eef44cce8177bf8a93c6ffaf2b78cc634ece
14430 Author: Robert Bragg <robert@linux.intel.com>
14431 Date: Fri Jan 23 16:15:40 2009 +0000
14433 Fully integrates CoglMaterial throughout the rest of Cogl
14435 This glues CoglMaterial in as the fundamental way that Cogl describes how to
14438 It adds cogl_set_source (), which is used to set the material which will be
14439 used by all subsequent drawing functions
14441 It adds cogl_set_source_texture as a convenience for setting up a default
14442 material with a single texture layer, and cogl_set_source_color is now also
14443 a convenience for setting up a material with a solid fill.
14445 "drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
14446 cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
14447 cogl_texture_* funcs have been renamed; see below for details),
14448 cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
14450 cogl_texture_rectangle, cogl_texture_multiple_rectangles and
14451 cogl_texture_polygon no longer take a texture handle; instead the current
14452 source material is referenced. The functions have also been renamed to:
14453 cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
14454 and cogl_polygon respectivly.
14456 Most code that previously did:
14457 cogl_texture_rectangle (tex_handle, x, y,...);
14458 needs to be changed to now do:
14459 cogl_set_source_texture (tex_handle);
14460 cogl_rectangle_with_texture_coords (x, y,....);
14462 In the less likely case where you were blending your source texture with a color
14464 cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
14465 cogl_texture_rectangle (tex_handle, x, y,...);
14466 you will need your own material to do that:
14467 mat = cogl_material_new ();
14468 cogl_material_set_color4ub (r,g,b,a);
14469 cogl_material_set_layer (mat, 0, tex_handle));
14470 cogl_set_source_material (mat);
14472 Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
14473 cog_rectangle_with_texure_coords since these are the coordinates that
14474 cogl_rectangle will use.
14476 For cogl_texture_polygon; as well as dropping the texture handle, the
14477 n_vertices and vertices arguments were transposed for consistency. So
14478 code previously written as:
14479 cogl_texture_polygon (tex_handle, 3, verts, TRUE);
14480 need to be written as:
14481 cogl_set_source_texture (tex_handle);
14482 cogl_polygon (verts, 3, TRUE);
14484 All of the unit tests have been updated to now use the material API and
14485 test-cogl-material has been renamed to test-cogl-multitexture since any
14486 textured quad is now technically a test of CoglMaterial but this test
14487 specifically creates a material with multiple texture layers.
14489 Note: The GLES backend has not been updated yet; that will be done in a
14493 clutter/clutter-clone-texture.c | 23 +-
14494 clutter/clutter-main.c | 27 +-
14495 clutter/clutter-texture.c | 22 +-
14496 clutter/cogl/cogl-material.h | 169 +++-
14497 clutter/cogl/cogl-path.h | 3 +-
14498 clutter/cogl/cogl-texture.h | 185 ++--
14499 clutter/cogl/cogl.h.in | 2 +-
14500 clutter/cogl/common/cogl-material-private.h | 31 +-
14501 clutter/cogl/common/cogl-material.c | 619 +++++++++---
14502 clutter/cogl/common/cogl-primitives.c | 13 +-
14503 clutter/cogl/common/cogl-vertex-buffer.c | 80 +-
14504 clutter/cogl/gl/cogl-context.c | 89 +-
14505 clutter/cogl/gl/cogl-context.h | 44 +-
14506 clutter/cogl/gl/cogl-internal.h | 11 +-
14507 clutter/cogl/gl/cogl-primitives.c | 50 +-
14508 clutter/cogl/gl/cogl-texture-private.h | 39 +-
14509 clutter/cogl/gl/cogl-texture.c | 1374 +++++++++++++++++----------
14510 clutter/cogl/gl/cogl.c | 128 ++-
14511 clutter/pango/cogl-pango-render.c | 114 ++-
14512 tests/conform/test-backface-culling.c | 42 +-
14513 tests/interactive/Makefile.am | 5 +-
14514 tests/interactive/test-clip.c | 12 +-
14515 tests/interactive/test-cogl-material.c | 162 ----
14516 tests/interactive/test-cogl-multitexture.c | 160 ++++
14517 tests/interactive/test-cogl-offscreen.c | 38 +-
14518 tests/interactive/test-cogl-tex-convert.c | 50 +-
14519 tests/interactive/test-cogl-tex-foreign.c | 14 +-
14520 tests/interactive/test-cogl-tex-getset.c | 14 +-
14521 tests/interactive/test-cogl-tex-polygon.c | 18 +-
14522 tests/interactive/test-cogl-tex-tile.c | 13 +-
14523 31 files changed, 2341 insertions(+), 1259 deletions(-)
14525 commit 86e4e89bf1125f3090c63daaf423bc67c64d727f
14526 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14527 Date: Mon Jan 26 11:03:12 2009 +0000
14529 Rename ActorClone to Clone/2
14531 Step two: rename the object and its methods.
14533 While we're at it, adhere more strictly to the coding style
14534 practises; rename :clone-source to :source; add a setter method
14535 for the :source property; take a reference on the source actor
14536 to avoid it disappearing while we're still accessing it.
14538 clutter/clutter-clone.c | 258 ++++++++++++++++++++--------------
14539 clutter/clutter-clone.h | 43 +++---
14540 tests/interactive/test-actor-clone.c | 4 +-
14541 3 files changed, 174 insertions(+), 131 deletions(-)
14543 commit 00a4549eb1533478dd9a49eb44c3f910f666fe44
14544 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14545 Date: Tue Jan 27 13:22:47 2009 +0000
14547 [tests] Remove an unused variable
14549 This fixes a compiler warning.
14551 tests/conform/test-timeline.c | 1 -
14552 1 file changed, 1 deletion(-)
14554 commit 2138b1cbb2a5ab5d224cebc452bbc0726242d1f4
14555 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14556 Date: Tue Jan 27 11:25:06 2009 +0000
14558 Bug 1388 - Clarify signal emission for advance_to_marker()
14560 Like clutter_timeline_advance(), calling advance_to_marker() will
14561 not emit ::new-frame for the frame where the marker is set on; it
14562 will also not emit ::marker-reached for the marker we are advancing
14565 clutter/clutter-timeline.c | 5 +++++
14566 1 file changed, 5 insertions(+)
14568 commit 8608d103f82f14ead4cd2c92d2ce2eef9363ed54
14569 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14570 Date: Tue Jan 27 11:18:09 2009 +0000
14572 Bug 1387 - Clarify new-frame signal emission with advance()
14574 When calling clutter_timeline_advance(), a timeline will not emit
14575 the ::new-frame signal for the frame we are advancing to, as this
14576 would break the invariants of the timeline behaviour.
14578 The documentation should make this clear.
14580 clutter/clutter-timeline.c | 7 ++++++-
14581 1 file changed, 6 insertions(+), 1 deletion(-)
14583 commit 43bd4e5d3fcbe1a22bcae45d461f83f2ee0a9758
14584 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14585 Date: Tue Jan 27 10:35:50 2009 +0000
14587 [timeline] Check the fps property range in the ctor
14589 The clutter_timeline_new() constructor is not checking the full
14590 range of the passed :fps property. The ParamSpec of the property
14591 and the setter method perform this check, so the ctor should as
14594 clutter/clutter-timeline.c | 2 +-
14595 1 file changed, 1 insertion(+), 1 deletion(-)
14597 commit f753847851fafd76d9c91f05489aa9e5372f33d7
14598 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14599 Date: Tue Jan 27 10:33:44 2009 +0000
14601 [timeline] Move a complex condition into its own function
14603 The "is-timeline-complete" condition is pretty long, spanning
14604 four lines and four logical sub-conditions. It is possible to
14605 neatly move it into an is_complete() function and make the
14606 code more readable.
14608 clutter/clutter-timeline.c | 21 ++++++++++++---------
14609 1 file changed, 12 insertions(+), 9 deletions(-)
14611 commit 092db1098ce872b16765d25f4ad3a4215baa8996
14612 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14613 Date: Tue Jan 27 10:32:15 2009 +0000
14615 [timeline] Intern signal names
14617 The signal names are static string and thus should be interned
14618 so that Glib can do a simple pointer comparison whenever needed,
14619 instead of a strcmp().
14621 clutter/clutter-timeline.c | 10 +++++-----
14622 1 file changed, 5 insertions(+), 5 deletions(-)
14624 commit 7863ca4a5549cf2fccc5ded8854b0b8156b5d323
14625 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14626 Date: Tue Jan 27 10:31:53 2009 +0000
14628 [timeline] Whitespace fixes
14630 clutter/clutter-timeline.c | 29 +++++++++++++++++++++--------
14631 1 file changed, 21 insertions(+), 8 deletions(-)
14633 commit 2be9cdc267f7e7d7190f8e1056e7c717f9358626
14634 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14635 Date: Tue Jan 27 10:27:33 2009 +0000
14637 [timeline] Documentation and comment fixes
14639 The long description of the ClutterTimeline class is very C
14640 developer-oriented. Since many language bindings will refer to
14641 the C API reference we should probably be more verbose and
14642 language agnostic -- at least in the class description.
14644 The methods documentation also requires a little pass to increase
14645 the consistency of the terminology, the grammar and the syntax.
14647 Finally, comments never killed anyone.
14649 clutter/clutter-timeline.c | 75 +++++++++++++++++++++++---------------------
14650 1 file changed, 39 insertions(+), 36 deletions(-)
14652 commit 06162370643aa80505e7e3964545a1c8e1a023e0
14653 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14654 Date: Fri Jan 23 17:56:25 2009 +0000
14656 [tests] Assert as soon as possible
14658 In order to give a usable location of the errors in the test
14659 suite, we need to assert() as soon as possible.
14661 tests/conform/test-timeline.c | 23 ++++++-----------------
14662 1 file changed, 6 insertions(+), 17 deletions(-)
14664 commit 763de185e9abb9c4aee967a858b567e6c7435b26
14665 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14666 Date: Fri Jan 23 17:17:36 2009 +0000
14668 [timeline] Create markers hash tables on demand
14670 Since not every timeline will have markers it's unfair to make
14671 all of them crete two empty hash tables (with a preallocated
14674 This commit moves the responsibility of creating the hash tables
14675 to the marker API itself, and adds the relative checks.
14677 clutter/clutter-timeline.c | 60 +++++++++++++++++++++++++++++++++++---------
14678 1 file changed, 48 insertions(+), 12 deletions(-)
14680 commit 1e071ed859a1a2aeaf7c3e01f9d9f8d34fb00628
14681 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14682 Date: Fri Jan 23 17:14:39 2009 +0000
14684 [timeline] Limit timelines to 1000 frames per second
14686 Since we are using milliseconds granularity to integrate timelines
14687 with the GLib main loop, we cannot allow values of the :fps
14688 property bigger than 1000. This means validating the fps value both
14689 in the GParamSpec and the clutter_timeline_set_speed() accessor
14692 This should also fix floating point exceptions when trying to
14693 perform "n_frames = milliseconds / (1000 / fps)".
14697 http://bugzilla.openedhand.com/show_bug.cgi?id=1354
14699 clutter/clutter-timeline.c | 119 ++++++++++++++++++++++++--------------------
14700 1 file changed, 64 insertions(+), 55 deletions(-)
14702 commit 81f642d4b775b2a1020197c94332077848c5c60b
14703 Author: Havoc Pennington <hp@pobox.com>
14704 Date: Mon Jan 26 16:24:17 2009 +0000
14706 Bug 1414 - avoid relayout of ClutterTexture if not syncing size
14708 If a ClutterTexture does not sync size, it should be possible to
14709 change the texture size without causing a relayout.
14711 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
14713 clutter/clutter-texture.c | 3 ++-
14714 1 file changed, 2 insertions(+), 1 deletion(-)
14716 commit 9ccae46bc1e5af4fe51bc1d5b2f29e475585303d
14717 Author: Havoc Pennington <hp@pobox.com>
14718 Date: Mon Jan 26 16:22:39 2009 +0000
14720 Bug 1415 - short-circuit setting same clip again
14722 There is some GL work and a repaint anytime the clip is set
14723 or unset, so avoid that if it isn't really changed.
14725 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
14727 clutter/clutter-actor.c | 10 ++++++++++
14728 1 file changed, 10 insertions(+)
14730 commit 54f4ed775c72387acd6959f5c68453846a90dd68
14731 Author: Neil Roberts <neil@linux.intel.com>
14732 Date: Wed Jan 21 12:47:29 2009 +0000
14734 Set the SYNC_MATRICES flag when a stage is first realized
14736 The stage will usually be painted before the first ConfigureNotify
14737 arrives so we need to set the SYNC_MATRICES flag to ensure that the
14738 viewport will be correct for that paint. Unfortunately this means that
14739 the viewport will be set again once the ConfigureNotify is received
14740 but compared to rendering an initial invalid scene I think it is the
14741 lesser of two evils.
14743 clutter/clutter-stage.c | 5 +++++
14744 1 file changed, 5 insertions(+)
14746 commit 9197646d25d55e0cc826dee49254bf99ebf6c063
14747 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14748 Date: Mon Jan 26 10:32:53 2009 +0000
14750 Rename ActorClone to Clone/1
14752 Step one of the ActorClone -> Clone renaming: rename the files.
14754 clutter/Makefile.am | 4 +-
14755 clutter/clutter-actor-clone.c | 274 -----------------------------------------
14756 clutter/clutter-actor-clone.h | 76 ------------
14757 clutter/clutter-clone.c | 274 +++++++++++++++++++++++++++++++++++++++++
14758 clutter/clutter-clone.h | 76 ++++++++++++
14759 clutter/clutter.h | 2 +-
14760 6 files changed, 353 insertions(+), 353 deletions(-)
14762 commit cdb360107b08302597d538f0c35c4a55114f2f54
14763 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14764 Date: Fri Jan 23 16:50:17 2009 +0000
14766 Whitespace fixes for BehaviourEllipse
14768 Simple fallout from the automated conversion scripts that
14769 switched from ClutterFixed to float.
14771 clutter/clutter-behaviour-ellipse.c | 63 ++++++++++++++++++-----------------
14772 1 file changed, 32 insertions(+), 31 deletions(-)
14774 commit 171a7647b916ee0c12d1494ba47921f3cd783c53
14775 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14776 Date: Fri Jan 23 16:22:02 2009 +0000
14778 Bug 1395 - apply and get_nth_actor are inconsistent
14780 When calling clutter_behaviour_apply() the new actor is prepended
14781 to the list of actors to which a behaviour is applied; this breaks
14782 the rest of methods working on the actors list, e.g.:
14789 # expected: [ actor_0, actor_1, actor_2 ]
14790 [ actor_2, actor_1, actor_0 ] = get_actors();
14792 # expected: actor_2
14793 actor_0 = get_nth_actor(2);
14795 This commit fixes the inconsistency in the returned values.
14797 clutter/clutter-behaviour.c | 4 ++--
14798 1 file changed, 2 insertions(+), 2 deletions(-)
14800 commit ba068f6bc9f15aafc6d1af3526fc101634b978ac
14801 Author: Neil Roberts <neil@linux.intel.com>
14802 Date: Sat Jan 24 00:25:24 2009 +0000
14804 Fix the Cogl primitives for the GLES backend
14806 The Cogl primitives broke for GLES 1.1 and 2 after the cogl-float
14809 CoglPathNode was still being declared as GLfixed for the GLES backend
14810 but it was being filled with float values so they were all ending up
14813 glDrawArrays was being called with GL_FIXED so this has been changed
14816 The scanline rasterizer had a leftover hardcoded ClutterFixed constant
14817 to add a small amount to the height of each line.
14819 struct _CoglFloatVec2 has been removed because it is no longer used
14822 clutter/cogl/common/cogl-primitives.h | 21 ---------------------
14823 clutter/cogl/gles/cogl-primitives.c | 14 +++++++-------
14824 2 files changed, 7 insertions(+), 28 deletions(-)
14826 commit 8e437e838fe3e62354ae133d3e90af6d9984c4f7
14827 Author: Neil Roberts <neil@linux.intel.com>
14828 Date: Fri Jan 23 23:55:44 2009 +0000
14830 Simplify test-cogl-primitives
14832 This removes a lot of code from test-cogl-primitives to make it easier
14833 to follow. The TestCoglBox custom actor has gone and instead a blank
14834 ClutterGroup is created with a paint signal handler.
14836 Instead of rendering constantly and updating when a GTimer elapses a
14837 second, a ClutterTimeline is used with 1 fps and a new redraw is
14838 queued every frame.
14840 The custom main loop is replaced with a regular call to clutter_main.
14841 This fixes the close button of the stage window so you can quit
14842 without having to press Ctrl+C.
14844 tests/interactive/test-cogl-primitives.c | 167 ++++--------------------------
14845 1 file changed, 18 insertions(+), 149 deletions(-)
14847 commit 343b0ed67ef4a70e42b3eb2a93b15f42bf08e981
14848 Author: Neil Roberts <neil@linux.intel.com>
14849 Date: Fri Jan 23 23:41:26 2009 +0000
14851 [test-cogl-primitives] Remove trailing whitespace
14853 tests/interactive/test-cogl-primitives.c | 50 +++++++++++++++---------------
14854 1 file changed, 25 insertions(+), 25 deletions(-)
14856 commit 4d7caa4bd5267e0cc6b674d6cb76597ebc812694
14857 Author: Neil Roberts <neil@linux.intel.com>
14858 Date: Fri Jan 23 22:57:36 2009 +0000
14860 [clutter-timeline] Remove the code for backwards timelines in get_progress
14862 The special check to invert the progress when the timeline direction
14863 is backwards is not necessary because the actual frame number will be
14864 decreasing in that case. Inverting just makes it progress forwards
14867 This is more apparent since the float-alpha-value branch merge because
14868 the clutter_linear function directly returns the value from
14869 get_progress. For example in test-depth, the animations loop instead
14870 of oscillating back and forth.
14872 clutter/clutter-timeline.c | 3 ---
14873 1 file changed, 3 deletions(-)
14875 commit 9ea6ab76fb09891dd1c1380c4e163aaf656c507c
14876 Author: Neil Roberts <neil@linux.intel.com>
14877 Date: Fri Jan 23 17:25:43 2009 +0000
14879 Fix gtk-doc reference since the anchor point changes
14881 The documentation has been updated to reflect the fact that the anchor
14882 point will move when the actor changes size if it was specified using
14883 a gravity value. The new functions for setting the scale center and z
14884 rotation gravity are also documented.
14886 clutter/clutter-actor.c | 154 +++++++++++++++++++++++++---
14887 doc/reference/clutter/clutter-sections.txt | 15 +--
14888 2 files changed, 148 insertions(+), 21 deletions(-)
14890 commit 5acff562b40291402ef9a9c7977690824027804e
14891 Author: Neil Roberts <neil@linux.intel.com>
14892 Date: Fri Jan 23 15:57:20 2009 +0000
14894 [test-anchors] Add tests for the rotation centers
14896 The rotation centers are now tested in a similar way to the anchor
14897 point and scale centers.
14899 The notification handling code has been simplified a bit to handle the
14900 increased amount of properties.
14902 tests/conform/test-anchors.c | 378 ++++++++++++++++++++++++++++++++++++------
14903 1 file changed, 326 insertions(+), 52 deletions(-)
14905 commit d5e5d35316046a192064d5a9cef20542a100cb7d
14906 Author: Neil Roberts <neil@linux.intel.com>
14907 Date: Fri Jan 23 15:55:41 2009 +0000
14909 Convert the rotation centers to be AnchorCoords
14911 Currently only the Z axis rotation center can be set using a gravity
14912 but the other rotations also store their center as an AnchorCoord for
14913 consistency. Specifying the center as a gravity makes less sense for
14914 the other axes because the actors have no size along the Z axis.
14916 The rotation angles are now stored as gdoubles and the fixed point *x
14917 entry points have been removed.
14919 The Z rotation can now be set with a gravity center using the
14920 following new function:
14922 void clutter_actor_set_z_rotation_from_gravity (ClutterActor *self,
14924 ClutterGravity gravity);
14926 clutter/clutter-actor.c | 443 +++++++++++++++---------------------
14927 clutter/clutter-actor.h | 15 +-
14928 clutter/clutter-behaviour-rotate.c | 10 +-
14929 3 files changed, 196 insertions(+), 272 deletions(-)
14931 commit a8a986a1a2d4a32d8ce502f5cf8af6a98d8bd28e
14932 Author: Neil Roberts <neil@linux.intel.com>
14933 Date: Fri Jan 23 11:12:54 2009 +0000
14935 [test-anchors] Add tests for the scale center
14937 A separate set of tests for the scale center have been added that work
14938 in a similar way to the anchor point tests.
14940 tests/conform/test-anchors.c | 205 ++++++++++++++++++++++++++++++++++++++----
14941 1 file changed, 188 insertions(+), 17 deletions(-)
14943 commit e10d255b83071014219a54e2f3d5c31444df340f
14944 Author: Neil Roberts <neil@linux.intel.com>
14945 Date: Fri Jan 23 11:11:24 2009 +0000
14947 Add a scale center property to ClutterActor
14949 This sets the center point from which the scaling will occur. This can
14950 be used insetad of the anchor point to avoid moving the actor. Like
14951 the anchor point, it can be specified as either a coordinate in units
14954 To set the center you can use two new variants of set_scale:
14956 clutter_actor_set_scale_full (ClutterActor *self,
14964 clutter_actor_set_scale_with_gravity (ClutterActor *self,
14967 ClutterGravity gravity);
14969 The ClutterFixed variants of the set_scale functions have been removed
14970 and the scale value is now always stored as a double.
14972 clutter/clutter-actor.c | 279 +++++++++++++++++++++++++++++--------
14973 clutter/clutter-actor.h | 27 +++-
14974 clutter/clutter-behaviour-scale.c | 4 +-
14975 3 files changed, 245 insertions(+), 65 deletions(-)
14977 commit 7818eb704d6fdf7714be010d2b7be7e34420bb63
14978 Author: Neil Roberts <neil@linux.intel.com>
14979 Date: Thu Jan 22 13:14:02 2009 +0000
14981 Add a conformance test for the anchor point
14983 This verifies that the anchor point can be set from a gravity and then
14984 it moves when the anchor point changes size.
14986 tests/conform/Makefile.am | 1 +
14987 tests/conform/test-anchors.c | 253 +++++++++++++++++++++++++++++++++++++
14988 tests/conform/test-conform-main.c | 2 +
14989 3 files changed, 256 insertions(+)
14991 commit a24b9a32e56b76ab04727bb1f9e29ec3cca8dd11
14992 Author: Neil Roberts <neil@linux.intel.com>
14993 Date: Thu Jan 22 13:07:33 2009 +0000
14995 Store when the anchor point is set from a gravity
14997 This makes it so when the anchor point is set using a gravity enum
14998 then the anchor point moves when the actor changes size. A new
14999 property is added for the anchor point gravity. If the anchor point is
15000 set from gravity then the position in units can also be retreived with
15003 A new union type is used to store the anchor point with helper
15004 accessor functions. The hope is these can be reused for the scale and
15005 rotation center points.
15007 clutter/clutter-actor.c | 429 ++++++++++++++++++++++++++++++++++++-----------
15008 clutter/clutter-actor.h | 1 +
15009 2 files changed, 333 insertions(+), 97 deletions(-)
15011 commit d64ff5c9f0a564b9ac6d0f8688c355aaa97a05f2
15012 Author: Neil Roberts <neil@linux.intel.com>
15013 Date: Fri Jan 23 18:20:46 2009 +0000
15015 [test-text] Use g_setenv instead of setenv
15017 setenv doesn't appear to be available on Windows so it fails to
15020 tests/micro-bench/test-text.c | 2 +-
15021 1 file changed, 1 insertion(+), 1 deletion(-)
15023 commit 3d07e34cc54568a2e41cbd8565b6b21aa6dc5f53
15024 Merge: 616c082 634cdea
15025 Author: Robert Bragg <robert@linux.intel.com>
15026 Date: Fri Jan 23 15:23:49 2009 +0000
15028 Merge commit 'origin/master' into cogl-material
15032 clutter/clutter-texture.c
15033 clutter/cogl/cogl-texture.h
15034 clutter/cogl/cogl.h.in
15035 clutter/cogl/common/Makefile.am
15036 clutter/cogl/gl/Makefile.am
15037 clutter/cogl/gles/Makefile.am
15038 clutter/cogl/gles/cogl-gles2-wrapper.c
15039 clutter/cogl/gles/cogl-gles2-wrapper.h
15041 commit 134edac82c5adc564b88884983cc1caedcc1191a
15042 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15043 Date: Fri Jan 23 15:16:21 2009 +0000
15045 Bug 1361 - Unused ClutterStage::get_resolution() methods
15047 The clutter_stage_get_resolution() and fixed-point API are just
15050 clutter_backend_get_resolution (default_backend);
15052 And as such do not fit at all in the ClutterStage class. The only
15053 reason for their existence was the ClutterUnit conversion macros,
15054 which have now been fixed to use the default backend through a
15055 function call instead.
15057 Thus, we can safely remove the stage entry points.
15059 clutter/clutter-deprecated.h | 14 ++-------
15060 clutter/clutter-stage.c | 46 ----------------------------
15061 clutter/clutter-stage.h | 2 --
15062 doc/reference/clutter/clutter-sections.txt | 2 --
15063 4 files changed, 2 insertions(+), 62 deletions(-)
15065 commit ae40bd37c79db41d751e3d5300a098c53f95e5c3
15066 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15067 Date: Fri Jan 23 13:29:55 2009 +0000
15069 Clean up the test reports
15071 Since we override the clean-generic target in order to remove
15072 the shell scripts we create for each conformance test unit, we
15073 cannot use CLEANFILES to remove the test reports.
15075 tests/conform/Makefile.am | 8 ++++----
15076 1 file changed, 4 insertions(+), 4 deletions(-)
15078 commit 915d9ec7ca782572944a96fd52c2ff2ffdb1dac7
15079 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15080 Date: Fri Jan 23 13:09:51 2009 +0000
15082 Split maintainer-flags from the compiler flags
15084 The maintainer compiler flags we use trigger warnings and errors
15085 in the autogenerated code that gtk-doc creates to scan the header
15086 and source files. Since we cannot control that, and we must run
15087 a distcheck with both --enable-gtk-doc and --enable-maintainer-flags
15088 turned on, we need to use less-strict compiler flags when inside
15089 the doc/reference subdirectories.
15091 The way to do this is to split the maintainer compiler flags into
15092 their own Makefile variable, called MAINTAINER_CFLAGS. The we
15093 can use $(MAINTAINER_CFLAGS) in the INCLUDES or _CFLAGS sections
15094 of each part of the source directories we wish to check with the
15095 anal retentiveness suited for maintainers.
15097 clutter/Makefile.am | 1 +
15098 clutter/cogl/common/Makefile.am | 1 +
15099 clutter/cogl/gl/Makefile.am | 1 +
15100 clutter/cogl/gles/Makefile.am | 1 +
15101 clutter/pango/Makefile.am | 1 +
15102 configure.ac | 5 +++--
15103 tests/conform/Makefile.am | 17 +++++++++++------
15104 tests/interactive/Makefile.am | 2 +-
15105 tests/micro-bench/Makefile.am | 5 ++++-
15106 9 files changed, 24 insertions(+), 10 deletions(-)
15108 commit 20973bd29f3471942098c0354be3d583d5417672
15109 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15110 Date: Fri Jan 23 13:08:46 2009 +0000
15112 Fix compiler warnings
15114 The maintainer-flags option discovered the usual amount of
15115 collisions and compiler warnings we have to fix in order to
15116 get distcheck to pass.
15118 clutter/clutter-behaviour-depth.c | 1 -
15119 clutter/cogl/common/cogl-primitives.c | 100 ++++++------
15120 clutter/cogl/gl/cogl-texture.c | 247 ++++++++++++++++--------------
15121 tests/interactive/test-cogl-primitives.c | 2 +-
15122 tests/interactive/test-cogl-tex-tile.c | 1 +
15123 5 files changed, 182 insertions(+), 169 deletions(-)
15125 commit 792ffa1538837624fdbf06819210d923734ac217
15126 Merge: f19dd4b ac1a0d5
15127 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15128 Date: Fri Jan 23 12:10:50 2009 +0000
15130 Merge branch 'float-alpha-value'
15132 * float-alpha-value:
15133 [script] Parse easing modes by name
15134 [docs] Update the easing modes documentation
15135 [animation] Implement new easing functions
15136 [animation] Move the alpha value to floating point
15138 commit f19dd4b2b0837bfffc9c232d4006f35bc00829fe
15139 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15140 Date: Fri Jan 23 11:34:13 2009 +0000
15142 [actor] Add the ::pick signal to the Actor class
15144 Since we allow overriding the paint() implementation through the
15145 ::paint signal to change the way an actor is being painted, we
15146 should also allow overriding the pick() implementation using a
15149 clutter/clutter-actor.c | 39 ++++++++++++++++++++++++++++++++++++---
15150 1 file changed, 36 insertions(+), 3 deletions(-)
15152 commit 634cdeab1fe574d5cbf41ed48951d8bb7bc2d9b0
15153 Author: Neil Roberts <neil@linux.intel.com>
15154 Date: Thu Jan 22 17:42:26 2009 +0000
15156 Fix some failures from the fixed-to-float script in cogl-texture
15158 The script converted calls to COGL_FIXED_MUL(x,y) to (x*y). However
15159 this fails for cases like this:
15161 COGL_FIXED_MUL(a + b, c)
15167 The meaning of this is of course different because multiplication has
15168 a higher precedence than addition.
15170 This was causing breakages in cogl_texture_quad_sw when the vertex
15171 coordinates are not in increasing order. This was the case in
15172 test-backface-culling when NPOTs are not available.
15174 clutter/cogl/gl/cogl-texture.c | 20 ++++++++------------
15175 clutter/cogl/gles/cogl-texture.c | 20 ++++++++------------
15176 2 files changed, 16 insertions(+), 24 deletions(-)
15178 commit 047161ea960037275f211d851fe84744c6cf947b
15179 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15180 Date: Thu Jan 22 16:55:51 2009 +0000
15182 [gitignore] Update ignore file with the new tests
15184 .gitignore | 4 ++++
15185 1 file changed, 4 insertions(+)
15187 commit 1b242e35501e99816cece18eb8bcd29f988ca2b1
15188 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15189 Date: Thu Jan 22 16:54:49 2009 +0000
15191 [tests] Use the right value in cogl_texture_new*
15193 The correct symbol for disabling the flags when creating a new
15194 COGL texture is COGL_TEXTURE_NONE.
15196 tests/conform/test-backface-culling.c | 2 +-
15197 1 file changed, 1 insertion(+), 1 deletion(-)
15199 commit e7d533f1760390014e1d66d8e20373cd3bc2b7ff
15200 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15201 Date: Thu Jan 22 15:59:23 2009 +0000
15203 Improve accuracy of clutter_sinx()
15205 Improve clutter_sinx() by replacing the low precision CFX_SIN_STEP
15206 with a multiply/divide pair. This reduces the maximum error from
15207 1.8e-04 to 2.4e-05.
15209 http://bugzilla.openedhand.com/show_bug.cgi?id=1314
15211 Based on a patch by Owen W. Taylor <otaylor@fishsoup.net>
15213 clutter/cogl/common/cogl-fixed.c | 36 +++++++++++++++++++++++-------------
15214 1 file changed, 23 insertions(+), 13 deletions(-)
15216 commit a1e493fadb2a16ec7755c16c2a32276519a06d00
15217 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15218 Date: Thu Jan 22 15:55:43 2009 +0000
15220 Use the allocation to get the pick area
15222 Since a pick is really a paint operation, we can safely get
15223 the allocation box, instead of using get_width() and get_height().
15225 This should help cutting down the function calls. If we were
15226 feeling adventurous, we could even use the allocation directly
15227 from the private data structure.
15229 Based on a patch by Gwenole Beauchesne <gbeauchesne@splitted-desktop.org>
15231 clutter/clutter-actor.c | 13 ++++++++++---
15232 1 file changed, 10 insertions(+), 3 deletions(-)
15234 commit e1ab6f972ea7a99ec18ac685003f7e022edcc844
15235 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15236 Date: Thu Jan 22 14:52:34 2009 +0000
15238 [gles] Fix computation of camera distance
15240 Port the fix in commit f409b58e to the GLES implementation of
15243 clutter/cogl/gles/cogl.c | 21 +++++++--------------
15244 1 file changed, 7 insertions(+), 14 deletions(-)
15246 commit f409b58e89b17267fedc4121f94e906b54ea7b4c
15247 Author: Owen W. Taylor <otaylor@redhat.com>
15248 Date: Thu Jan 22 14:17:16 2009 +0000
15250 Fix computation of camera distance
15252 Compute the value of the camera distance as exactly half the xx
15253 component of the projection matrix. The heuristically derived
15254 value for 60 degrees was off by about 0.016%, causing noticeable
15255 blurring, and other field of view angles which didn't have the
15256 heuristic adjustment off by much more.
15258 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
15260 clutter/cogl/gl/cogl.c | 58 +++++++++++++++++++++++++++++++-----------------
15261 1 file changed, 38 insertions(+), 20 deletions(-)
15263 commit a74369e309f414ef812e2d741e18cd0243a6abff
15264 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15265 Date: Thu Jan 22 13:58:50 2009 +0000
15267 Avoid needlessly queue redraws for invisible actors
15269 If an actor is not set as visible, or if it is in a section of
15270 the scenegraph that it's set as not visible (e.g. one of the
15271 parents is not visible) then we should not queue a redraw for
15274 Patch based on code from Michael Boccara <michael@graphtech.co.il>
15276 clutter/clutter-actor.c | 14 +++++++++++++-
15277 1 file changed, 13 insertions(+), 1 deletion(-)
15279 commit c998462c9fc2ca9875637d78eb605929a96639e7
15280 Author: Jason Tackaberry <tack-clutter@urandom.ca>
15281 Date: Thu Jan 22 13:38:32 2009 +0000
15283 Bug 1409 - Use G_SIGNAL_RUN_LAST with ::queue-redraw signal
15285 The intention behind ::queue-redraw is to be able to block the
15286 default handler by attaching a callback and calling one of the
15287 g_signal_stop_emission variants.
15289 However this doesn't work, because ::queue-redraw has the
15290 G_SIGNAL_RUN_FIRST flag instead of G_SIGNAL_RUN_LAST.
15292 clutter/clutter-stage.c | 2 +-
15293 1 file changed, 1 insertion(+), 1 deletion(-)
15295 commit 01a5cb84302e34e784a3a41d2e78bb4934dfb7b8
15296 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15297 Date: Thu Jan 22 13:24:20 2009 +0000
15299 Fix typo in the flags update
15301 Epic en_GB keyboard FAIL.
15303 clutter/clutter-texture.c | 2 +-
15304 1 file changed, 1 insertion(+), 1 deletion(-)
15306 commit 6ca40faaec99a13f2379990f1b1b92b768a74ac7
15307 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15308 Date: Thu Jan 22 12:11:25 2009 +0000
15310 [units] Fix Units in GValue and ClutterParamSpecUnit
15312 The GValue and GParamSpec integration of ClutterUnit was still
15313 using the old, fixed-point based logic.
15315 Storing ClutterUnits in a GValue should use floating point values,
15316 and ClutterParamSpecUnit should follow suit.
15318 clutter/clutter-units.c | 55 +++++++++++++++++++++--------------------------
15319 1 file changed, 24 insertions(+), 31 deletions(-)
15321 commit 1876785d12d64c4c6efdbd96d2c54255f433c41b
15322 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15323 Date: Thu Jan 22 11:46:23 2009 +0000
15325 Fix the format for a floating point value
15327 The debug annotation was still expecting an integer after
15328 we switched the angle to float.
15330 clutter/clutter-behaviour-ellipse.c | 4 ++--
15331 1 file changed, 2 insertions(+), 2 deletions(-)
15333 commit 355555c1bf782f08e74ceb298aac7cf3d4d4973b
15334 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15335 Date: Thu Jan 22 11:37:52 2009 +0000
15337 Store the units-per-em inside the Backend
15339 Instead of recomputing the number of units needed to fit in
15340 an em each time clutter_units_em() is called, we can store this
15341 value into the default Backend along with the resolution and
15342 font name. The value should also be updated each time the
15343 resolution and font are changed, to keep it up to date.
15345 clutter/clutter-backend.c | 101 ++++++++++++++++++++++++++++++++++++++-------
15346 clutter/clutter-private.h | 2 +
15347 clutter/clutter-units.c | 31 +-------------
15348 3 files changed, 89 insertions(+), 45 deletions(-)
15350 commit c5aca39c69632d842c54d50eca3cac9f30e5dd3b
15351 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15352 Date: Wed Jan 21 22:03:31 2009 +0000
15354 [docs] Specify the coordinate space of ButtonEvent
15356 The coordinates of each ButtonEvent are relative to the stage that
15357 received the event, so we should document this in the structure
15360 It should also be mentioned that the coordinates can be transformed
15361 into actor-relative coordinates by using transform_stage_point().
15363 clutter/clutter-event.h | 14 +++++++++-----
15364 1 file changed, 9 insertions(+), 5 deletions(-)
15366 commit ee883f30d47992e5ad87d0d70d2f97f79442e8ad
15367 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15368 Date: Wed Jan 21 17:35:47 2009 +0000
15370 Add units-from-em conversion
15372 An em is a unit of measurement in typography, equal to the point
15373 size of the current font.
15375 It should be possible to convert a value expressed in em to
15376 ClutterUnits by using the current font and the current DPI as
15377 stored by the default backend.
15379 clutter/clutter-units.c | 50 ++++++++++++++++++++++++++++
15380 clutter/clutter-units.h | 11 ++++++
15381 doc/reference/clutter/clutter-sections.txt | 4 +++
15382 3 files changed, 65 insertions(+)
15384 commit 93a0454c09fafc1d45198bed5b7575ea3711a42c
15385 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15386 Date: Wed Jan 21 17:10:36 2009 +0000
15388 Remove the single-stage units converters
15390 The stage-with/height-percentage converters had been broken by
15391 the multiple-stages support of Clutter 0.8. They are also made
15392 useless by the fact that Units are now floating point values.
15394 The millimeters and typographic points converters also depended
15395 on the default stage, but they can be reworked to use the default
15396 DPI coming from the default Backend instead.
15398 clutter/clutter-actor.c | 31 ++++++++++++---
15399 clutter/clutter-units.c | 52 ++++++++++++++++++++++++++
15400 clutter/clutter-units.h | 56 +++++++++++++---------------
15401 doc/reference/clutter/clutter-sections.txt | 17 +++------
15402 4 files changed, 108 insertions(+), 48 deletions(-)
15404 commit 0be613109e5af03a37dd47348576130f028a9a8e
15405 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15406 Date: Wed Jan 21 16:41:18 2009 +0000
15408 [docs] Remove sources of warnings in API references
15410 clutter/cogl/cogl-texture.h | 2 +-
15411 clutter/cogl/cogl-vertex-buffer.h | 4 +--
15412 doc/reference/clutter/clutter-sections.txt | 18 ++--------
15413 doc/reference/cogl/cogl-docs.sgml | 2 +-
15414 doc/reference/cogl/cogl-sections.txt | 50 ++++++++++++++++++----------
15415 5 files changed, 40 insertions(+), 36 deletions(-)
15417 commit 74d00185fd73d4be20d525612c9ffdb32ca944e1
15418 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15419 Date: Wed Jan 21 10:59:19 2009 +0000
15421 [docs] Add CoglTextureFlags to the API reference
15423 doc/reference/cogl/cogl-sections.txt | 1 +
15424 1 file changed, 1 insertion(+)
15426 commit 2cb3a41dff2f3758bff7ea8d139c09dee2ea18e6
15427 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15428 Date: Wed Jan 21 10:58:32 2009 +0000
15430 [docs] Build COGL API reference first
15432 Since the Clutter API reference needs some types from COGL's,
15433 we should be building COGL's API reference first.
15435 doc/reference/Makefile.am | 2 +-
15436 1 file changed, 1 insertion(+), 1 deletion(-)
15438 commit 07689865fe3dbea4bbf013e2c7258e1a174f9596
15439 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15440 Date: Sun Jan 18 15:00:18 2009 +0000
15442 [tests] Update the tests calling cogl_texture_new_*
15444 The tests calling any of the cogl_texture_new_* family of functions
15445 must be updated to the new constructor syntax.
15447 tests/interactive/test-clip.c | 6 +++--
15448 tests/interactive/test-cogl-offscreen.c | 6 +++--
15449 tests/interactive/test-cogl-tex-convert.c | 12 ++++++---
15450 tests/interactive/test-cogl-tex-getset.c | 6 +++--
15451 tests/interactive/test-cogl-tex-polygon.c | 38 ++++++++++++++++++++---------
15452 tests/interactive/test-cogl-tex-tile.c | 3 ++-
15453 6 files changed, 49 insertions(+), 22 deletions(-)
15455 commit c9739e6aefd469cfe56b566bdba876f904109ed3
15456 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15457 Date: Sun Jan 18 14:51:19 2009 +0000
15459 Change the COGL texture constructor to use flags
15461 Boolean arguments for functions are pretty evil and usually
15462 lead to combinatorial explosion of parameters in case multiple
15463 settings are added.
15465 In the case of the COGL texture constructors we have a boolean
15466 argument for enabling the auto-mipmapping; it is conceivable that
15467 we might want to add more settings for a COGL texture without
15468 breaking API or ABI compatibility, so the boolean argument should
15471 The internals have not been changed: instead of checking for
15472 a non-zero value, we check for a bitmask being set.
15474 clutter/clutter-texture.c | 72 ++++++++++-------
15475 clutter/cogl/cogl-texture.h | 139 +++++++++++++++++---------------
15476 clutter/cogl/cogl-types.h | 15 ++++
15477 clutter/cogl/gl/cogl-texture.c | 52 ++++++------
15478 clutter/cogl/gles/cogl-texture.c | 52 ++++++------
15479 clutter/pango/cogl-pango-glyph-cache.c | 31 ++++---
15480 6 files changed, 205 insertions(+), 156 deletions(-)
15482 commit 8736db6aed2879487de5891920505268d57aa090
15483 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15484 Date: Fri Jan 16 10:58:51 2009 +0000
15486 [docs] Update ClutterMedia section
15488 The ClutterMedia API has been changed, so we need to update
15489 the API reference to reflect that.
15491 doc/reference/clutter/clutter-sections.txt | 12 ++++++------
15492 1 file changed, 6 insertions(+), 6 deletions(-)
15494 commit 5a4f9c5050521fcbb97d7f7c8897398b63f1e48e
15495 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15496 Date: Fri Jan 16 10:38:36 2009 +0000
15498 Bug 1404 - ClutterMedia issues
15500 ClutterMedia was a rough cut at a simple media API; it needs some
15501 re-evaluation before 1.0 in order to keep it simple to use, and
15502 simple to implement.
15504 - ClutterMedia:position
15506 The position property accessors collide with the corresponding
15507 ClutterActor methods, which make it impossible to bind them in
15508 high-level languages:
15510 video_texture.set_position()
15511 video_texture.get_position()
15513 In order to resolve the collision, we have to go through the
15514 GObject properties API:
15516 video_texture.set('position', value)
15517 value = video_texture.get('position')
15519 A :position in seconds is also a GStreamer-ism, and should rather
15520 be converted to a :progress property, with a normalized value
15521 between 0 and 1. the current position in seconds would then simply
15522 be progress*duration. For non-seekable streams, 0.0 would always
15523 be returned. This makes it easier to use the progress inside
15524 animations, Timelines or ClutterPath instances.
15526 - ClutterMedia:volume should be renamed to :audio-volume and normalized
15527 as well, instead of being a floating point value between 0 and 100.
15529 - ClutterMedia:buffer-percent should just be :buffer-fill and normalized
15530 between 0.0 and 1.0
15532 clutter/clutter-media.c | 409 ++++++++++++++++++++++++++---------------------
15533 clutter/clutter-media.h | 97 ++++-------
15534 2 files changed, 261 insertions(+), 245 deletions(-)
15536 commit e338245827dd81b68672955a0cc406dc43db00e5
15537 Author: Robert Bragg <robert@linux.intel.com>
15538 Date: Tue Jan 20 21:12:44 2009 +0000
15540 Renames the mesh api to the "vertex buffer api".
15542 This better reflects the fact that the api manages sets of vertex attributes,
15543 and the attributes really have no implied form. It is only when you use the
15544 attributes to draw that they become mesh like; when you specify how they should
15545 be interpreted, e.g. as triangle lists or fans etc. This rename frees up the
15546 term "mesh", which can later be applied to a concept slightly more fitting.
15547 E.g. at some point it would be nice to have a higher level abstraction that
15548 sits on top of cogl vertex buffers that adds the concept of faces. (Somthing
15549 like Blender's mesh objects.) There have also been some discussions over
15550 particle engines, and these can be defined in terms of emitter faces; so some
15551 other kind of mesh abstraction might be usefull here.
15553 clutter/cogl/cogl-mesh.h | 299 ----
15554 clutter/cogl/cogl-vertex-buffer.h | 308 ++++
15555 clutter/cogl/cogl.h.in | 2 +-
15556 clutter/cogl/common/Makefile.am | 3 +-
15557 clutter/cogl/common/cogl-mesh-private.h | 143 --
15558 clutter/cogl/common/cogl-mesh.c | 1618 ---------------------
15559 clutter/cogl/common/cogl-vertex-buffer-private.h | 142 ++
15560 clutter/cogl/common/cogl-vertex-buffer.c | 1633 ++++++++++++++++++++++
15561 clutter/cogl/gl/Makefile.am | 2 +-
15562 clutter/cogl/gl/cogl-context.c | 2 +-
15563 clutter/cogl/gl/cogl-context.h | 4 +-
15564 clutter/cogl/gles/Makefile.am | 2 +-
15565 clutter/cogl/gles/cogl-context.c | 2 +-
15566 clutter/cogl/gles/cogl-context.h | 4 +-
15567 doc/reference/cogl/cogl-docs.sgml | 2 +-
15568 doc/reference/cogl/cogl-sections.txt | 25 +-
15569 tests/conform/Makefile.am | 6 +-
15570 tests/conform/test-conform-main.c | 16 +-
15571 tests/conform/test-mesh-contiguous.c | 195 ---
15572 tests/conform/test-mesh-interleved.c | 173 ---
15573 tests/conform/test-mesh-mutability.c | 206 ---
15574 tests/conform/test-vertex-buffer-contiguous.c | 195 +++
15575 tests/conform/test-vertex-buffer-interleved.c | 173 +++
15576 tests/conform/test-vertex-buffer-mutability.c | 206 +++
15577 24 files changed, 2692 insertions(+), 2669 deletions(-)
15579 commit 4bc1e567fcb9afe146e0530eaa14e13d6af44655
15580 Author: Robert Bragg <robert@linux.intel.com>
15581 Date: Tue Jan 20 18:52:15 2009 +0000
15583 Removes the fixed-to-float scripts and patches
15585 Now that the conversion has been applied the scripts aren't needed any more
15587 fixed-to-float-patches/clutter-actor.c.0.patch | 27 -
15588 fixed-to-float-patches/clutter-alpha.c.0.patch | 306 --------
15589 fixed-to-float-patches/clutter-alpha.h.0.patch | 13 -
15590 .../clutter-behaviour-ellipse.c.0.patch | 380 ----------
15591 fixed-to-float-patches/clutter-bezier.c.0.patch | 13 -
15592 fixed-to-float-patches/clutter-fixed.c.0.patch | 15 -
15593 fixed-to-float-patches/clutter-fixed.h.0.patch | 333 ---------
15594 fixed-to-float-patches/clutter-path.c.0.patch | 18 -
15595 fixed-to-float-patches/clutter-texture.c.0.patch | 13 -
15596 fixed-to-float-patches/clutter-units.h.0.patch | 91 ---
15597 fixed-to-float-patches/cogl-fixed.c.0.patch | 17 -
15598 fixed-to-float-patches/cogl-fixed.h.0.patch | 23 -
15599 fixed-to-float-patches/cogl-pango-render.c.0.patch | 24 -
15600 fixed-to-float-patches/cogl-primitives.c.0.patch | 12 -
15601 fixed-to-float-patches/cogl.h.in.0.patch | 26 -
15602 .../gl-cogl-primitives.c.0.patch | 12 -
15603 fixed-to-float-patches/gl-cogl-texture.c.0.patch | 30 -
15604 fixed-to-float-patches/gl-cogl.c.0.patch | 172 -----
15605 .../gles-cogl-gles2-wrapper.c.0.patch | 90 ---
15606 .../gles-cogl-gles2-wrapper.h.0.patch | 76 --
15607 .../gles-cogl-primitives.c.0.patch | 12 -
15608 fixed-to-float-patches/gles-cogl-texture.c.0.patch | 30 -
15609 fixed-to-float-patches/gles-cogl.c.0.patch | 102 ---
15610 .../remove_cogl_apis_taking_fixed_params.0.patch | 735 --------------------
15611 .../test-cogl-tex-tile.c.0.patch | 24 -
15612 fixed-to-float.sh | 239 -------
15613 26 files changed, 2833 deletions(-)
15615 commit 3014d4ff8af55fd4067eac21536512cc0cf8b89d
15616 Merge: 6d4cd41 c29a3b4
15617 Author: Robert Bragg <robert@linux.intel.com>
15618 Date: Tue Jan 20 17:22:21 2009 +0000
15620 Merge branch 'cogl-float'
15622 Okey; to summarise the changes...
15624 We have converted Clutter and Cogl over to using floating point internally
15625 instead of 16.16 fixed, but we have maintained the cogl-fixed API as a
15626 utility to applications in case they want to implement their own optimizations.
15628 The Clutter API has not changed (though ClutterFixed and ClutterUnit are now
15629 internally floats) but all Cogl entry points have been changed to accept floats
15630 now instead of CoglFixed.
15632 To summarise the rationale...
15634 There have been a number of issues with using fixed point though out Clutter
15635 and Cogl including: lack of precision, lack of range, excessive format
15636 conversion (GPUs tend to work nativly with IEEE floats) and maintainability.
15637 One of the main arguments for fixed point - performance - hasn't shown
15638 itself to be serious in practice so far since we seem to be more limited
15639 by GPU performance and making improvements regarding how we submit data to
15640 OpenGL[ES]/the GPU has had a more significant impact.
15642 Ref: The recent multiple rectangle queuing changes + the
15643 cogl-texture-agressive-batching branch which show significant performance
15644 gains, and that recent tests on the ipodtouch (ARM + MBX) also showed no
15645 loss of performance running with floats.
15647 So finally; please forgive the inevitable fallout, this is a far reaching
15648 change. There are still a few known issues with the fixed to float
15649 conversion but enough works for all our conformance tests to pass, and the
15650 remaining issues hopefully wont be too tricky to solve. For reference two
15651 tags will be available either side of this change: "cogl-fixed-end" and
15654 commit ac1a0d568ed650f37fbce906eb82a969f0d41a77
15655 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15656 Date: Tue Jan 20 18:24:58 2009 +0000
15658 [script] Parse easing modes by name
15660 The easing modes for a ClutterAlpha can either be parsed by using
15661 the enumeration "nickname" (the shorthand form of the enumeration
15662 value) or by using the common naming policy used in other
15663 animation frameworks, like:
15669 clutter/clutter-script.c | 108 +++++++++++++++++++++++++++++----------
15670 tests/interactive/test-script.c | 6 +--
15671 2 files changed, 83 insertions(+), 31 deletions(-)
15673 commit 268abcd7865bb6ae10d40a92dd2eb1de79df3de8
15674 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15675 Date: Tue Jan 20 18:13:36 2009 +0000
15677 [docs] Update the easing modes documentation
15679 The ClutterAlpha API reference page should also list the
15680 easing modes Clutter provides by default, by showing the
15681 curves used by each entry in the AnimationMode enumeration.
15683 We can also remove the incomplete graph showing the old
15686 clutter/clutter-alpha.c | 5 +
15687 doc/reference/clutter/Makefile.am | 5 +-
15688 doc/reference/clutter/alpha-func.png | Bin 30651 -> 0 bytes
15689 doc/reference/clutter/clutter-sections.txt | 34 +-
15690 doc/reference/clutter/easing-modes.png | Bin 0 -> 51834 bytes
15691 doc/reference/clutter/easing-modes.svg | 920 ++++++++++++++++++++++++++++
15692 6 files changed, 934 insertions(+), 30 deletions(-)
15694 commit ec3b1a7b90314a13a9a4bed944e10f82183edcd5
15695 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15696 Date: Tue Jan 20 17:57:30 2009 +0000
15698 [animation] Implement new easing functions
15700 Instead of using our own homegrown alpha functions, we should
15701 use the easing functions also shared by other animation frameworks,
15702 like jQuery and Tween, in the interests of code portability.
15704 The easing functions have been defined by Robert Penner and
15705 are divided into three categories:
15709 Each category has a particular curve:
15719 In addition, there are "physical" curves:
15722 Back (overshooting cubic)
15723 Bounce (exponentially decaying parabolic)
15725 Finally, the Linear curve is also provided as a reference.
15727 The functions are private, and are meant to be used only
15728 through their logical id as provided by the AnimationMode
15731 The tests should be updated as well to match the new
15734 clutter/clutter-alpha.c | 561 +++++++++++++++++++++++++++++++++---
15735 clutter/clutter-types.h | 134 +++++++--
15736 tests/interactive/test-animation.c | 2 +-
15737 tests/interactive/test-easing.c | 115 +++++---
15738 4 files changed, 710 insertions(+), 102 deletions(-)
15740 commit 7d7372af43ec23d5c89c55ba57600a47bcd07471
15741 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15742 Date: Tue Jan 20 16:42:49 2009 +0000
15744 [animation] Move the alpha value to floating point
15746 The current Alpha value is an unsigned integer that can be used
15747 implicitly as a fixed point value. This makes writing an alpha
15748 function overshooting below and above the current range basically
15749 impossible without complicating an already complex code, and
15750 creating weird corner cases.
15752 For this reason, the Alpha value should be defined as a floating
15753 point normalized value, spanning a range between 0.0 and 1.0; in
15754 order to allow overshooting, the valid range is extended one unit
15755 below and one unit above, thus making it -1.0 .. 2.0.
15757 This commit updates the various users of the ClutterAlpha API
15758 and the tests cases.
15760 This commit also removes all the current alpha functions exposed
15763 clutter/clutter-alpha.c | 967 ++------------------------------
15764 clutter/clutter-alpha.h | 74 +--
15765 clutter/clutter-animation.c | 9 +-
15766 clutter/clutter-behaviour-depth.c | 6 +-
15767 clutter/clutter-behaviour-ellipse.c | 4 +-
15768 clutter/clutter-behaviour-opacity.c | 5 +-
15769 clutter/clutter-behaviour-path.c | 7 +-
15770 clutter/clutter-behaviour-rotate.c | 4 +-
15771 clutter/clutter-behaviour-scale.c | 6 +-
15772 clutter/clutter-behaviour.c | 8 +-
15773 clutter/clutter-behaviour.h | 2 +-
15774 clutter/clutter-interval.c | 2 -
15775 clutter/clutter-marshal.list | 1 +
15776 clutter/clutter-script.c | 24 +-
15777 tests/interactive/test-actors.c | 13 +-
15778 tests/interactive/test-layout.c | 2 +-
15779 tests/interactive/test-paint-wrapper.c | 12 +-
15780 tests/interactive/test-scale.c | 11 +-
15781 18 files changed, 107 insertions(+), 1050 deletions(-)
15783 commit c29a3b4deefaf9e4a71cf4cd9b582489de9d67c4
15784 Author: Robert Bragg <robert@linux.intel.com>
15785 Date: Tue Jan 20 16:20:55 2009 +0000
15787 [Automatic fixed-to-float.sh change] Hand coded changes for clutter-{fixed,units}
15789 To avoid clashing with all the scripted changes, clutter-fixed.h and
15790 clutter-units.h were manually converted to internally use floats instead of
15791 16.16 fixed numbers.
15793 Note: again no API changes were made in Clutter.
15795 clutter/clutter-fixed.h | 104 +++++++++++++----------------------------------
15796 clutter/clutter-units.h | 26 +++++-------
15797 2 files changed, 40 insertions(+), 90 deletions(-)
15799 commit a2cf7e4a19fec5edf017aef0bba972b59c62b1cf
15800 Author: Robert Bragg <robert@linux.intel.com>
15801 Date: Tue Jan 20 16:20:54 2009 +0000
15803 [Automatic fixed-to-float.sh change] Applies a number fixed to float patches
15805 To deal with all the corner cases that couldn't be scripted a number of patches
15806 were written for the remaining 10% of the effort.
15808 Note: again no API changes were made in Clutter, only in Cogl.
15810 clutter/clutter-actor.c | 53 ++++++------
15811 clutter/clutter-alpha.c | 139 ++++++++++++++++--------------
15812 clutter/clutter-alpha.h | 2 +-
15813 clutter/clutter-behaviour-ellipse.c | 144 ++++++++++++++------------------
15814 clutter/clutter-bezier.c | 2 +-
15815 clutter/clutter-fixed.c | 4 +-
15816 clutter/clutter-path.c | 4 +-
15817 clutter/clutter-texture.c | 2 +-
15818 clutter/cogl/cogl-color.h | 10 +--
15819 clutter/cogl/cogl-fixed.h | 12 +++
15820 clutter/cogl/cogl-path.h | 22 +----
15821 clutter/cogl/cogl.h.in | 50 +++--------
15822 clutter/cogl/common/cogl-color.c | 6 +-
15823 clutter/cogl/common/cogl-fixed.c | 6 ++
15824 clutter/cogl/common/cogl-primitives.c | 33 ++------
15825 clutter/cogl/gl/cogl-primitives.c | 63 +++++---------
15826 clutter/cogl/gl/cogl-texture.c | 5 +-
15827 clutter/cogl/gl/cogl.c | 113 ++++---------------------
15828 clutter/cogl/gles/cogl-gles2-wrapper.c | 45 ++--------
15829 clutter/cogl/gles/cogl-gles2-wrapper.h | 31 ++++---
15830 clutter/cogl/gles/cogl-primitives.c | 92 +++++++-------------
15831 clutter/cogl/gles/cogl-texture.c | 5 +-
15832 clutter/cogl/gles/cogl.c | 70 +++++-----------
15833 clutter/pango/cogl-pango-render.c | 8 +-
15834 doc/reference/cogl/cogl-sections.txt | 4 +-
15835 tests/conform/test-backface-culling.c | 4 +-
15836 tests/interactive/test-cogl-tex-tile.c | 10 +--
15837 27 files changed, 355 insertions(+), 584 deletions(-)
15839 commit e82f6565909e1b0da9d4effff6261b8f7312869a
15840 Author: Robert Bragg <robert@linux.intel.com>
15841 Date: Tue Jan 20 16:20:54 2009 +0000
15843 [Automatic fixed-to-float.sh change] Applies all scripted changes
15845 This is the result of running a number of sed and perl scripts over the code to
15846 do 90% of the work in converting from 16.16 fixed to single precision floating
15849 Note: A pristine cogl-fixed.c has been maintained as a standalone utility API
15850 so that applications may still take advantage of fixed point if they
15851 desire for certain optimisations where lower precision may be acceptable.
15853 Note: no API changes were made in Clutter, only in Cogl.
15855 Overview of changes:
15856 - Within clutter/* all usage of the COGL_FIXED_ macros have been changed to use
15857 the CLUTTER_FIXED_ macros.
15859 - Within cogl/* all usage of the COGL_FIXED_ macros have been completly stripped
15860 and expanded into code that works with single precision floats instead.
15862 - Uses of cogl_fixed_* have been replaced with single precision math.h
15865 - Uses of COGL_ANGLE_* and cogl_angle_* have been replaced so we use a float for
15866 angles and math.h replacements.
15868 clutter/clutter-actor.c | 180 ++++++++++----------
15869 clutter/clutter-alpha.c | 50 +++---
15870 clutter/clutter-backend.c | 4 +-
15871 clutter/clutter-behaviour-depth.c | 4 +-
15872 clutter/clutter-behaviour-ellipse.c | 74 ++++----
15873 clutter/clutter-behaviour-rotate.c | 32 ++--
15874 clutter/clutter-behaviour-scale.c | 50 +++---
15875 clutter/clutter-clone-texture.c | 16 +-
15876 clutter/clutter-color.c | 152 ++++++++---------
15877 clutter/clutter-fixed.c | 16 +-
15878 clutter/clutter-fixed.h | 70 ++++----
15879 clutter/clutter-interval.c | 2 +-
15880 clutter/clutter-stage.c | 44 ++---
15881 clutter/clutter-texture.c | 56 +++---
15882 clutter/clutter-timeline.c | 8 +-
15883 clutter/clutter-units.h | 8 +-
15884 clutter/cogl/cogl-color.h | 50 +++---
15885 clutter/cogl/cogl-path.h | 100 +++++------
15886 clutter/cogl/cogl-texture.h | 20 +--
15887 clutter/cogl/cogl-types.h | 4 +-
15888 clutter/cogl/cogl.h.in | 68 ++++----
15889 clutter/cogl/common/cogl-clip-stack.c | 46 ++---
15890 clutter/cogl/common/cogl-color.c | 40 ++---
15891 clutter/cogl/common/cogl-primitives.c | 292 ++++++++++++++++----------------
15892 clutter/cogl/common/cogl-primitives.h | 22 +--
15893 clutter/cogl/gl/cogl-context.h | 8 +-
15894 clutter/cogl/gl/cogl-primitives.c | 44 ++---
15895 clutter/cogl/gl/cogl-texture.c | 226 ++++++++++++------------
15896 clutter/cogl/gl/cogl.c | 290 +++++++++++++++----------------
15897 clutter/cogl/gles/cogl-context.c | 2 +-
15898 clutter/cogl/gles/cogl-context.h | 10 +-
15899 clutter/cogl/gles/cogl-fbo.c | 12 +-
15900 clutter/cogl/gles/cogl-gles2-wrapper.c | 126 +++++++-------
15901 clutter/cogl/gles/cogl-gles2-wrapper.h | 54 +++---
15902 clutter/cogl/gles/cogl-primitives.c | 70 ++++----
15903 clutter/cogl/gles/cogl-texture.c | 240 +++++++++++++-------------
15904 clutter/cogl/gles/cogl.c | 256 ++++++++++++++--------------
15905 clutter/pango/cogl-pango-glyph-cache.c | 8 +-
15906 clutter/pango/cogl-pango-glyph-cache.h | 8 +-
15907 clutter/pango/cogl-pango-render.c | 70 ++++----
15908 tests/conform/test-backface-culling.c | 38 ++---
15909 tests/interactive/test-cogl-tex-tile.c | 8 +-
15910 tests/interactive/test-text-field.c | 2 +-
15911 43 files changed, 1437 insertions(+), 1443 deletions(-)
15913 commit abc2a359ea5981989ec7c3c793e4bb5b7c5b5d55
15914 Author: Robert Bragg <robert@linux.intel.com>
15915 Date: Tue Jan 20 14:52:47 2009 +0000
15917 Improves the git commit messages used by fixed-to-float.sh
15919 In preperation for commiting a final conversion into master
15921 fixed-to-float.sh | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
15922 1 file changed, 47 insertions(+), 3 deletions(-)
15924 commit 8b39bfec7fb3f188a8482e44f9a9c26da19e24a6
15925 Author: Robert Bragg <robert@linux.intel.com>
15926 Date: Mon Jan 19 19:11:00 2009 +0000
15928 Improves the unit test to verify more awkward scaling and some corresponding fixes
15930 This simplifies the mucking about with the model-view matrix that was previously
15931 done which improves its efficiency when scaling is necessary.
15933 Notably: There should now be no performance advantage to using
15934 ClutterCloneTexture as a special case clone actor since this method is just as
15937 The unit test was renamed to test-actor-clone.
15939 clutter/clutter-actor-clone.c | 41 +----
15940 tests/interactive/Makefile.am | 2 +-
15941 tests/interactive/test-actor-clone.c | 272 ++++++++++++++++++++++++++++++++++
15942 tests/interactive/test-actors2.c | 269 ---------------------------------
15943 4 files changed, 277 insertions(+), 307 deletions(-)
15945 commit df7480090da28e91df240dbba365e7b4f9e675a6
15946 Author: Robert Bragg <robert@linux.intel.com>
15947 Date: Sat Jan 17 16:51:03 2009 +0000
15949 Implements a generic ClutterActorClone that doesn't need fbos.
15951 Many use cases for clonning an actor don't require running a shader on the
15952 resulting clone image and so requiring FBOs in these cases is overkill and
15953 in-efficient as it requires kicking and synchronizing a render for each clone.
15955 This approach basically just uses the paint function of another actor to
15956 implement the painting for the clone actor with some fiddling of the model-
15957 view matrix to scale according to the different allocation box sizes of
15958 each of the actors.
15960 A simple unit test called test-actors2 was added for testing.
15962 clutter/Makefile.am | 2 +
15963 clutter/clutter-actor-clone.c | 307 ++++++++++++++++++++++++++++++++++++++
15964 clutter/clutter-actor-clone.h | 76 ++++++++++
15965 clutter/clutter-actor.c | 37 ++++-
15966 clutter/clutter-private.h | 6 +
15967 clutter/clutter.h | 1 +
15968 tests/interactive/Makefile.am | 1 +
15969 tests/interactive/test-actors2.c | 269 +++++++++++++++++++++++++++++++++
15970 8 files changed, 697 insertions(+), 2 deletions(-)
15972 commit 6d4cd416ec3155db0778246099a431331149edd2
15973 Author: Owen W. Taylor <otaylor@fishsoup.net>
15974 Date: Sat Jan 10 19:25:27 2009 -0500
15976 Change default tile-waste from 64 to 63
15978 It's more sensible to use 2^n-1 for a max tile-waste value rather
15979 than 2^n, so change the value default from 64 to 63. Example:
15980 191 and 192 will both be sliced to 128+64 rather than having
15981 191=>128+64, 192=>256.
15983 http://bugzilla.openedhand.com/show_bug.cgi?id=1402
15985 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
15987 clutter/clutter-texture.c | 4 ++--
15988 1 file changed, 2 insertions(+), 2 deletions(-)
15990 commit b716d32000cfc309dd7c52a1ee6aad3cea398ec6
15991 Author: Owen W. Taylor <otaylor@fishsoup.net>
15992 Date: Fri Jan 16 18:01:04 2009 -0500
15994 Fix properties that have X11 types to be 'long'
15996 While X11 Pixmap and Window types only have 32-bits of data, they
15997 are actually 'unsigned long'. Change the "window" and "pixmap"
15998 property of ClutterX11TexturePixmaps to be ulong.
16000 This fixes 64-bit bugs where ClutterGLXTexturePixmap passed a
16001 reference to Pixmap to g_object_get("pixmap", &pixmap, ...);
16003 http://bugzilla.openedhand.com/show_bug.cgi?id=1405
16005 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
16007 clutter/x11/clutter-x11-texture-pixmap.c | 28 ++++++++++++++--------------
16008 1 file changed, 14 insertions(+), 14 deletions(-)
16010 commit 10f1f6587ef944633216c1e73fe7c032d4958c96
16011 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16012 Date: Fri Jan 16 22:13:44 2009 +0000
16014 [eglnative] Set the SYNC_MATRICES on stage realization
16016 Since the stage in the EGL native backend only has one size, and it
16017 is determined at realization, we can simply set the SYNC_MATRICES
16018 private flag and let _clutter_stage_maybe_setup_viewport() set up
16019 the GL viewport at the first redraw.
16021 clutter/eglnative/clutter-stage-egl.c | 6 ++++++
16022 1 file changed, 6 insertions(+)
16024 commit ae3615cfe3efa8c36fdfcfe1b00c1cedac785829
16025 Author: Neil Roberts <neil@linux.intel.com>
16026 Date: Fri Jan 16 18:29:29 2009 +0000
16028 [fixed-to-float.sh] Apply the automatic changes to the tests as well
16030 Some of the tests are using the Cogl API so they should be updated to
16033 The patches have been updated to apply cleanly.
16035 .../remove_cogl_apis_taking_fixed_params.0.patch | 25 ++++++++++----------
16036 .../test-cogl-tex-tile.c.0.patch | 25 ++++++--------------
16037 fixed-to-float.sh | 23 ++++++++++--------
16038 3 files changed, 32 insertions(+), 41 deletions(-)
16040 commit 7a96ea925515916f946147fd0fee5fcac7fe6c36
16041 Author: Neil Roberts <neil@linux.intel.com>
16042 Date: Fri Jan 16 17:52:26 2009 +0000
16044 [fixed-to-float.sh] Group some of the sed expressions into one command
16046 This has no effect other than to make the script run faster.
16048 fixed-to-float.sh | 121 +++++++++++++++++++++++++++++------------------------
16049 1 file changed, 66 insertions(+), 55 deletions(-)
16051 commit e02024151b2529a624a92880c51f1002fcc861cc
16052 Author: Neil Roberts <neil@linux.intel.com>
16053 Date: Fri Jan 16 14:55:48 2009 +0000
16055 [fixed-to-float-patches] Replace the cogl_color_*x functions with *f
16057 cogl_set_source_color4x and cogl_color_set_from_4x actually take float
16058 values now so they are renamed to *4f.
16060 .../remove_cogl_apis_taking_fixed_params.0.patch | 123 ++++++++++++++++++++
16061 1 file changed, 123 insertions(+)
16063 commit 7c93565902be0af99526c8c1a1ab068e0892444e
16064 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16065 Date: Fri Jan 16 14:53:42 2009 +0000
16067 [docs] Clarify what API registers a global alpha function
16069 Both clutter_alpha_new_with_func() and clutter_alpha_set_func()
16070 will not register a global alpha function, so we need to update
16071 the documentation to explicitly say so.
16073 clutter/clutter-alpha.c | 13 +++++++++----
16074 1 file changed, 9 insertions(+), 4 deletions(-)
16076 commit 7b93cc068db5bfeba999e633a2b23b3b4c494bd5
16077 Author: Neil Roberts <neil@linux.intel.com>
16078 Date: Fri Jan 16 13:56:42 2009 +0000
16080 [fixed-to-float-patches] Merge the two patches to remove cogl fixed params
16082 The two patches for removing cogl apis taking fixed params have been
16083 merged into one patch.
16085 .../remove_cogl_apis_taking_fixed_params.0.patch | 50 +++++++++++++++++--
16086 .../remove_cogl_apis_taking_fixed_params.1.patch | 52 --------------------
16087 fixed-to-float.sh | 1 -
16088 3 files changed, 47 insertions(+), 56 deletions(-)
16090 commit c096f41e70a78f7eeccafeb5bd01b9b7a5732b15
16091 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16092 Date: Fri Jan 16 14:16:02 2009 +0000
16094 [doc] Clarify the animation mode meaning
16096 The animation mode parameters and properties are now slightly
16097 anonymous unsigned longs, so we need to clarify in the documentation
16098 that the user should either pass a ClutterAnimationMode value or
16099 the result of registering an alpha function.
16101 clutter/clutter-animation.c | 10 ++++++++--
16102 1 file changed, 8 insertions(+), 2 deletions(-)
16104 commit d02819949d5f16173179a3cd3ff59616726fa2b9
16105 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16106 Date: Fri Jan 16 14:01:46 2009 +0000
16108 Remove AnimationMode from the Animation API
16110 The animation mode symbolic id might come from the AnimationMode
16111 enumeration or from the clutter_alpha_register_*() family of
16112 functions. For this reason, we should use a gulong instead of
16113 ClutterAnimationMode whenever we have an "animation mode" parameter
16116 clutter/clutter-animation.c | 52 ++++++++++++++++++++++---------------------
16117 clutter/clutter-animation.h | 8 +++----
16118 2 files changed, 31 insertions(+), 29 deletions(-)
16120 commit 74213e0ee35e8428783deaccab68dc9f9c8d72bb
16121 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16122 Date: Fri Jan 16 13:42:06 2009 +0000
16124 [alpha] Allow registering alpha functions
16126 In order to unify alpha functions and animation modes in ClutterAlpha
16127 we should be able to register alpha functions and get a logical id
16128 for them; the logical id will then be available to be used by
16129 clutter_alpha_set_mode().
16131 The registration requires API changes in ClutterAlpha constructors
16132 and methods. It also provides the chance to shift ClutterAlpha
16133 towards the use of animations modes only, and to alpha functions
16134 as a convenience API for language bindings alone.
16136 clutter/clutter-alpha.c | 254 +++++++++++++++++++++-------
16137 clutter/clutter-alpha.h | 47 ++---
16138 clutter/clutter-types.h | 5 +-
16139 doc/reference/clutter/clutter-sections.txt | 6 +-
16140 tests/interactive/test-actors.c | 3 +-
16141 tests/interactive/test-behave.c | 3 +-
16142 tests/interactive/test-depth.c | 32 ++--
16143 tests/interactive/test-layout.c | 7 +-
16144 tests/interactive/test-multistage.c | 3 +-
16145 tests/interactive/test-paint-wrapper.c | 2 +-
16146 tests/interactive/test-rotate.c | 3 +-
16147 tests/interactive/test-scale.c | 6 +-
16148 tests/interactive/test-texture-quality.c | 3 +-
16149 tests/interactive/test-threads.c | 9 +-
16150 tests/interactive/test-viewport.c | 3 +-
16151 15 files changed, 264 insertions(+), 122 deletions(-)
16153 commit 18378fe180d2bf64631efa9a6ce99e4d770b793d
16154 Author: Neil Roberts <neil@linux.intel.com>
16155 Date: Fri Jan 16 12:16:28 2009 +0000
16157 [fixed-to-float.sh] Use float names for the GLES2 wrappers
16159 For example cogl_wrap_glFrustumx -> cogl_wrap_glFrustumf.
16161 The wrappers get #defined to the float versions anyway but it helps
16162 avoid some confusion.
16164 The conversion is done using a regular expression in the upgrade
16165 script. Some of the patches had to be updated to apply cleanly.
16167 .../gles-cogl-gles2-wrapper.c.0.patch | 2 +-
16168 .../gles-cogl-gles2-wrapper.h.0.patch | 52 ++++++++++----------
16169 fixed-to-float-patches/gles-cogl.c.0.patch | 15 ++----
16170 .../remove_cogl_apis_taking_fixed_params.0.patch | 10 ++--
16171 fixed-to-float.sh | 7 +++
16172 5 files changed, 42 insertions(+), 44 deletions(-)
16174 commit 52d7b7be7366faa74a1ba5f8756a77a90019eaa3
16175 Author: Neil Roberts <neil@linux.intel.com>
16176 Date: Fri Jan 16 10:50:53 2009 +0000
16178 [fixed-to-float-patches] Move the changes to gles2-wrapper.h into the patch
16180 It looks like the changes to cogl-gles2-wrapper.h were accidentally
16181 committed to the actual file instead of the patch in commit
16182 de27da0e. This commit moves the changes back into the patch so
16183 cogl-gles2-wrapper.h is reverted back to master.
16185 clutter/cogl/gles/cogl-gles2-wrapper.h | 24 +++++------
16186 .../gles-cogl-gles2-wrapper.h.0.patch | 43 ++++++++++++++++----
16187 2 files changed, 47 insertions(+), 20 deletions(-)
16189 commit bef099ce40b926367f4f2ab099e3022c2809b881
16190 Author: Neil Roberts <neil@linux.intel.com>
16191 Date: Thu Jan 15 18:53:52 2009 +0000
16193 [fixed-to-float-patches] Fix use of glClearColor and glColor under GLES 2
16195 The wrapper for glClearColor was taking fixed arguments but was given
16196 floating point values so it ended up always setting the clear color to
16197 black. Now that GLES 1.1 is using the floating point version, there is
16198 no need for the wrapper so both versions now just use glClearColor
16201 A similar problem was happening for glColor but this does still need a
16202 wrapper because it needs to set the vertex attribute.
16204 .../gles-cogl-gles2-wrapper.c.0.patch | 38 ++++++++++++++++++--
16205 .../gles-cogl-gles2-wrapper.h.0.patch | 35 +++++++++++++++---
16206 fixed-to-float-patches/gles-cogl.c.0.patch | 26 +++++++++++++-
16207 3 files changed, 91 insertions(+), 8 deletions(-)
16209 commit 4e94500a2abffd867c7118bf4a11ae877d852499
16210 Merge: d89ed3e 9339334
16211 Author: Neil Roberts <neil@linux.intel.com>
16212 Date: Thu Jan 15 16:38:49 2009 +0000
16214 Merge branch 'master' into cogl-float
16216 The patches have been updated to apply cleanly.
16218 The patches for the g_warnings in clutter-actor.c have been removed
16219 because master now uses CLUTTER_UNITS_FORMAT so they aren't
16220 necessary. The clutter-units.h patch now sets CLUTTER_UNITS_FORMAT to
16223 commit 9339334a4370bb8d57ce0aff0bf46ef205f93f21
16224 Author: Neil Roberts <neil@linux.intel.com>
16225 Date: Thu Jan 15 18:09:54 2009 +0000
16227 Fix GLES backends after merging the async-textures branch
16229 The changes from the GL version of cogl-texture.c have been mirrored
16230 in the GLES version. This adds the cogl_texture_new_from_bitmap
16231 function and fixes the build errors.
16233 clutter/cogl/gles/cogl-texture.c | 52 ++++++++++++++++++++++----------------
16234 1 file changed, 30 insertions(+), 22 deletions(-)
16236 commit d89ed3ed25f0cd04731ca57110519f58d130b750
16237 Author: Neil Roberts <neil@linux.intel.com>
16238 Date: Thu Jan 15 16:35:46 2009 +0000
16240 [fixed-to-float.sh] Remove the mtx_transform patch from the script
16242 The patch got deleted and merged into the clutter-actor.c patch in
16243 commit 012b16 so it was just causing unnecessary errors.
16245 fixed-to-float.sh | 1 -
16246 1 file changed, 1 deletion(-)
16248 commit ea1d9f55227fc2e291fc600accef5ba3abbdd58f
16249 Author: Neil Roberts <neil@linux.intel.com>
16250 Date: Thu Jan 15 15:24:05 2009 +0000
16252 [fixed-to-float-patches] Fix some of the matrix getters and setters
16254 The GL versions of get_modelview_matrix, get_projection_matrix and
16255 get_viewport were using glGetDoublev and then converting them to
16256 floats, but it might as well just call glGetFloatv directly.
16258 The GL ES versions were using glGetFixedv but this was being replaced
16259 with glGetFloatv by the #define in the GLES 2 wrappers.
16261 The patch also replaces the glGetFixedv wrapper with
16262 glGetFloatv. Previously this was calling
16263 cogl_gles2_float_array_to_fixed which actually converted to
16264 float. That function has been removed and memcpy is used instead.
16266 fixed-to-float-patches/gl-cogl.c.0.patch | 79 +++++++++++++++++++-
16267 .../gles-cogl-gles2-wrapper.c.0.patch | 58 ++++++++++++++
16268 .../gles-cogl-gles2-wrapper.h.0.patch | 13 +++-
16269 fixed-to-float-patches/gles-cogl.c.0.patch | 29 ++++++-
16270 fixed-to-float.sh | 1 +
16271 5 files changed, 176 insertions(+), 4 deletions(-)
16273 commit 642617b7a0d74c346206b673729288d7c5454a8e
16274 Author: Robert Bragg <robert@linux.intel.com>
16275 Date: Thu Jan 15 13:58:31 2009 +0000
16277 [test-text] queue redraws instead of calling clutter_actor_paint directly
16279 Directly calling clutter_actor_paint skips out quite a bit code such as the
16280 backend swap buffer call.
16282 Since we are interested in the highest fps possible, and it now goes through
16283 to the backend swap buffer call we now do a setenv (CLUTTER_VBLANK, none, 0)
16284 before calling clutter_init.
16286 tests/micro-bench/test-text.c | 27 ++++++++++++++++++++-------
16287 1 file changed, 20 insertions(+), 7 deletions(-)
16289 commit 22183c7a8f092f0792c6f805d4b313651c999730
16290 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16291 Date: Wed Jan 14 18:14:46 2009 +0000
16293 Bug 1380 - Return booleans from CLUTTER_ACTOR_IS_* macros
16295 If you try to use the CLUTTER_ACTOR_IS_* macros defined in ClutterActor
16298 typedef struct { unsigned int reactive : 1; } foo_t;
16300 foo_t f; f.reactive = CLUTTER_ACTOR_IS_REACTIVE (actor);
16302 It will blow up because while the macros evaluate to 0 they can also
16303 evaluate to non-zero values. Since most of the boolean flags in
16304 Clutter and Clutter-based code are going to be stored like in the
16305 example above, we should change the macros and let them evaluate
16306 stricly either to 0 or to 1.
16308 clutter/clutter-actor.h | 6 +++---
16309 1 file changed, 3 insertions(+), 3 deletions(-)
16311 commit 41386a5f72b389956c363fa06669f6d554d73b53
16312 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16313 Date: Wed Jan 7 18:30:46 2009 +0000
16315 Remove the Effects API
16317 The Effects API and all related symbols have been superceded by
16318 the newly added Animation API and clutter_actor_animate().
16320 This commit removes the Effects implementation, the documentation
16321 and the interactive test/example code.
16323 clutter/Makefile.am | 2 -
16324 clutter/clutter-effect.c | 848 ----------------------------
16325 clutter/clutter-effect.h | 162 ------
16326 clutter/clutter.h | 1 -
16327 doc/reference/clutter/clutter-sections.txt | 33 --
16328 tests/interactive/Makefile.am | 1 -
16329 tests/interactive/test-effects.c | 95 ----
16330 7 files changed, 1142 deletions(-)
16332 commit 5d346cca5705c5c3fc21444b8c9c758f55b0bc67
16333 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16334 Date: Wed Jan 14 15:30:10 2009 +0000
16336 Emit ::load-finished for every texture load
16338 The ::load-finished signal is emitted only when loading a texture
16339 using clutter_texture_set_from_file(). Since this breaks user
16340 expectations and consistency, we should also emit ::load-finished
16341 when loading a texture from image data.
16343 clutter/clutter-texture.c | 2 ++
16344 1 file changed, 2 insertions(+)
16346 commit 3e9e5a11da12e9b8e8cfbace8146e3b86231c5c9
16347 Author: Robert Bragg <robert@linux.intel.com>
16348 Date: Wed Jan 14 15:18:05 2009 +0000
16350 [test-depth] cast width to gint when calculating -width/2
16352 It was a fluke that this worked out due to how clutter_actor_set_depth
16353 internally converts the incorrect integer result to fixed point.
16355 tests/interactive/test-depth.c | 6 +++---
16356 1 file changed, 3 insertions(+), 3 deletions(-)
16358 commit f1b15efcdc6ac2efd15d2946c93a1cb2a3a5b063
16359 Author: Robert Bragg <robert@linux.intel.com>
16360 Date: Thu Jan 8 18:54:48 2009 +0000
16362 [tests] Adds a flowery clutter_cairo_texture unit test
16364 This is simply a copy of flowers.c from the old clutter-cairo repo
16366 tests/interactive/Makefile.am | 3 +-
16367 tests/interactive/test-clutter-cairo-flowers.c | 212 ++++++++++++++++++++++++
16368 2 files changed, 214 insertions(+), 1 deletion(-)
16370 commit 110489ee5838eccb216dcd9d81f23e3f3d6e0d83
16371 Merge: d454bfc e730cd7
16372 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16373 Date: Wed Jan 14 15:16:41 2009 +0000
16375 Merge branch 'async-textures'
16378 Whitespace fixes in ClutterTexture
16379 [async-loading] Do not force the texture size on async load
16380 [async-loading] Update asynchronous image loading
16381 Add API for extracting image size from a file
16382 Update/clean and apply the async-texture patch from bug #1144
16384 commit d454bfcc87e594eeee601755f53b1315fc2da093
16385 Author: Neil Roberts <neil@linux.intel.com>
16386 Date: Wed Jan 14 13:37:31 2009 +0000
16388 [ClutterStageX11] Remove the handling_configure flag
16390 Since Clutter changed to using a layout scheme the handling_configure
16391 flag no longer works because the allocate method is not invoked
16392 immediately during the call to set_size from the ConfigureNotify
16393 handler. However it is also no longer neccessary because the resizes
16394 are effectively batched up until a relayout is run so it won't cause
16395 an infinite loop of resize and notify events anyway.
16397 clutter/x11/clutter-event-x11.c | 8 --------
16398 clutter/x11/clutter-stage-x11.c | 16 +---------------
16399 clutter/x11/clutter-stage-x11.h | 1 -
16400 3 files changed, 1 insertion(+), 24 deletions(-)
16402 commit 1cac3d91f9fc84bd11636f19ac220158490c531f
16403 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16404 Date: Wed Jan 14 15:05:03 2009 +0000
16408 Append the newly added ClutterBindingPool symbols and
16409 clutter_stage_ensure_viewport() to the API reference.
16411 doc/reference/clutter/clutter-sections.txt | 9 +++++++++
16412 1 file changed, 9 insertions(+)
16414 commit df62a037b00ca24deceb74d3ea0d26bdc94c4194
16415 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16416 Date: Wed Jan 14 15:04:28 2009 +0000
16418 Fix compile warning for a possible uninitialized variable
16420 clutter/glx/clutter-glx-texture-pixmap.c | 2 +-
16421 1 file changed, 1 insertion(+), 1 deletion(-)
16423 commit 0e1bbcdc02a751f6024d4da9db3b4afba51dfa4d
16424 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16425 Date: Wed Jan 14 15:03:30 2009 +0000
16427 Add declaration of clutter_binding_pool_get_type()
16429 The function is automagically created by G_DEFINE_TYPE(), but
16430 it should also be declared in the header.
16432 clutter/clutter-binding-pool.h | 2 ++
16433 1 file changed, 2 insertions(+)
16435 commit a074106ded87717b7983976fbd91365105411f5b
16436 Merge: c83d955 db3d2e9
16437 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16438 Date: Wed Jan 14 15:00:44 2009 +0000
16440 Merge branch 'animation-improvements'
16442 * animation-improvements:
16443 [docs] Add ClutterAnimatable to the API reference
16444 Add license notice to ClutterAnimation files
16445 [docs] Update the ClutterAnimation section
16446 [animation] Extend ClutterAnimation support to all objects
16447 [animation] Use ClutterAnimatable inside Animation
16448 [animation] Add ClutterAnimatable
16449 [animation] Allow registering custom progress function
16450 [animation] Interval::compute_value should return a boolean
16451 Animate ClutterColor properties
16453 commit c83d955af3848d75555a917ece0b7da6cd71d945
16454 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16455 Date: Wed Jan 14 14:34:35 2009 +0000
16457 Fix compilation warning
16459 Declare the width and height variables as unsigned ints, in order
16460 to match the required arguments for clutter_actor_get_size().
16462 tests/interactive/test-depth.c | 2 +-
16463 1 file changed, 1 insertion(+), 1 deletion(-)
16465 commit ffc15e0962a0b24afce1ff08eab13537fe23eadc
16466 Author: Neil Roberts <neil@linux.intel.com>
16467 Date: Wed Jan 14 11:12:02 2009 +0000
16469 [clutter-text] Fix x-position of cursor when moving up or down
16471 ClutterText already has code to try to preserve the x position when
16472 moving up or down. A target x-position is stored and the cursor is
16473 positioned at the nearest point to that in the appropriate line when
16474 up or down is pressed. However the target position was never cleared
16475 so it would always target the x-position of the cursor from the first
16476 time you pressed up or down.
16478 To fix this the patch clears the target position in set_position and
16479 then sets it after the call in real_move_up/down. That way pressing
16480 up or down sets the target position and any other movement will clear
16483 To get an index for the pixel position in the line
16484 pango_layout_line_x_to_index is used. However when x is greater than
16485 the length of the line then the index before the last grapheme is
16486 returned which was causing it to jump to the penultimate
16487 character. The patch makes it add on the trailing value so that it
16488 will jump to the last character.
16490 clutter/clutter-text.c | 28 ++++++++++++++++++----------
16491 1 file changed, 18 insertions(+), 10 deletions(-)
16493 commit b57c7e12d43e7891ef3125dc03e396c5a24281aa
16494 Author: Neil Roberts <neil@linux.intel.com>
16495 Date: Tue Jan 13 18:42:50 2009 +0000
16497 [clutter-text] Fix offset_to_bytes to work when pos == 0
16499 The old function ended up returning the length of the string when pos
16500 was zero. This caused it to insert characters at the end when the
16501 cursor was at the beginning of the string.
16503 clutter/clutter-text.c | 25 +++++--------------------
16504 1 file changed, 5 insertions(+), 20 deletions(-)
16506 commit e93c266647e0d828459911a0999f342a975158b6
16507 Author: Neil Roberts <neil@linux.intel.com>
16508 Date: Tue Jan 13 17:52:38 2009 +0000
16510 [clutter-text] Don't allow control characters to be inserted
16512 If an unbound control key is pressed (such as Ctrl+R) it would insert
16513 a rectangle into the text.
16515 Also zero is considered a valid unicode character by
16516 g_unichar_validate so pressing a key such as shift would cause the
16517 current selection to be deleted. The character isn't actually inserted
16518 because insert_unichar disallows zeroes.
16520 clutter/clutter-text.c | 4 +++-
16521 1 file changed, 3 insertions(+), 1 deletion(-)
16523 commit de114dead76af8e8cccf872dd87aeee838e9e7e8
16524 Author: Neil Roberts <neil@linux.intel.com>
16525 Date: Thu Nov 27 16:44:39 2008 +0000
16527 Fix GLES 2 after the multiple-texture-rectangle branch merge
16529 The GLES 2 wrapper needs to set up some state before each
16530 draw. Previously this was acheived by wrapping glDrawArrays. Since the
16531 multiple-texture-rectangle branch merge, glDrawElements is used
16532 instead so we also need a wrapper for that.
16534 It was also directly calling glBindTexture. GLES 2 uses a wrapper for
16535 this function so that it can cope with GL_ALPHA format textures. The
16536 format of the current texture needs to be stored as well as the target
16537 and object number for this to work.
16539 clutter/cogl/gles/cogl-context.h | 1 +
16540 clutter/cogl/gles/cogl-gles2-wrapper.c | 20 ++++++++++++++++++--
16541 clutter/cogl/gles/cogl-gles2-wrapper.h | 4 +++-
16542 clutter/cogl/gles/cogl-texture.c | 7 ++++++-
16543 4 files changed, 28 insertions(+), 4 deletions(-)
16545 commit 453697fcad0cb8e91c23b3ccebf07ed8ca10591d
16546 Author: Neil Roberts <neil@linux.intel.com>
16547 Date: Mon Jan 12 18:32:49 2009 +0000
16549 Update gtk-doc 'Since' field for cogl_texture_multiple_rectangles
16551 The function has been backported to the 0.8 branch so it will also be
16552 available in Clutter 0.8.6
16554 clutter/cogl/cogl-texture.h | 2 +-
16555 1 file changed, 1 insertion(+), 1 deletion(-)
16557 commit ccd9ba2a02cf8f06f002669ffd2ffe2d0af161ea
16558 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16559 Date: Tue Jan 13 14:05:35 2009 +0000
16561 [gitignore] Update the ignore file
16563 .gitignore | 15 +++++++++++++++
16564 1 file changed, 15 insertions(+)
16566 commit 616c082a7cc6cf9a46de09f2f04ed87a57162e9c
16567 Merge: 12ea293 be462b2
16568 Author: Robert Bragg <robert@linux.intel.com>
16569 Date: Tue Jan 13 13:37:38 2009 +0000
16571 Merge commit 'origin/master' into cogl-material
16575 clutter/clutter-texture.c
16576 clutter/cogl/cogl-texture.h
16577 clutter/cogl/gles/cogl-context.c
16578 clutter/cogl/gles/cogl-context.h
16580 commit a9ae1c65c3fbe78d197dc202cedf3f77affb72ff
16581 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16582 Date: Tue Jan 13 12:51:03 2009 +0000
16584 Add ClutterBindingPool:name
16586 The BindingPool constructor should only check for duplicate pools
16587 and then set the :name constructor-only property. If a BindingPool
16588 is created without a name we also make a fuss about it.
16590 It is also possible to simply dispose of a binding pool using
16591 g_object_unref(), as long as it has been created by using
16592 clutter_binding_pool_new() or directly with g_object_new(). Only
16593 BindingPools attached to a class are not owned by the user.
16595 clutter/clutter-binding-pool.c | 96 +++++++++++++++++++++++++++++++++++-----
16596 1 file changed, 86 insertions(+), 10 deletions(-)
16598 commit 66afd41868a702555c917122a38dfd87db91cf7a
16599 Author: Robert Bragg <robert@linux.intel.com>
16600 Date: Tue Jan 13 11:38:55 2009 +0000
16602 Remove cogl_blahx Cogl interfaces that used to take CoglFixed parameters.
16604 Since they are no longer actually taking fixed point parameters the 'x' suffix is
16605 no longer appropriate. To maintain support for sub-pixel precision the
16606 corresponding interfaces that were taking integer parameters now get patched
16607 to take float parameters instead.
16609 .../remove_cogl_apis_taking_fixed_params.0.patch | 569 ++++++++++++++++++++
16610 .../remove_cogl_apis_taking_fixed_params.1.patch | 52 ++
16611 fixed-to-float.sh | 8 +-
16612 3 files changed, 628 insertions(+), 1 deletion(-)
16614 commit a4c8a70c834b5b4fdfd1618ce496425dd5dbcd68
16615 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16616 Date: Tue Jan 13 12:34:59 2009 +0000
16618 Turn ClutterBindingPool a GObject
16620 ClutterBindingPool is already "problematic" in terms of memory
16621 management for language bindings and gobject-introspection. It
16622 also lacks a GType.
16624 Turning ClutterBindingPool into a GBoxed would not make much
16625 sense, since it does not adhere to the copy/free semantics. It
16626 could be referenced/unreferenced, but in that case we can just
16627 as well use GObject as a base class instead of reimplemeting
16628 a ref-counted object and then boxing it.
16630 ClutterBindingPool is obviously a terminal class, so we just
16631 hide the instance and class structures.
16633 clutter/clutter-binding-pool.c | 62 ++++++++++++++++++++++++++++------------
16634 clutter/clutter-binding-pool.h | 12 ++++++++
16635 2 files changed, 55 insertions(+), 19 deletions(-)
16637 commit b60c2a2df6b3cb386f6e2954e515db7c9a22a4d1
16638 Author: Robert Bragg <robert@linux.intel.com>
16639 Date: Mon Jan 12 18:15:40 2009 +0000
16641 [gl/cogl.c] Updates the cogl_rotatex prototype to take float x,y,z params
16643 I missed this in my last commit; it just updates the prototype in gl/cogl.c
16644 in line with the change made in cogl.h.in
16646 fixed-to-float-patches/gl-cogl.c | 92 -----------------------------
16647 fixed-to-float-patches/gl-cogl.c.0.patch | 95 ++++++++++++++++++++++++++++++
16648 2 files changed, 95 insertions(+), 92 deletions(-)
16650 commit 010fd71059c073a95d41b023be67000d1dfc1a4c
16651 Author: Robert Bragg <robert@linux.intel.com>
16652 Date: Mon Jan 12 17:07:55 2009 +0000
16654 [cogl.h.in.0.patch] Fixes the cogl_rotatex prototype to take float x,y,z params
16656 The cogl_rotatex was incorrectly defined to take gint x,y,z params as opposed
16657 to CoglFixed. This patch changes them directly to floats.
16659 fixed-to-float-patches/cogl.h.in.0.patch | 26 ++++++++++++++++++++++++++
16660 fixed-to-float.sh | 1 +
16661 2 files changed, 27 insertions(+)
16663 commit de27da0e5be8a27a0743fd9b62e2da04ed91dc82
16664 Author: Robert Bragg <robert@linux.intel.com>
16665 Date: Thu Jan 8 22:56:17 2009 +0000
16667 [cogl/gles] Fixes for building for GLES 1 using floats
16669 * This adds GLfixed -> GLfloat conversion
16670 * redefines cogl_wrap_glBlahx macros as glBlahf
16671 * Other misc fixes (mostly corresponding to cogl/gl equivalents)
16673 clutter/cogl/gles/cogl-gles2-wrapper.h | 24 ++++----
16674 .../gles-cogl-gles2-wrapper.h.0.patch | 13 +++++
16675 .../gles-cogl-primitives.c.0.patch | 12 ++++
16676 fixed-to-float-patches/gles-cogl-texture.c.0.patch | 30 ++++++++++
16677 fixed-to-float-patches/gles-cogl.c.0.patch | 60 ++++++++++++++++++++
16678 fixed-to-float.sh | 6 ++
16679 6 files changed, 133 insertions(+), 12 deletions(-)
16681 commit f658d8b5cffeb36e7d28fca3bb3e370cd712fdd5
16682 Author: Robert Bragg <robert@linux.intel.com>
16683 Date: Thu Jan 8 22:38:33 2009 +0000
16685 [fixed-to-float.sh] Replace uses of COGL_FIXED_FROM_INT not followed by a space
16687 Previously the script assumed a space before the open bracket, so it missed
16688 a few cases in clutter/cogl/gles/cogl.c
16690 fixed-to-float.sh | 1 +
16691 1 file changed, 1 insertion(+)
16693 commit ec403b280544497f4153b756ebb1beee52e0ecc8
16694 Author: Robert Bragg <robert@linux.intel.com>
16695 Date: Thu Jan 8 22:00:56 2009 +0000
16697 converts clutter_{sin,cos,tan,atan}x angles to radians before calling math.h func
16699 These functions are defined to take an angle in degrees, so the angle needs
16700 converting before calling the corresponding {sin,cos,tan,atan}f()
16702 This fixes test-cogl-tex-tile.
16704 fixed-to-float-patches/clutter-fixed.h.0.patch | 8 ++++----
16705 1 file changed, 4 insertions(+), 4 deletions(-)
16707 commit 012b169a731fb278ac8f55122ebf572c6cca4a70
16708 Author: Robert Bragg <robert@linux.intel.com>
16709 Date: Thu Jan 8 13:10:32 2009 +0000
16711 [fixed-to-float-patches] Updates the patches in line with the last merge
16713 Most of the patches updated weren't failing but there were a number of
16714 hunk offsets when applying so it tidies that up. The change in
16715 mtx_transform.0.patch has been moved to clutter-actor.c.0.patch.
16717 fixed-to-float-patches/clutter-actor.c.0.patch | 19 +++--
16718 fixed-to-float-patches/clutter-alpha.c.0.patch | 82 ++++++++++++++------
16719 fixed-to-float-patches/clutter-path.c.0.patch | 4 +-
16720 fixed-to-float-patches/clutter-texture.c.0.patch | 10 +--
16721 fixed-to-float-patches/cogl-pango-render.c.0.patch | 10 +--
16722 fixed-to-float-patches/mtx_transform.0.patch | 19 -----
16723 6 files changed, 85 insertions(+), 59 deletions(-)
16725 commit e730cd70b1c3cc23b01936878ac913a9fd7d7308
16726 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16727 Date: Mon Jan 12 17:12:24 2009 +0000
16729 Whitespace fixes in ClutterTexture
16731 Small whitespace fixes patch; ClutterTexture requires much more
16732 love than I can provide at the moment.
16734 clutter/clutter-texture.c | 10 +++++-----
16735 1 file changed, 5 insertions(+), 5 deletions(-)
16737 commit 5ed62aaf76b49f9539d722f8b78ca99b8304a791
16738 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16739 Date: Mon Jan 12 17:09:47 2009 +0000
16741 [async-loading] Do not force the texture size on async load
16743 The size of the texture as retrieved by the filename should
16744 be set as the image size, not as the actor size, in order to
16745 respect the :sync-size property.
16747 When the asynchronous loading process terminates, we queue
16748 a relayout so that the scene is updated.
16750 clutter/clutter-texture.c | 13 ++++++++++++-
16751 1 file changed, 12 insertions(+), 1 deletion(-)
16753 commit 168d558bcf7dcbd707364004fe968093b5bb5546
16754 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16755 Date: Mon Jan 12 16:54:30 2009 +0000
16757 [async-loading] Update asynchronous image loading
16759 Provide a main loop-based fallback to the asynchronous loading in
16760 case the GLib threading support hasn't been enabled. This also
16761 allows us to clean up the asynchronous loading machinery and have
16762 it behave consistently across different scenarios.
16764 Emit the ::load-finished even if the asynchronous loading from
16765 disk was not enabled.
16767 Finally, block clutter_texture_set_from_file() until we have an
16768 image width and height, so that querying the texture actor size
16769 after set_from_file() will still yield the correct result even
16770 when asynchronous loading is set.
16772 clutter/clutter-texture.c | 305 ++++++++++++++++++++++++++++++++++-----------
16773 1 file changed, 229 insertions(+), 76 deletions(-)
16775 commit 1c114be31a50410c1b2d0621848250102b6dd166
16776 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16777 Date: Mon Jan 12 16:52:20 2009 +0000
16779 Add API for extracting image size from a file
16781 For the asynchronous loading we need a function call that parses
16782 a file, given its path, and retrieves the image width and height.
16784 This commit adds cogl_bitmap_get_size_from_file() to the CoglBitmap
16787 clutter/cogl/cogl-texture.h | 17 ++++++++
16788 clutter/cogl/common/cogl-bitmap-pixbuf.c | 65 +++++++++++++++++++++++++-----
16789 clutter/cogl/common/cogl-bitmap.c | 8 ++++
16790 clutter/cogl/common/cogl-bitmap.h | 5 +++
16791 4 files changed, 86 insertions(+), 9 deletions(-)
16793 commit 946c075a2aca2fdc7e63ddb90c72e65f3a9fee30
16794 Merge: 2cea22e be462b2
16795 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16796 Date: Mon Jan 12 14:43:53 2009 +0000
16798 Merge branch 'master' into async-textures
16800 commit be462b2ea8d2ed908520a498908a83c5ba37a3b7
16801 Author: Havoc Pennington <hp@pobox.com>
16802 Date: Mon Jan 12 14:19:48 2009 +0000
16804 Bug 1087 - virtualize stage_queue_redraw
16806 Add a ClutterStage::queue-redraw signal.
16808 The purpose of this signal is to allow combining the Clutter redraw
16809 idle with another redraw idle such as gtk's (or any other one really;
16810 this is desirable anytime Clutter is not the only thing drawing to
16811 a toplevel window).
16813 To override the default, you would connect to ::queue-redraw and then
16814 stop the signal emission.
16816 clutter/clutter-stage.c | 118 +++++++++++++++++++++++++++++++++++------------
16817 clutter/clutter-stage.h | 2 +
16818 2 files changed, 91 insertions(+), 29 deletions(-)
16820 commit f09b221ade120c16a4696f3160509ea98adfada3
16821 Author: Robert Bragg <robert@linux.intel.com>
16822 Date: Mon Jan 12 13:02:19 2009 +0000
16824 [ClutterGLXTexturePixmap] Use an RGB texture (not ARGB) for 24bpp pixmaps
16826 By creating an ARGB texture for 24bpp pixmaps we were exposing an undefined
16827 alpha channel to the blending and texture combine stages which resulted in
16828 nasty artefacts. (This issue was seen on i945 + DRI2)
16830 clutter/glx/clutter-glx-texture-pixmap.c | 30 +++++++++++++++++++++++-------
16831 1 file changed, 23 insertions(+), 7 deletions(-)
16833 commit ed991fe3c5558bb2bb9058ec0bdeef2071236056
16834 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16835 Date: Mon Jan 12 11:21:06 2009 +0000
16837 Declare G_LOG_DOMAIN for COGL
16839 In order to get properly namespaced debug and warning messages
16840 inside COGL code we need to define the G_LOG_DOMAIN macro.
16842 clutter/cogl/common/Makefile.am | 1 +
16843 clutter/cogl/gl/Makefile.am | 1 +
16844 clutter/cogl/gles/Makefile.am | 1 +
16845 3 files changed, 3 insertions(+)
16847 commit f911a3a7a13a778b44fedb4760ea55105d6bcd46
16848 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16849 Date: Mon Jan 12 11:18:11 2009 +0000
16851 Allow ensuring that a stage viewport is updated
16853 Since we only update the GL viewport when we receive a ConfigureNotify
16854 event on X11, we also need a function to allow other toolkits to tell
16855 a stage that the viewport should be updated.
16857 This commit adds clutter_stage_ensure_viewport(), a function that simply
16858 sets the private SYNC_MATRICES flag on the stage and then queues a
16861 This function should be called by libraries integrating Clutter with
16862 other toolkits, like clutter-gtk or clutter-qt.
16864 clutter/clutter-stage.c | 25 +++++++++++++++++++++++++
16865 clutter/clutter-stage.h | 1 +
16866 2 files changed, 26 insertions(+)
16868 commit 4f6cc0b25f958ea720604db09b43896a985e1f50
16869 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16870 Date: Mon Jan 12 11:15:41 2009 +0000
16872 [x11] Proper fix for the ClutterStage resize race
16874 Continuation of the fix in commit 00a3c698686f25e193d0311ad25c903f0ad71e8b.
16876 Instead of using a separate flag for the resize process, just
16877 delay the setting of the CLUTTER_ACTOR_SYNC_MATRICES flag on the
16878 stage to the point when we receive a ConfigureNotify event from
16881 This commit will break the stage embedding into other toolkits.
16883 clutter/clutter-backend.c | 3 ---
16884 clutter/clutter-main.c | 3 +--
16885 clutter/clutter-private.h | 3 +--
16886 clutter/x11/clutter-event-x11.c | 14 ++++++++++----
16887 clutter/x11/clutter-stage-x11.c | 27 ++++++++++-----------------
16888 5 files changed, 22 insertions(+), 28 deletions(-)
16890 commit 2693ea3ddc4f7a70109a56c425280b6836ca9924
16891 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16892 Date: Fri Jan 9 14:26:35 2009 +0000
16894 [docs] Documentation warnings
16896 Fix the various warnings issued by gtk-doc when enabling the API
16897 reference generation for both COGL and Clutter.
16899 clutter/clutter-cairo-texture.h | 14 ++++++
16900 clutter/cogl/cogl-types.h | 72 +++++++++++++++-------------
16901 clutter/cogl/common/cogl-mesh.c | 2 +
16902 doc/reference/clutter/clutter-docs.xml | 2 +-
16903 doc/reference/clutter/clutter-sections.txt | 55 +++++++++++----------
16904 5 files changed, 83 insertions(+), 62 deletions(-)
16906 commit 00a3c698686f25e193d0311ad25c903f0ad71e8b
16907 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16908 Date: Fri Jan 9 12:06:46 2009 +0000
16910 [x11] Fix a race condition when resizing a stage
16912 There is a race condition when we resize a stage before showing
16915 The race goes like this:
16917 - clutter_init() creates the default stage and realize it, which
16918 will cause a 640x480 Window to be created
16919 - call set_size(800, 600) on the stage will cause the Window to be
16921 - call show() on the stage for the first time will cause COGL
16922 to set up an 800 by 600 GL viewport
16923 - the Window will be mapped, which will cause X to notify the
16924 window manager that the Window should be resized to 800x600
16925 - the window manager will approve the resize
16926 - X resizes the drawable to 800x600
16928 To fix the race, we need to defer COGL from setting up the viewport
16929 until we receive a ConfigureNotify event and the X server has resized
16932 In order to defer the call to cogl_setup_viewport() we add a new
16933 private flag, CLUTTER_STAGE_IN_RESIZE; the flag is checked whenever
16934 we need to change the viewport size along with the SYNC_MATRICES
16935 private flag. Thus, cogl_setup_viewport() will be called only if
16936 SYNC_MATRICES is set and IN_RESIZE is not set.
16938 clutter/clutter-main.c | 3 ++-
16939 clutter/clutter-private.h | 3 ++-
16940 clutter/x11/clutter-event-x11.c | 6 ++++++
16941 clutter/x11/clutter-stage-x11.c | 35 ++++++++++++++++++++++++-----------
16942 4 files changed, 34 insertions(+), 13 deletions(-)
16944 commit efd7ad7e55357e3f656a9158c911521646898a2e
16945 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16946 Date: Thu Jan 8 17:06:04 2009 +0000
16948 [text] Fix GObject properties in ClutterText
16950 Some of the read-write properties of ClutterText were missing
16951 an implementation in clutter_text_get_property(), as well as
16952 the :position and :selection-bound properties being wrongly
16953 converted from fixed point to integer, passing through floating
16956 clutter/clutter-text.c | 28 ++++++++++++++++++++++++++--
16957 1 file changed, 26 insertions(+), 2 deletions(-)
16959 commit e9ee7f049d51c5d3a273385dae0d073c373ca51c
16960 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16961 Date: Thu Jan 8 15:45:22 2009 +0000
16963 Fix last improper usage of ClutterUnits
16965 ClutterUnits should not be used interchangeably as, or with
16966 ClutterFixed values. ClutterUnits should also not be assumed
16969 This commit fixes the last few improper usages of ClutterUnit
16970 values, and adds a CLUTTER_UNITS_FORMAT macro for safely printing
16971 ClutterUnit values with printf().
16973 clutter/clutter-actor.c | 44 +++++++++++++++-----------
16974 clutter/clutter-units.h | 2 ++
16975 tests/interactive/test-project.c | 65 ++++++++++++++++++--------------------
16976 3 files changed, 59 insertions(+), 52 deletions(-)
16978 commit db3d2e9568f565de9c7656c765a5068b39f9241e
16979 Merge: 986c18d 628ccaf
16980 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16981 Date: Thu Jan 8 13:38:51 2009 +0000
16983 Merge branch 'animatable-iface' into animation-improvements
16985 * animatable-iface:
16986 [docs] Add ClutterAnimatable to the API reference
16987 Add license notice to ClutterAnimation files
16988 [animation] Use ClutterAnimatable inside Animation
16989 [animation] Add ClutterAnimatable
16991 commit 628ccaf4a855dc2477a5bb579bf49c414a80249e
16992 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16993 Date: Thu Jan 8 13:31:27 2009 +0000
16995 [docs] Add ClutterAnimatable to the API reference
16997 doc/reference/clutter/clutter-docs.xml | 1 +
16998 doc/reference/clutter/clutter-sections.txt | 79 ++++++++++++++++++----------
16999 doc/reference/clutter/clutter.types | 1 +
17000 3 files changed, 52 insertions(+), 29 deletions(-)
17002 commit d340de8e00b5de125ed94b2b26b9bcaa08a19675
17003 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17004 Date: Thu Jan 8 13:18:00 2009 +0000
17006 Add license notice to ClutterAnimation files
17008 clutter/clutter-animatable.c | 24 ++++++++++++++++++++++++
17009 clutter/clutter-animatable.h | 24 ++++++++++++++++++++++++
17010 2 files changed, 48 insertions(+)
17012 commit 986c18d260bb24261e155b096aa5e53e14c65411
17013 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17014 Date: Thu Jan 8 13:16:20 2009 +0000
17016 [docs] Update the ClutterAnimation section
17018 doc/reference/clutter/clutter-sections.txt | 4 ++--
17019 1 file changed, 2 insertions(+), 2 deletions(-)
17021 commit 068ba1caf04a952f2d0eec9eb1a9f72e72a8d000
17022 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17023 Date: Thu Jan 8 13:13:39 2009 +0000
17025 [animation] Extend ClutterAnimation support to all objects
17027 Instead of limiting the use of ClutterAnimation to ClutterActor
17028 instances, relax the constraint to include all GObject classes.
17030 ClutterAnimation is not using actor-specific API, since it is
17031 only using properties.
17033 The only actor-based API is the clutter_actor_animate() family
17036 clutter/clutter-animation.c | 148 +++++++++++++++++++++----------------------
17037 clutter/clutter-animation.h | 6 +-
17038 2 files changed, 74 insertions(+), 80 deletions(-)
17040 commit 60cfa5edb241a4115e36d4d67374f3e87a4bb688
17041 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17042 Date: Thu Jan 8 12:59:16 2009 +0000
17044 [animation] Use ClutterAnimatable inside Animation
17046 ClutterAnimation should check if the object is implementing the
17047 Animatable interface, and if so delegate to it the computation
17048 of the value along the interval initial and final value, depending
17051 clutter/clutter-animation.c | 34 ++++++++++++++++++++++++++++++++--
17052 1 file changed, 32 insertions(+), 2 deletions(-)
17054 commit 24808e20b3c190ef79a88f958e4ff2617b7c155f
17055 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17056 Date: Thu Jan 8 12:56:46 2009 +0000
17058 [animation] Add ClutterAnimatable
17060 The ClutterAnimatable interface is meant to be used by GObject
17061 classes to override the value computation for an animatable
17062 property within the boundaries of an interval.
17064 It is composed of a single virtual function, animate_property();
17065 its implementation will receive the ClutterAnimation used to
17066 animate the object; the property name; the initial and final
17067 interval values; and the progress factor as retrieved by the
17068 Alpha object bound to the Animation instance.
17070 clutter/Makefile.am | 2 +
17071 clutter/clutter-animatable.c | 93 ++++++++++++++++++++++++++++++++++++++++++
17072 clutter/clutter-animatable.h | 56 +++++++++++++++++++++++++
17073 clutter/clutter.h | 1 +
17074 4 files changed, 152 insertions(+)
17076 commit 378ca42d5b22355d39faf09fb16721f7a6ffbf94
17077 Merge: c186685 e4b1859
17078 Author: Robert Bragg <robert@linux.intel.com>
17079 Date: Thu Jan 8 11:48:00 2009 +0000
17081 Merge branch 'master' into cogl-float
17083 commit c1866858dd43c550f95da0840b9fb4225c12f3cc
17084 Author: Robert Bragg <robert@linux.intel.com>
17085 Date: Wed Jan 7 19:39:31 2009 +0000
17087 fixes for clutter-behaviour-ellipse.c.0.patch
17089 .../clutter-behaviour-ellipse.c.0.patch | 107 ++++----------------
17090 1 file changed, 21 insertions(+), 86 deletions(-)
17092 commit 0ffb6f7aa5de917e474df305c64e84581cf31fc1
17093 Author: Robert Bragg <robert@linux.intel.com>
17094 Date: Wed Jan 7 16:22:45 2009 +0000
17096 [clutter-alpha.c.0.patch] replace ClutterAngle with float
17098 This is just an update of the patch to reflect that fixed-to-float.sh now
17099 replaces ClutterAngle usage with float.
17101 fixed-to-float-patches/clutter-alpha.c.0.patch | 26 ++++++++++++------------
17102 1 file changed, 13 insertions(+), 13 deletions(-)
17104 commit 65e7bc636394f12e6f11cc6c5ba0c113c3a11bc1
17105 Author: Robert Bragg <robert@linux.intel.com>
17106 Date: Wed Jan 7 15:33:24 2009 +0000
17108 Replaces uses of CoglAngle with floats (Though the CoglAngle type remains)
17110 The CoglAngle type can still be used for focused optimisations since the type
17111 and macros remain. Uses of CoglAngle within Cogl have been replaced with floats;
17112 COGL_ANGLE_FROM_DEG is no longer used anywhere and the replacements for
17113 cogl_angle_cos -> cosf (same for sin) have been fixed to convert float values
17114 in degrees to radians. This fixes the cogl-primitives API.
17116 fixed-to-float.sh | 17 ++++++++++++++---
17117 1 file changed, 14 insertions(+), 3 deletions(-)
17119 commit e4b1859077797049918d97d9ba1ec7b0c3cac0b8
17120 Author: Robert Bragg <robert@linux.intel.com>
17121 Date: Wed Jan 7 12:33:40 2009 +0000
17123 [test-clip] Use gint for hand_{width,height} when calulating -hand_* /2
17125 It was a fluke that this worked out due to how the incorrect integer
17126 result gets converted by CLUTTER_INT_TO_FIXED.
17128 tests/interactive/test-clip.c | 8 ++++----
17129 1 file changed, 4 insertions(+), 4 deletions(-)
17131 commit 28b0f432b78f9db0c36d3b286cc8928d12b3b1f3
17132 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17133 Date: Thu Jan 8 11:15:09 2009 +0000
17135 [animation] Allow registering custom progress function
17137 A ClutterInterval can change the way the progress is computed
17138 by subclassing and overriding the ::compute_value() virtual function.
17140 It should also be possible to register a custom progress function
17141 in the same way it is possible to register a custom transformation
17142 function between two GValues.
17144 This commit adds an internal, global hash table that maintains a
17145 GType <-> progress function association; each ClutterInterval
17146 will check if there is a progress function registered for the
17147 GType of the initial and final values of the interval and, if
17148 it has been found, it will call it to compute the value of the
17149 interval depending on the progress factor.
17151 clutter/clutter-interval.c | 105 ++++++++++++++++++++++++++++++++++++++++++++
17152 clutter/clutter-interval.h | 31 +++++++++++++
17153 2 files changed, 136 insertions(+)
17155 commit cc8cd8392f109edeec073fcecab12443bbbaedd2
17156 Author: Robert Bragg <robert@linux.intel.com>
17157 Date: Wed Jan 7 12:08:43 2009 +0000
17159 [test-depth] Use a gint for width, not guint, when calculating -width/2
17161 It was a fluke that this worked out due to how clutter_actor_set_depth
17162 internally converts the incorrect integer result to fixed point.
17164 tests/interactive/test-depth.c | 2 +-
17165 1 file changed, 1 insertion(+), 1 deletion(-)
17167 commit ff48c3ef7c05de41e087645deb845b4d9bb66ae6
17168 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17169 Date: Wed Jan 7 18:18:59 2009 +0000
17171 [animation] Interval::compute_value should return a boolean
17173 If the computation of the interval value depending on the progress
17174 was not successful, ClutterInterval::compute_value() should return
17175 this information to the caller.
17177 clutter/clutter-animation.c | 4 ++--
17178 clutter/clutter-interval.c | 31 ++++++++++++++++++++++++-------
17179 clutter/clutter-interval.h | 4 ++--
17180 3 files changed, 28 insertions(+), 11 deletions(-)
17182 commit 2cea22e6a05e13c32c2f13ee1d369a5806605866
17183 Author: Chris Lord <chris@linux.intel.com>
17184 Date: Wed Jan 7 17:02:43 2009 +0000
17186 Update/clean and apply the async-texture patch from bug #1144
17188 clutter/clutter-texture.c | 152 ++++++++++++++++++++++++++++++++++++-
17189 clutter/clutter-texture.h | 3 +-
17190 clutter/cogl/cogl-texture.h | 42 ++++++++++
17191 clutter/cogl/cogl-types.h | 7 ++
17192 clutter/cogl/common/cogl-bitmap.c | 31 ++++++++
17193 clutter/cogl/common/cogl-bitmap.h | 2 -
17194 clutter/cogl/gl/cogl-texture.c | 52 +++++++------
17195 7 files changed, 262 insertions(+), 27 deletions(-)
17197 commit 5d5b93bd2a11ba8e6fb5e331f1849640f1153a3b
17198 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17199 Date: Wed Jan 7 16:26:03 2009 +0000
17201 Rename a variable masking index()
17203 The maintainer CFLAGS found another masking of the index() function
17204 by an helpless variable.
17206 clutter/clutter-text.c | 6 +++---
17207 1 file changed, 3 insertions(+), 3 deletions(-)
17209 commit 805b88d4c02deda68f6adbd5f65dc6e81451b5f6
17210 Merge: 5913bcf e21fee3
17211 Author: Neil Roberts <neil@linux.intel.com>
17212 Date: Wed Jan 7 16:10:25 2009 +0000
17214 Merge branch multiple-texture-rectangle into master
17216 Bug 1289 - Draw multiple glyphs at once
17218 The multiple-texture-rectangle branch adds a new Cogl texture function
17219 called cogl_texture_multiple_rectangles which is used to draw multiple
17220 rectangles out of a texture using a single GL call. This is
17221 significantly faster than drawing the rectangles with individual calls
17222 on some platforms. The Pango renderer now uses this to speed up
17225 The conflicts are just due to the whitespace fixes in cb569a5.
17229 clutter/cogl/gl/cogl-context.c
17230 clutter/cogl/gl/cogl-context.h
17231 clutter/cogl/gl/cogl-texture.c
17233 commit 5913bcf7e3b1ac4317c33a01362c1fc6e6679704
17234 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17235 Date: Wed Jan 7 15:54:08 2009 +0000
17237 [tests] Update the ClutterText interactive test
17239 Remove the unused functions and if the test fails to load the
17240 text from a file, show the error inside the text actor itself.
17242 tests/interactive/test-text.c | 134 +++++++----------------------------------
17243 1 file changed, 22 insertions(+), 112 deletions(-)
17245 commit 0d9c07f82464962a189cdf1c05c1afe0e10cd9bf
17246 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17247 Date: Wed Jan 7 14:53:54 2009 +0000
17249 [docs] Documentation fixes
17251 Remove the causes of warnings from the Clutter gtk-doc API reference
17252 generation process.
17254 clutter/clutter-binding-pool.c | 2 +-
17255 doc/reference/clutter/clutter-sections.txt | 19 ++-----------------
17256 2 files changed, 3 insertions(+), 18 deletions(-)
17258 commit c1c713119990f222b6d48ab52ca78c1e383ac332
17259 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17260 Date: Wed Jan 7 13:48:45 2009 +0000
17262 [text] Do not use markup on an editable Text
17264 An editable ClutterText should not use pango_layout_set_markup(),
17265 as the contents of the text actor will not match the text.
17267 Only read-only text actors should parse the contents for Pango
17270 clutter/clutter-text.c | 9 ++++++---
17271 1 file changed, 6 insertions(+), 3 deletions(-)
17273 commit 368df450b21e6a731a61d5f30d6b997e258ef0e3
17274 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17275 Date: Wed Jan 7 13:14:13 2009 +0000
17277 [text] Do not ensure the cursor if not needed
17279 If the Text actor is neither editable nor has its cursor set
17280 to visible, then we should not be ensuring the cursor position.
17282 This fixes a failure in the conformance test unit for the
17285 clutter/clutter-text.c | 7 ++++---
17286 1 file changed, 4 insertions(+), 3 deletions(-)
17288 commit c297d1ccf14c8c798773f7e179bb7d1eaa9d6521
17289 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17290 Date: Wed Jan 7 12:17:09 2009 +0000
17292 [tests] Make test-scale use ClutterText
17294 The ClutterLabel actor has been superceded by ClutterText.
17296 This is merge fall-out from the text-actor branch.
17298 tests/interactive/test-scale.c | 6 +++---
17299 1 file changed, 3 insertions(+), 3 deletions(-)
17301 commit 796294fd4e8fb78798f6000bc44cbcc646599481
17302 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17303 Date: Wed Jan 7 12:16:08 2009 +0000
17305 [tests] Remove test-opacity interactive test
17307 Merge fall-out from the text-actor branch. The test-opacity test
17308 was moved to the conformance test suite.
17310 tests/interactive/Makefile.am | 1 -
17311 tests/interactive/test-opacity.c | 116 --------------------------------------
17312 2 files changed, 117 deletions(-)
17314 commit c54bd990975fddc4b395a8f05b0ae9080760f473
17315 Merge: e4272fb ad7d1b5
17316 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17317 Date: Wed Jan 7 12:06:33 2009 +0000
17319 Merge the ClutterText actor
17321 Merge branch 'text-actor'
17323 * text-actor: (108 commits)
17324 Re-align ClutterText header file
17325 [text] Fix cursor sizing
17326 Comments and whitespace fixes to ClutterText
17327 [docs] Add newly added :single-line-mode accessors
17328 Update the ignore file
17329 [tests] Add text field interactive test
17330 [text] Add single-line-mode to ClutterText
17331 [text] Fix the deletion actions
17332 [text] Use cached length when possible
17333 [tests] Add unit for the ClutterText:password-char property
17334 [docs] Update the Text section
17335 [text] Coalesce text visibility and password character
17336 Allow localizations to change the text direction
17337 Clean up the update_pango_context() function
17338 Pass the PangoContext, not the MainContext
17339 Revert the logic of the PangoContext check
17340 Remove the binding pool entry from the list
17341 Remove BindingPool::list_actions()
17342 Add ClutterActor::create_pango_context()
17343 Rename the PangoContext creation functions
17346 commit ad7d1b54bc86fe523167366583fbf463d15db631
17347 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17348 Date: Wed Jan 7 11:46:22 2009 +0000
17350 Re-align ClutterText header file
17352 The addition of the single line mode accessor methods caused the
17353 re-alignment of the entire file.
17355 clutter/clutter-text.h | 192 ++++++++++++++++++++++++------------------------
17356 1 file changed, 96 insertions(+), 96 deletions(-)
17358 commit 328534fc95746ddd38d591efa471db142d1793c4
17359 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17360 Date: Wed Jan 7 11:44:54 2009 +0000
17362 [text] Fix cursor sizing
17364 The cursor should be slightly smaller than the height of the actor, to
17365 allow for painting a border. Let's pad it by 1 pixel on the top and 1
17368 Also, we should use the cursor size everywhere and not use hardcoded
17371 clutter/clutter-text.c | 4 ++--
17372 1 file changed, 2 insertions(+), 2 deletions(-)
17374 commit f3142a70dc8e62127a22edf2ff6a8d01aac86329
17375 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17376 Date: Wed Jan 7 00:43:24 2009 +0000
17378 Comments and whitespace fixes to ClutterText
17380 clutter/clutter-text.c | 20 +++++++++++---------
17381 1 file changed, 11 insertions(+), 9 deletions(-)
17383 commit 7f9c384099c1ca839b34f32c0980f76fe87c19e4
17384 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17385 Date: Wed Jan 7 00:30:59 2009 +0000
17387 [docs] Add newly added :single-line-mode accessors
17389 Add the ClutterText:single-line-mode property accessor methods
17390 to the API reference.
17392 doc/reference/clutter/clutter-sections.txt | 2 ++
17393 1 file changed, 2 insertions(+)
17395 commit 1223fcbb4fd3a0e4ba05a31ca6f71633a56045ee
17396 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17397 Date: Wed Jan 7 00:29:41 2009 +0000
17399 Update the ignore file
17402 1 file changed, 2 insertions(+)
17404 commit 71c03df967e0725aa49f2a51de9909b2fd42d971
17405 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17406 Date: Wed Jan 7 00:27:50 2009 +0000
17408 [tests] Add text field interactive test
17410 The test-text-field is a test/example that shows how to use the
17411 ClutterText as a text input field in single line mode.
17413 tests/interactive/Makefile.am | 3 +-
17414 tests/interactive/test-text-field.c | 117 +++++++++++++++++++++++++++++++++++
17415 2 files changed, 119 insertions(+), 1 deletion(-)
17417 commit 43f82332dd918c7e13e7896523a2508430cfa6f0
17418 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17419 Date: Wed Jan 7 00:25:24 2009 +0000
17421 [text] Add single-line-mode to ClutterText
17423 Allow using ClutterText as a single line text field. This is useful for
17424 text fields that accept just a single line of contents by default, and
17425 respond to the Enter key press to execute some action.
17427 The :single-line-mode property enables this behaviour inside ClutterText
17428 by clipping and scrolling the contents of the PangoLayout if they do
17429 not fit the allocated width of the Text actor.
17431 clutter/clutter-text.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++--
17432 clutter/clutter-text.h | 4 ++
17433 2 files changed, 172 insertions(+), 7 deletions(-)
17435 commit 8182b354b167681a89ef9c3354c1278378e4ea2c
17436 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17437 Date: Tue Jan 6 20:54:20 2009 +0000
17439 [text] Fix the deletion actions
17441 When using the delete-prev action from the end of the text we end
17442 up either missing the first glyph we have to delete or falling
17443 through the last one in the text.
17445 This commit fixes both issues.
17447 clutter/clutter-text.c | 39 ++++++++++++++++-----------------------
17448 1 file changed, 16 insertions(+), 23 deletions(-)
17450 commit 3d32d464e9a83ca2a89700778ece28307f4d359e
17451 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17452 Date: Tue Jan 6 20:52:03 2009 +0000
17454 [text] Use cached length when possible
17456 Since clutter_text_set_text() measures the length of the text
17457 each time, we should use the cached length instead of recomputing
17458 the text length each time. This should save us some time when
17459 dealing with long, multi-byte texts.
17461 clutter/clutter-text.c | 10 +++++-----
17462 1 file changed, 5 insertions(+), 5 deletions(-)
17464 commit 1eeb21c155882497f7b0f76b0fbdc84a13e1f4ab
17465 Author: Robert Bragg <robert@linux.intel.com>
17466 Date: Tue Jan 6 16:32:42 2009 +0000
17468 [fixed-to-float.sh] COGL_FIXED_FROM_INT wasn't casting to a float
17470 It's necissary to replace COGL_FIXED_FROM_INT with a (float) cast otherwise
17471 the replacement maths may end up with integer rounding errors. This was
17472 causing text to not be displayed due to the texture coordinate calculation
17473 always rounding to (0,0)
17475 fixed-to-float.sh | 2 +-
17476 1 file changed, 1 insertion(+), 1 deletion(-)
17478 commit e42d756a69309d1651c13bd1eb79c2c3dff86a0f
17479 Author: Robert Bragg <robert@linux.intel.com>
17480 Date: Tue Jan 6 18:45:34 2009 +0000
17482 [clutter-alpha.c.0.patch] Normalizes sine values [0,1] before calculating alpha
17484 The previous patch broke some of the normalization done before the sine value
17485 gets multiplied with CLUTTER_ALPHA_MAX. This e.g. broke test-actors when sine
17486 values went through to -1, as the o-hands were scaled so large all you saw was
17489 fixed-to-float-patches/clutter-alpha.c.0.patch | 55 +++++++++++++-----------
17490 1 file changed, 31 insertions(+), 24 deletions(-)
17492 commit 12ea2933bd35d22b34973674abf6dcb43fca31f8
17493 Author: Neil Roberts <neil@linux.intel.com>
17494 Date: Tue Jan 6 18:24:57 2009 +0000
17496 [cogl-material] Restore the GL_TEXTURE_ENV_MODE after material_rectangle
17498 The rest of Cogl expects the texture mode to be GL_MODULATE so it
17499 needs to be restored after calling cogl_material_rectangle. Otherwise
17500 cogl_texture_rectangle will fail to blend with the Cogl color properly
17501 and all of the labels will be black.
17503 clutter/cogl/gl/cogl-texture.c | 4 ++++
17504 1 file changed, 4 insertions(+)
17506 commit 606d34f2aa5f4f1480f415ef241b28855dc835af
17507 Author: Neil Roberts <neil@linux.intel.com>
17508 Date: Tue Jan 6 16:09:55 2009 +0000
17510 [cogl-material] Make the user_tex_coords parameter of _rectangle const
17512 The array is only used for input so it should be const.
17514 clutter/cogl/cogl-texture.h | 12 ++++++------
17515 clutter/cogl/gl/cogl-texture.c | 14 +++++++-------
17516 clutter/cogl/gles/cogl-texture.c | 12 ++++++------
17517 3 files changed, 19 insertions(+), 19 deletions(-)
17519 commit b3b7312f33fa47c7e8d814c1f34a4d259f074b72
17520 Author: Neil Roberts <neil@linux.intel.com>
17521 Date: Tue Jan 6 16:01:23 2009 +0000
17523 [test-cogl-material] Remove return value from material_rectangle_paint
17525 The paint signal has no return value so it isn't needed. This fixes
17526 a compiler warning.
17528 tests/interactive/test-cogl-material.c | 2 +-
17529 1 file changed, 1 insertion(+), 1 deletion(-)
17531 commit f5288b1918e7d70c8630f11cb32922ddbec2f078
17532 Author: Neil Roberts <neil@linux.intel.com>
17533 Date: Tue Jan 6 15:53:35 2009 +0000
17535 Add cogl-material.h and cogl-matrix.h to libclutterinclude_HEADERS
17537 Otherwise they won't get installed
17539 clutter/cogl/gl/Makefile.am | 4 +++-
17540 clutter/cogl/gles/Makefile.am | 4 +++-
17541 2 files changed, 6 insertions(+), 2 deletions(-)
17543 commit 87ab64d291781d468c55c8dd54dd9182b80921fd
17544 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17545 Date: Tue Jan 6 15:30:31 2009 +0000
17547 [tests] Add unit for the ClutterText:password-char property
17549 Check that the contents of the Text actor are unaffected by the
17550 :password-char property; that the accessors are correct; and finally
17551 that the initial value for a newly constructed Text actor is valid.
17553 tests/conform/test-clutter-text.c | 19 +++++++++++++++++++
17554 tests/conform/test-conform-main.c | 1 +
17555 2 files changed, 20 insertions(+)
17557 commit c4475c6bfc133eea9e44abea73c3fa2f121fded8
17558 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17559 Date: Tue Jan 6 15:29:44 2009 +0000
17561 [docs] Update the Text section
17563 After the 979b6794 commit, the section for ClutterText needs
17564 updating on the renamed and removed accessors.
17566 doc/reference/clutter/clutter-sections.txt | 6 ++----
17567 1 file changed, 2 insertions(+), 4 deletions(-)
17569 commit 979b6794bb207575fdac6fa520cca5c9adf6f86e
17570 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17571 Date: Tue Jan 6 15:22:31 2009 +0000
17573 [text] Coalesce text visibility and password character
17575 Using two properties to set a password entry can be construed as
17576 both cumbersome and a gtk-ism. And rightly so on both counts.
17578 The :text-visible property has also conflicting semantics with the
17579 :cursor-visible one: while the latter hides the cursor, the former
17580 changes the display of the contents of the Text actor. It is, thus,
17581 not a matter of "visibility" but of "rendering".
17583 Instead of setting the :text-visible and :invisible-char properties
17584 to have a password text field, the Text actor should just have a
17585 single :password-char property holding a Unicode character. If the
17586 value of the :password-char is non-zero, the Text actor will use the
17587 Unicode character to render the contents of the text entry.
17589 This commit removes the following methods:
17591 clutter_text_set_text_visible()
17592 clutter_text_get_text_visible()
17593 clutter_text_set_invisible_char()
17594 clutter_text_get_invisible_char()
17596 And the following properties:
17598 ClutterText:text-visible
17599 ClutterText:invisible-char
17603 clutter_text_set_password_char()
17604 clutter_text_get_password_char()
17608 ClutterText:password-char
17610 Thus making obvious what use the property and accessor methods are
17611 for and simplifying the process of creating a simple password text
17614 text = clutter_text_new ();
17615 clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
17617 clutter/clutter-text.c | 177 ++++++++++++------------------------------------
17618 clutter/clutter-text.h | 7 +-
17619 2 files changed, 46 insertions(+), 138 deletions(-)
17621 commit 854cf5d49916c8b4eb7218c340db2f95dca81d24
17622 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17623 Date: Tue Jan 6 12:53:30 2009 +0000
17625 Animate ClutterColor properties
17627 We can animate a ClutterColor-based property between an interval
17628 of two colors by simply applying the factor to each color component.
17630 clutter/clutter-interval.c | 21 ++++++++++++++++++++-
17631 tests/interactive/test-animation.c | 17 ++++++++++++-----
17632 2 files changed, 32 insertions(+), 6 deletions(-)
17634 commit 1892f8cb1da5727e56323a42f7c2ff9b5d596c31
17635 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17636 Date: Tue Jan 6 12:35:19 2009 +0000
17638 Allow localizations to change the text direction
17640 The locale translators of Clutter are also the ones that should set
17641 the default direction of the text in a Clutter user interface.
17643 This commit adds a translatable string that defines the direction
17644 of the text; the translation authors will change it to the correct
17645 value and that will determine the default direction.
17647 The default text direction can be overridden by using the
17648 CLUTTER_TEXT_DIRECTION environment variable, or by using the
17649 --clutter-text-direction command line switch. In any other case,
17650 the locale will determine the text direction, as it should.
17652 clutter/clutter-main.c | 21 ++++++++++++++++++---
17653 1 file changed, 18 insertions(+), 3 deletions(-)
17655 commit e4272fba69f9c174388eb8a1ffabd3211393461e
17656 Author: Neil Roberts <neil@linux.intel.com>
17657 Date: Tue Jan 6 11:39:14 2009 +0000
17659 Fix off-by-one error in clutter_stage_read_pixels
17661 It was always reading one pixel lower than requested. If y was 0 then
17662 it would try to read below the lowest line.
17664 Thanks to Geoff Gustafson for spotting.
17666 clutter/clutter-stage.c | 2 +-
17667 1 file changed, 1 insertion(+), 1 deletion(-)
17669 commit 8e6423a1b6e08e140a888df5398206640deea59e
17670 Author: Takao Fujiwara <takao.fujiwara@sun.com>
17671 Date: Tue Jan 6 12:11:07 2009 +0000
17673 Bug 1397 - Allow localizing the command line help
17675 Clutter has a set of command line options that are added to every
17676 application by means of clutter_init() or by obtaining the Clutter
17677 GOptionGroup and using g_option_context_parse(). Thus, every Clutter
17678 application will automatically have an --help command line switch
17679 showing the list of options and their description.
17681 At the moment, Clutter does not enable localization of the help,
17682 thus making it less than useful on non-English locales.
17684 This patch enables the machinery to create a localization file and
17685 load it when initializing Clutter, by means of the GLib macros and
17686 locale.h API we already use.
17688 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
17690 clutter/clutter-main.c | 18 +++++++++++-------
17691 clutter/glx/clutter-backend-glx.c | 4 +++-
17692 clutter/x11/clutter-backend-x11.c | 8 +++++---
17694 po/POTFILES.in | 14 ++++++++++++++
17695 5 files changed, 34 insertions(+), 11 deletions(-)
17697 commit e5543a658f74bcc6efb477d34953e5f2bf08d930
17698 Author: Neil Roberts <neil@linux.intel.com>
17699 Date: Mon Jan 5 17:05:30 2009 +0000
17701 Make libdisable-npots a bit more portable
17703 Instead of including GL/gl.h directly it now includes cogl/cogl.h
17704 instead which should include the right GL header.
17706 Instead of using dlopen to specifically open libGL it now tries to use
17707 dlsym with RTLD_NEXT. This requires defining _GNU_SOURCE on GNU
17708 systems. If RTLD_NEXT is not available it will try passing NULL which
17709 is unlikely to work but it will at least catch the case where it
17710 returns the wrapper version of glGetString to prevent infinite
17713 This should hopefully make it work on OS X where the name of the
17714 header and library are different (although this is currently
17717 tests/tools/Makefile.am | 6 ++++++
17718 tests/tools/disable-npots.c | 21 ++++++++++++++-------
17719 2 files changed, 20 insertions(+), 7 deletions(-)
17721 commit 11870040998e0c7e0a30da11a1b91e0c54631c5b
17722 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17723 Date: Mon Jan 5 16:48:46 2009 +0000
17725 Clean up the update_pango_context() function
17727 Logically split the various operations with whitespace so that
17728 it's clear what does what.
17730 clutter/clutter-main.c | 5 ++++-
17731 1 file changed, 4 insertions(+), 1 deletion(-)
17733 commit a5f9c7269465da32a8f0209dfce27f875e4fe05b
17734 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17735 Date: Mon Jan 5 16:45:59 2009 +0000
17737 Pass the PangoContext, not the MainContext
17739 When updating the PangoContext with the current options (font name,
17740 options, resolution) pass the PangoContext instead of the Clutter
17741 MainContext structure pointer.
17743 clutter/clutter-main.c | 2 +-
17744 1 file changed, 1 insertion(+), 1 deletion(-)
17746 commit c79112bd3c4febc39eeba5cabe50319f1eb7976c
17747 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17748 Date: Mon Jan 5 16:44:52 2009 +0000
17750 Revert the logic of the PangoContext check
17752 The branch that creates the global PangoContext should only run
17753 if there is no global PangoContext already.
17755 clutter/clutter-main.c | 2 +-
17756 1 file changed, 1 insertion(+), 1 deletion(-)
17758 commit 700b34148bd9e052bf521caeaff05c1373200972
17759 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17760 Date: Mon Jan 5 16:29:49 2009 +0000
17762 Remove the binding pool entry from the list
17764 When removing a binding entry from the binding pool we should not
17765 only remove it from the hash table, but also from the linked list
17766 we use to iterate over inside the block/unblock_action() pair.
17768 clutter/clutter-binding-pool.c | 13 +++++++++++++
17769 1 file changed, 13 insertions(+)
17771 commit c988b7b736e6d7ab7929b409f6c54c81d5862623
17772 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17773 Date: Mon Jan 5 16:25:50 2009 +0000
17775 Remove BindingPool::list_actions()
17777 The clutter_binding_pool_list_actions() was not implemented. The
17778 utility of a call listing all the action names is also debatable:
17779 all the functions related to the key bindings take the key symbol
17780 and modifiers -- except the block_action() and unblock_action()
17783 clutter/clutter-binding-pool.c | 6 ------
17784 clutter/clutter-binding-pool.h | 1 -
17785 doc/reference/clutter/clutter-sections.txt | 1 -
17786 3 files changed, 8 deletions(-)
17788 commit 982a678053a518e94928e5d7a344c4c5525dec15
17789 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17790 Date: Mon Jan 5 15:29:10 2009 +0000
17792 Add ClutterActor::create_pango_context()
17794 Sometimes an actor needs to set specific font rendering options on
17795 the PangoContext without changing settings for every other text-rendering
17798 In order to do this, we need a new public method to create a Pango
17799 context object -- preset with all the default settings -- owned by the
17800 developer and not shared with the rest of Clutter.
17802 This new method is called clutter_actor_create_pango_context(); while
17803 it does not strictly depend on a ClutterActor, it is a good idea to
17804 have it inside the ClutterActor API to map the current get_pango_context()
17805 method and in case we start storing screen-specific data to the Actor
17806 itself during the 1.x API cycle.
17808 clutter/clutter-actor.c | 36 +++++++++++++++++++++++++++++++++---
17809 clutter/clutter-actor.h | 31 ++++++++++++++++---------------
17810 2 files changed, 49 insertions(+), 18 deletions(-)
17812 commit d622a4dd8933b33f9328beaf1bf825451cadd025
17813 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17814 Date: Mon Jan 5 15:27:33 2009 +0000
17816 Rename the PangoContext creation functions
17818 The _clutter_context_create_pango_context() should create a new
17819 context; the function returning the PangoContext stored inside the
17820 MainContext structure should be named _get_pango_context() instead.
17822 clutter/clutter-main.c | 44 ++++++++++++++++++++++++++------------------
17823 clutter/clutter-private.h | 1 +
17824 2 files changed, 27 insertions(+), 18 deletions(-)
17826 commit 33459f63d61c9cf984378ff395a6dffa4ae87d46
17827 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17828 Date: Mon Jan 5 15:26:57 2009 +0000
17832 clutter/clutter-text.c | 6 ++----
17833 1 file changed, 2 insertions(+), 4 deletions(-)
17835 commit ff73fe3e1f142517617cddf6c73c72783bb7fe92
17836 Author: Neil Roberts <neil@linux.intel.com>
17837 Date: Mon Jan 5 13:14:12 2009 +0000
17839 Fix some animation_set_* functions so they cope if the value is the same
17841 The following functions are fixed:
17843 clutter_animation_set_actor
17844 clutter_animation_set_timeline
17845 clutter_animation_set_alpha
17847 This is related to bug 1392 which discusses the problem for
17848 behaviour_set_alpha.
17850 clutter/clutter-animation.c | 31 +++++++++++++++++++------------
17851 1 file changed, 19 insertions(+), 12 deletions(-)
17853 commit 39f4848b93511d1c6b8c3a4f0eb2774a501caea0
17854 Author: Neil Roberts <neil@linux.intel.com>
17855 Date: Mon Jan 5 12:05:51 2009 +0000
17857 Fix some *_set functions so they work if the object is the same value
17859 Bug 1392 - behaviour_set_alpha set same alpha twice lead to warning
17860 and destroy the input alpha
17862 The following functions are fixed:
17864 clutter_actor_set_shader
17865 clutter_alpha_set_timeline
17866 clutter_behaviour_set_alpha
17867 clutter_clone_texture_set_parent_texture
17869 They either now reference the new value before destroying the old
17870 value, or just return immediately if the values are the same.
17872 clutter/clutter-actor.c | 20 +++++++-------------
17873 clutter/clutter-alpha.c | 3 +++
17874 clutter/clutter-behaviour.c | 4 +++-
17875 clutter/clutter-clone-texture.c | 3 +++
17876 4 files changed, 16 insertions(+), 14 deletions(-)
17878 commit 62cfc6487fc2f3ccd4e1cfdd71bd2746ed833b61
17879 Author: Neil Roberts <neil@linux.intel.com>
17880 Date: Mon Jan 5 12:52:46 2009 +0000
17882 Fix setting the mode on a ClutterAlpha created with animation_set_alpha(NULL)
17884 It previously attempted to set the mode on the alpha using
17885 clutter_animation_set_mode_internal, but this was setting the mode on
17886 priv->alpha. At that point in the code priv->alpha is always NULL.
17888 clutter_animation_set_mode_internal now takes a parameter to specify
17889 which alpha to modify.
17891 clutter/clutter-animation.c | 9 ++++-----
17892 1 file changed, 4 insertions(+), 5 deletions(-)
17894 commit fa431f64923d233cea61aac9f1df75a43e323158
17895 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17896 Date: Mon Jan 5 12:52:29 2009 +0000
17898 [docs] Add the new API to the BindingPool section
17900 Add the clutter_binding_pool_override_* family of functions to
17901 the BindingPool section of the Clutter API reference.
17903 doc/reference/clutter/clutter-sections.txt | 2 ++
17904 1 file changed, 2 insertions(+)
17906 commit e56fe478ef9ae30584480827805e0dd6a8834e0b
17907 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17908 Date: Mon Jan 5 12:49:01 2009 +0000
17910 Allow overriding actions inside a BindingPool
17912 As of now, a key binding installed into a BindingPool is always there
17913 and cannot be changed.
17915 This is problematic for sub-classes trying to override the callback
17916 or the action for a given key binding.
17918 This commit adds the ability to override the closure for an existing
17919 key binding inside a binding pool -- assumed the caller knows the
17920 key symbol and modifiers used to install the key binding in the first
17923 clutter/clutter-binding-pool.c | 125 ++++++++++++++++++++++++++++++++++++++++
17924 clutter/clutter-binding-pool.h | 70 ++++++++++++----------
17925 2 files changed, 165 insertions(+), 30 deletions(-)
17927 commit 2ed60a5270c7bb03e8046db52b2abdf71e195cce
17928 Author: Neil Roberts <neil@linux.intel.com>
17929 Date: Mon Jan 5 12:47:10 2009 +0000
17931 In clutter_alpha_set_mode, set priv->mode after setting the func
17933 Otherwise the call to clutter_alpha_set_func sets the mode back to
17934 CLUTTER_CUSTOM_MODE so clutter_alpha_get_mode won't get back the same
17935 value that was set.
17937 clutter/clutter-alpha.c | 4 ++--
17938 1 file changed, 2 insertions(+), 2 deletions(-)
17940 commit 55a22d57507dbafbc99fdb01820d5a7f41404e36
17941 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17942 Date: Mon Jan 5 12:27:45 2009 +0000
17944 [text] Add select-all binding
17946 Bind Ctrl+A to the "select all" action.
17948 clutter/clutter-text.c | 17 +++++++++++++++++
17949 1 file changed, 17 insertions(+)
17951 commit 92e8b886d2b21618277079306169a8aa31a03806
17952 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17953 Date: Tue Dec 16 17:44:13 2008 +0000
17955 [docs] Add clutter_text_activate()
17957 Add the last unused symbol to the ClutterText section.
17959 doc/reference/clutter/clutter-sections.txt | 3 +++
17960 1 file changed, 3 insertions(+)
17962 commit 605ec10c3242f7024b77469ff38abf6a06ef08cc
17963 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17964 Date: Tue Dec 16 17:40:41 2008 +0000
17966 [docs] Remove ClutterLabel and ClutterEntry sections
17968 Remove the sections for the Label and the Entry actors, which
17969 have been replaced by ClutterText.
17971 doc/reference/clutter/clutter-sections.txt | 86 ----------------------------
17972 1 file changed, 86 deletions(-)
17974 commit fd2d78918b49dc2b67f18b444587f32a0030bfa9
17975 Merge: cb569a5 cf5d691
17976 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17977 Date: Mon Jan 5 11:11:10 2009 +0000
17979 Merge branch 'units-rework'
17982 [texture] Do not mix fixed point and units values
17983 [tests] Fix the actor detection
17984 [units] Do not use fixed point and units interchangeably
17986 commit 377f1140465228333f41acb814c77e4e70800506
17987 Author: Robert Bragg <robert@linux.intel.com>
17988 Date: Tue Dec 23 23:50:02 2008 +0000
17990 [cogl-material] improvements for cogl_material_rectangle
17992 The API has been changed to take an explicit length for the number of
17993 texture coordinates passed, and it's now documented that if there are
17994 more layers to the current material than the number of texture coords
17995 passed, then default coordinates will be generated for the other
17998 cogl_material_rectangle should now handle the case where a single
17999 sliced texture is supplied as a material layer by falling back to
18000 cogl_texture_rectangle. We are nearly at the point that
18001 cogl_texture_rectangle could be deprecated. A few issues remain
18002 though, such as not considering waste in cogl_material_rectangle.
18004 clutter/clutter-clone-texture.c | 1 +
18005 clutter/clutter-texture.c | 1 +
18006 clutter/cogl/cogl-texture.h | 75 +++++++--------------
18007 clutter/cogl/common/cogl-material-private.h | 14 ++--
18008 clutter/cogl/gl/cogl-texture.c | 95 +++++++++++++++++++++------
18009 tests/interactive/test-cogl-material.c | 1 +
18010 6 files changed, 109 insertions(+), 78 deletions(-)
18012 commit e77a7847146dc8a4ca215def681c431cde2ff5e0
18013 Author: Robert Bragg <robert@linux.intel.com>
18014 Date: Tue Dec 23 23:35:49 2008 +0000
18016 [cogl-material] Adds a cogl_material_set_color function
18018 The other colors of a material; such as the ambient and diffuse color are
18019 only relevent when we can enable lighting. This adds a basic unlit
18022 Later cogl_set_source_color can be integrated to either modify the color
18023 of the current source material, or maintain a special singlton CoglMaterial
18024 that is modified by calls to cogl_set_source_color and implicitly made
18027 clutter/cogl/cogl-material.h | 13 +++++++++++++
18028 clutter/cogl/common/cogl-material.c | 30 ++++++++++++++++++++++++++++++
18029 2 files changed, 43 insertions(+)
18031 commit 462c45da3c9cd4febb6849ce66868de74f614184
18032 Author: Robert Bragg <robert@linux.intel.com>
18033 Date: Tue Dec 23 23:22:40 2008 +0000
18035 [cogl-material] Some improvements for how we sync CoglMaterial state with OpenGL
18037 This flattens the three functions: cogl_material_flush_gl_material_state,
18038 .._flush_gl_alpha_func and .._flush_gl_blend_func into one:
18039 cogl_flush_material_gl_state which doesn't takes a material handle. (the handle
18040 is instead taken from the context.)
18042 This has allows us to avoid re-submitting some state to OpenGL when the
18043 material has not been replaced.
18045 Note: Avoiding redundant state changes for material layers isn't dealt with
18048 clutter/cogl/cogl-material.h | 72 ++++++++++------------
18049 clutter/cogl/common/cogl-material.c | 116 ++++++++++++++++++-----------------
18050 clutter/cogl/gl/cogl-context.c | 1 +
18051 clutter/cogl/gl/cogl-context.h | 1 +
18052 clutter/cogl/gl/cogl-texture.c | 5 +-
18053 5 files changed, 97 insertions(+), 98 deletions(-)
18055 commit 4e57972bd6854027e509b8b80b9a8fc1204ad828
18056 Author: Robert Bragg <robert@linux.intel.com>
18057 Date: Tue Dec 23 16:39:11 2008 +0000
18059 [cogl-material] Converts clutter-texture/clutter-clone-texture to the material API
18061 This converts clutter-texture to use the new CoglMaterial API instead of
18062 cogl_texture_rectangle.
18064 This change does not add multi-texturing support to Clutter, it's more about
18065 aiming to deprecate cogl_texture_rectangle, and moving everything over to the
18066 cogl_set_source(material); cogl_draw_somthing(); coding pattern.
18068 With this patch, the code can be built with/without CoglMaterial support so we
18069 can do comparisons of the old/new code for a transient period. (look for the
18070 USE_COGL_MATERIAL define)
18072 Note: The FBO paths haven't currently been tested, so they may need some
18075 clutter/clutter-clone-texture.c | 26 +++++
18076 clutter/clutter-texture.c | 226 +++++++++++++++++++++++++++++++++++----
18077 clutter/clutter-texture.h | 13 +++
18078 3 files changed, 242 insertions(+), 23 deletions(-)
18080 commit bb938ac4ff651d402a6ecaaf86d11623e19a346d
18081 Merge: aee2589 cb569a5
18082 Author: Robert Bragg <robert@linux.intel.com>
18083 Date: Wed Dec 24 00:59:13 2008 +0000
18085 Merge branch 'master' into cogl-material
18089 clutter/cogl/gl/cogl-context.c
18090 clutter/cogl/gl/cogl-context.h
18092 commit cb569a54431082fe1e5e59078e0c7e045ebbd707
18093 Author: Robert Bragg <robert@linux.intel.com>
18094 Date: Tue Dec 23 16:29:29 2008 +0000
18096 White space clean up across a number of files (only removing trailing spaces)
18098 Removed trailing white space from the following files:
18099 - clutter-clone-texture.c
18100 - clutter-texture.c
18101 - clutter-texture.h
18102 - cogl/cogl-texture.h
18103 - cogl/gl/cogl-context.c
18104 - cogl/gl/cogl-texture.c
18105 - cogl/gl/cogl-context.h
18107 clutter/clutter-clone-texture.c | 28 +--
18108 clutter/clutter-texture.c | 24 +-
18109 clutter/clutter-texture.h | 4 +-
18110 clutter/cogl/cogl-texture.h | 24 +-
18111 clutter/cogl/gl/cogl-context.c | 26 +-
18112 clutter/cogl/gl/cogl-context.h | 16 +-
18113 clutter/cogl/gl/cogl-texture.c | 512 +++++++++++++++++++--------------------
18114 7 files changed, 317 insertions(+), 317 deletions(-)
18116 commit 7649e9de077744968f7937749f157be9e87707da
18117 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18118 Date: Tue Dec 23 21:06:05 2008 +0000
18120 Remove a masking with index()
18122 The binding-pool test unit had a variable masking the index() function
18123 declared inside string.h.
18125 tests/conform/test-binding-pool.c | 4 ++--
18126 1 file changed, 2 insertions(+), 2 deletions(-)
18128 commit c9cdf1ef0a02f9c4140686141e057ca32304a61d
18129 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18130 Date: Tue Dec 23 20:55:35 2008 +0000
18134 Remove a stray ';' that prevented the get_bounds() method of the
18135 ClutterBehaviourRotate to correctly return the start angle value.
18137 clutter/clutter-behaviour-rotate.c | 2 +-
18138 1 file changed, 1 insertion(+), 1 deletion(-)
18140 commit affd915b847663a871b8c17addd2b1b66afe1276
18141 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18142 Date: Tue Dec 23 20:53:44 2008 +0000
18144 Add more maintainer CFLAGS
18146 Be even more anal-retentive when the maintainer flags are enabled.
18148 Kudos to Benjamin Otte.
18150 configure.ac | 2 +-
18151 1 file changed, 1 insertion(+), 1 deletion(-)
18153 commit f777bc629ac90e2e0b70705823ecd3fb74f2cded
18154 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18155 Date: Tue Dec 23 16:59:14 2008 +0000
18157 [docs] Document the newly added functions
18159 Document the ClutterBackend font name accessors, and the
18160 clutter_actor_get_pango_context() getter method.
18162 clutter/clutter-actor.c | 21 +++++++++++++++++++++
18163 clutter/clutter-backend.c | 24 ++++++++++++++++++++++++
18164 doc/reference/clutter/clutter-sections.txt | 9 ++++++---
18165 3 files changed, 51 insertions(+), 3 deletions(-)
18167 commit 9389d9755d9121c1f99a5dc208ef90a10ca1b004
18168 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18169 Date: Tue Dec 23 16:40:26 2008 +0000
18171 Add the ability to set the text direction
18173 The direction of the text depends on the locale, and it is the
18174 basic setting needed to enable internationalization of user
18177 This commit allows setting the direction of the PangoContext instance
18178 used by Clutter by using the CLUTTER_TEXT_DIRECTION environment
18179 variable, or by passing the --clutter-text-direction command line
18180 argument. Valid values are:
18182 ltr - for left-to-right locales
18183 rtl - for right-to-left locales
18185 The default is LTR.
18187 Ideally, this should be a value set by the localization teams on the
18188 PO file, but this step requires some build system surgery to allow
18189 the translation of the Clutter strings.
18191 clutter/clutter-main.c | 68 +++++++++++++++++++++++++++++++++++++++++-------
18192 1 file changed, 58 insertions(+), 10 deletions(-)
18194 commit b4a3944b2b6bde5b57f86519135b959f4607cad3
18195 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18196 Date: Tue Dec 23 16:27:54 2008 +0000
18198 Return the default font name if no font name is set
18200 When calling clutter_backend_get_font_name(), if no default font
18201 name has previously been set, we just set the default and return
18202 a pointer to it - like we do for the font options.
18204 clutter/clutter-backend.c | 11 ++++++++++-
18205 1 file changed, 10 insertions(+), 1 deletion(-)
18207 commit e3785f4f45d1ef8e0e65517c246cace4dade41ea
18208 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18209 Date: Tue Dec 23 15:05:16 2008 +0000
18211 Use the default font from the Backend
18213 Instead of storing the default font name and size as a pre-processor
18214 macro, use the newly added ClutterBackend API to retrieve the current
18215 default font from the backend.
18217 clutter/clutter-text.c | 20 ++++++++++++--------
18218 1 file changed, 12 insertions(+), 8 deletions(-)
18220 commit 72625421556c63a7f33afa262d4b60e29f48580b
18221 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18222 Date: Tue Dec 23 15:03:11 2008 +0000
18224 Store the default font name inside ClutterBackend
18226 The default backend stores some of the global defaults, like the
18227 font options, text resolution, double click settings. It should also
18228 store the default font name, to allow various text-based actors to
18229 share the same settings.
18231 When the font name changes, the ::font-changed signal is emitted,
18232 to allow actors to pick up the change.
18234 clutter/clutter-backend.c | 34 ++++++++++++++++++++++++++++++++++
18235 clutter/clutter-backend.h | 5 +++++
18236 2 files changed, 39 insertions(+)
18238 commit 977bdcf89b449845f3b9aeb02d02fe1fb4577fcb
18239 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18240 Date: Tue Dec 23 14:34:16 2008 +0000
18242 Update the PangoContext on backend changes
18244 When the ClutterBackend notifies of changes in the resolution or
18245 font options, update the PangoContext stored by Clutter's main
18246 context. This allows changing the backend font-related settings at
18249 clutter/clutter-main.c | 32 ++++++++++++++++++++++++--------
18250 1 file changed, 24 insertions(+), 8 deletions(-)
18252 commit 213d8f0e4e165554ad2c172c2b18cb29dfce9b76
18253 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18254 Date: Tue Dec 23 14:27:41 2008 +0000
18256 Store the PangoContext inside the main context
18258 The PangoContext should be stored once, and inside the main
18259 Clutter context. Each actor for which clutter_actor_get_pango_context()
18260 has been called will hold a reference on the Pango context as well.
18262 This makes it possible to update the text rendering for Clutter
18263 by using only public API.
18265 clutter/clutter-actor.c | 1 +
18266 clutter/clutter-main.c | 15 ++++++++++-----
18267 clutter/clutter-private.h | 7 ++++---
18268 3 files changed, 15 insertions(+), 8 deletions(-)
18270 commit 61d47ee3016c487312ef1e731af03960c9d42b42
18271 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18272 Date: Tue Dec 23 14:15:10 2008 +0000
18274 Do not leak the PangoContext
18276 We hold a reference on the PangoContext we use for an actor, so
18277 we should remove the reference inside the dispose implementation.
18279 clutter/clutter-actor.c | 6 ++++++
18280 1 file changed, 6 insertions(+)
18282 commit a865a5d4ead867072d67f1ff57ac5a70d8589159
18283 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18284 Date: Tue Dec 23 14:11:27 2008 +0000
18286 Create the PangoContext of the Text actor
18288 Instead of creating a single, private PangoContext for every
18289 Text actor, use the newly added clutter_actor_get_pango_context()
18292 clutter/clutter-text.c | 10 +++-------
18293 1 file changed, 3 insertions(+), 7 deletions(-)
18295 commit 78628edf2f6f02db3d283169d93ae2d21e63a1ec
18296 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18297 Date: Tue Dec 23 14:06:55 2008 +0000
18299 Add a per-actor PangoContext
18301 Rendering text inside an actor is pretty much impossible without
18302 using internal API to create the various pieces like the PangoContext
18305 Each actor should have the ability to create a PangoContext, which
18306 is the only object needed to generate layouts and change the various
18309 This commit adds a clutter_actor_get_pango_context() function that
18310 creates a PangoContext inside the ClutterActor private data and allows
18311 the creation of PangoLayouts when needed. If the actor already
18312 has a PangoContext, the same instance is returned.
18314 The PangoContext is created only on demand.
18316 clutter/clutter-actor.c | 25 +++++++++++++++++++++++--
18317 clutter/clutter-actor.h | 4 ++++
18318 2 files changed, 27 insertions(+), 2 deletions(-)
18320 commit b8b8b155c45e54e8c2bd4d7e161a28b55a5088e1
18321 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18322 Date: Tue Dec 23 13:55:51 2008 +0000
18324 Add signals for Backend options
18326 The ClutterBackend instance at the moment lacks the ability to
18327 notify runtime changes of the font options and the resolution.
18329 For this reason, this commit adds a ::resolution-changed and a
18330 ::font-changed signals to the Backend class.
18332 The ::resolution-changed signal is emitted when set_resolution()
18333 is called with a different DPI; ::font-changed is emitted when the
18334 cairo_font_options_t* changes from the default.
18336 clutter/clutter-backend.c | 36 ++++++++++++++++++++++++++++++++++--
18337 clutter/clutter-backend.h | 4 ++++
18338 2 files changed, 38 insertions(+), 2 deletions(-)
18340 commit e8915fcb12cd402cadcdb5e2cfa28a5fc9765a71
18341 Author: Robert Bragg <robert@linux.intel.com>
18342 Date: Fri Dec 19 21:55:35 2008 +0000
18344 First cut at a fixed point to floating point conversion script + patches
18346 This commit doesn't actually include any direct changes to source; you
18347 have to run ./fixed-to-float.sh. Note: the script will make a number of
18348 commits itself to your git repository a various stages of the script.
18349 You will need to reset these if you want to re-run the script.
18351 * NB: Be carefull about how you reset your tree, if you are making changes
18352 to the script and patches, so you don't loose your changes *
18354 This aims to remove all use of fixed point within Clutter and Cogl. It aims to
18355 not break the Clutter API, including maintaining the CLUTTER_FIXED macros,
18356 (though they now handle floats not 16.16 fixed)
18358 It maintains cogl-fixed.[ch] as a utility API that can be used by applications
18359 (and potentially for focused internal optimisations), but all Cogl interfaces
18360 now accept floats in place of CoglFixed.
18362 Note: the choice to to use single precision floats, not doubles is very
18363 intentional. GPUs are basically all single precision; only this year have high
18364 end cards started adding double precision - aimed mostly at the GPGPU market.
18365 This means if you pass doubles into any GL[ES] driver, you can expect those
18366 numbers to be cast to a float. (Certainly this is true of Mesa wich casts
18367 most things to floats internally) It can be a noteable performance issue to
18368 cast from double->float frequently, and if we were to have an api defined in
18369 terms of doubles, that would imply a *lot* of unneeded casting. One of the
18370 noteable issues with fixed point was the amount of casting required, so I
18371 don't want to overshoot the mark and require just as much casting still. Double
18372 precision arithmatic is also slower, so it usually makes sense to minimize its
18373 use if the extra precision isn't needed. In the same way that the fast/low
18374 precision fixed API can be used sparingly for optimisations; if needs be in
18375 certain situations we can promote to doubles internally for higher precision.
18378 quoting Brian Paul (talking about performance optimisations for GL programmers):
18379 "Avoid double precision valued functions
18380 Mesa does all internal floating point computations in single precision
18381 floating point. API functions which take double precision floating point
18382 values must convert them to single precision. This can be expensive in the
18383 case of glVertex, glNormal, etc. "
18385 fixed-to-float-patches/clutter-actor.c.0.patch | 40 ++
18386 fixed-to-float-patches/clutter-alpha.c.0.patch | 263 ++++++++++++
18387 fixed-to-float-patches/clutter-alpha.h.0.patch | 13 +
18388 .../clutter-behaviour-ellipse.c.0.patch | 445 ++++++++++++++++++++
18389 fixed-to-float-patches/clutter-bezier.c.0.patch | 13 +
18390 fixed-to-float-patches/clutter-fixed.c.0.patch | 15 +
18391 fixed-to-float-patches/clutter-fixed.h.0.patch | 333 +++++++++++++++
18392 fixed-to-float-patches/clutter-path.c.0.patch | 18 +
18393 fixed-to-float-patches/clutter-texture.c.0.patch | 13 +
18394 fixed-to-float-patches/clutter-units.h.0.patch | 85 ++++
18395 fixed-to-float-patches/cogl-fixed.c.0.patch | 17 +
18396 fixed-to-float-patches/cogl-fixed.h.0.patch | 23 +
18397 fixed-to-float-patches/cogl-pango-render.c.0.patch | 24 ++
18398 fixed-to-float-patches/cogl-primitives.c.0.patch | 12 +
18399 .../gl-cogl-primitives.c.0.patch | 12 +
18400 fixed-to-float-patches/gl-cogl-texture.c.0.patch | 30 ++
18401 fixed-to-float-patches/gl-cogl.c | 92 ++++
18402 fixed-to-float-patches/mtx_transform.0.patch | 19 +
18403 .../test-cogl-tex-tile.c.0.patch | 35 ++
18404 fixed-to-float.sh | 150 +++++++
18405 20 files changed, 1652 insertions(+)
18407 commit aee2589cc6a5afcddbfe4d7221c8a24ec2f25cfe
18408 Author: Robert Bragg <robert@linux.intel.com>
18409 Date: Mon Dec 22 16:19:49 2008 +0000
18411 [doc] Hooks up cogl-material reference documentation
18413 Adds some more gtk-doc comments to cogl-material.h, and adds a new section to
18416 clutter/cogl/cogl-material.h | 548 +++++++++++++++++++++++-----------
18417 clutter/cogl/common/cogl-material.c | 72 ++---
18418 doc/reference/cogl/cogl-docs.sgml | 1 +
18419 doc/reference/cogl/cogl-sections.txt | 38 +++
18420 4 files changed, 456 insertions(+), 203 deletions(-)
18422 commit eb3b48e9ff9eab0a427fd3d73c2cefaaf2213141
18423 Author: Robert Bragg <robert@linux.intel.com>
18424 Date: Thu Dec 18 19:12:09 2008 +0000
18426 Updates previous GLES multi-texturing code to use CoglMaterial
18428 test-cogl-material now runs on GLES 1 using the PVR GLES1 SDK (though since
18429 only 2 texture units are supported the third rotating light map doesn't show)
18431 Note: It currently doesn't build for GLES 2.0
18433 clutter/cogl/cogl-material.h | 2 +
18434 clutter/cogl/gles/cogl-context.c | 5 +-
18435 clutter/cogl/gles/cogl-context.h | 9 +-
18436 clutter/cogl/gles/cogl-texture.c | 320 ++++++++++++++------------------------
18437 4 files changed, 122 insertions(+), 214 deletions(-)
18439 commit 40b0bb4e95b7f332b2b48e1d072eb2b4c936b4bf
18440 Author: Robert Bragg <bob@o-hand.com>
18441 Date: Thu Dec 11 20:11:30 2008 +0000
18443 Adds a CoglMaterial abstraction, which includes support for multi-texturing
18445 My previous work to provide muti-texturing support has been extended into
18446 a CoglMaterial abstraction that adds control over the texture combine
18447 functions (controlling how multiple texture layers are blended together),
18448 the gl blend function (used for blending the final primitive with the
18449 framebuffer), the alpha function (used to discard fragments based on
18450 their alpha channel), describing attributes such as a diffuse, ambient and
18451 specular color (for use with the standard OpenGL lighting model), and
18452 per layer rotations. (utilizing the new CoglMatrix utility API)
18454 For now the only way this abstraction is exposed is via a new
18455 cogl_material_rectangle function, that is similar to cogl_texture_rectangle
18456 but doesn't take a texture handle (the source material is pulled from
18457 the context), and the array of texture coordinates is extended to be able
18458 to supply coordinates for each layer.
18460 Note: this function doesn't support sliced textures; supporting sliced
18461 textures is a non trivial problem, considering the ability to rotate layers.
18462 Note: cogl_material_rectangle, has quite a few workarounds, for a number of
18463 other limitations within Cogl a.t.m.
18464 Note: The GLES1/2 multi-texturing support has yet to be updated to use
18465 the material abstraction.
18467 clutter/cogl/cogl-material.h | 481 +++++++++++++++++++
18468 clutter/cogl/cogl.h.in | 2 +
18469 clutter/cogl/common/Makefile.am | 3 +-
18470 clutter/cogl/common/cogl-material-private.h | 72 +++
18471 clutter/cogl/common/cogl-material.c | 680 +++++++++++++++++++++++++++
18472 clutter/cogl/common/cogl-matrix.h | 57 ---
18473 clutter/cogl/gl/cogl-context.c | 5 +-
18474 clutter/cogl/gl/cogl-context.h | 9 +-
18475 clutter/cogl/gl/cogl-texture-private.h | 8 +-
18476 clutter/cogl/gl/cogl-texture.c | 307 +++++-------
18477 tests/data/Makefile.am | 1 -
18478 tests/data/light0.png | Bin 24410 -> 5674 bytes
18479 tests/data/light1.png | Bin 28430 -> 0 bytes
18480 tests/interactive/Makefile.am | 2 +-
18481 tests/interactive/test-cogl-material.c | 161 +++++++
18482 tests/interactive/test-cogl-multi-texture.c | 250 ----------
18483 16 files changed, 1516 insertions(+), 522 deletions(-)
18485 commit 63047e1907dbe1f44b173e99930305c2ddfe44d2
18486 Author: Robert Bragg <robert@linux.intel.com>
18487 Date: Mon Dec 22 16:16:07 2008 +0000
18489 [doc] Hooks up cogl-matrix reference documentation
18491 Adds a few more gtk-doc notes to cogl-matrix.h, and adds a new section to
18494 clutter/cogl/cogl-matrix.h | 54 ++++++++++++++++++++++++++++++----
18495 doc/reference/cogl/cogl-docs.sgml | 1 +
18496 doc/reference/cogl/cogl-sections.txt | 11 +++++++
18497 3 files changed, 61 insertions(+), 5 deletions(-)
18499 commit fa8d6dc69b61e31873a6aa5550a5e3a0c203d6ae
18500 Author: Robert Bragg <bob@o-hand.com>
18501 Date: Thu Dec 11 20:08:15 2008 +0000
18503 Adds CoglMatrix utility code
18505 clutter/cogl/cogl-matrix.h | 102 +++++++++++++++++++++++++++
18506 clutter/cogl/common/Makefile.am | 3 +-
18507 clutter/cogl/common/cogl-matrix.c | 138 +++++++++++++++++++++++++++++++++++++
18508 clutter/cogl/common/cogl-matrix.h | 57 +++++++++++++++
18509 4 files changed, 299 insertions(+), 1 deletion(-)
18511 commit fc7a86fd0d071645e27a996b78267b5aaca83fcf
18512 Author: Robert Bragg <bob@o-hand.com>
18513 Date: Thu Dec 11 15:35:17 2008 +0000
18515 [tests] Adds an interactive unit test for multi-texturing
18517 This simply gives an example of blending a red o-hand logo with an alpha mask
18518 and a changing light map.
18520 tests/data/Makefile.am | 3 +
18521 tests/data/light0.png | Bin 0 -> 24410 bytes
18522 tests/data/light1.png | Bin 0 -> 28430 bytes
18523 tests/data/redhand_alpha.png | Bin 0 -> 4539 bytes
18524 tests/interactive/Makefile.am | 9 +-
18525 tests/interactive/test-cogl-multi-texture.c | 250 +++++++++++++++++++++++++++
18526 6 files changed, 261 insertions(+), 1 deletion(-)
18528 commit ea643ca0f8e1a5020c1dc65146aaa75b85fd0109
18529 Author: Robert Bragg <bob@o-hand.com>
18530 Date: Thu Dec 11 15:33:38 2008 +0000
18532 [multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2
18534 Multitexturing allows blending multiple layers of texture data when texturing
18535 some geometry. A common use is for pre-baked light maps which can give nice
18536 lighting effects relativly cheaply. Another is for dot-3 bump mapping, and
18537 another is applying alpha channel masks.
18539 The dot-3 bump mapping would be really nice one day, but currently cogl doesn't
18540 support lighting so that's not dealt with in this patch.
18542 notable limitations:
18543 - It can only texture rectangles a.t.m - and like cogl_texture_rectangle there
18544 is no support for rotated texturing.
18545 - Sliced textures are not supported. I think I've figured out how to handle
18546 layers with different slice sizes at least for rectangular geometry, but I'm
18547 not sure how complex it becomes once rotations are possible and texturing
18548 arbitrary cogl_polygons.
18549 - Except for this new API, cogl still doesn't know about more than one texture
18550 unit, and so has no way of caching any enables related to other units. So that
18551 things don't break it's currently necessary to disable anything to do with
18552 additional units as soon as we are done with them which isn't ideal.
18553 - No clutter API yet.
18555 clutter/cogl/cogl-texture.h | 62 +++
18556 clutter/cogl/common/cogl-handle.h | 6 +
18557 clutter/cogl/gl/cogl-context.c | 3 +
18558 clutter/cogl/gl/cogl-context.h | 6 +
18559 clutter/cogl/gl/cogl-defines.h.in | 1 +
18560 clutter/cogl/gl/cogl-texture-private.h | 27 +-
18561 clutter/cogl/gl/cogl-texture.c | 275 +++++++++-
18562 clutter/cogl/gles/cogl-context.c | 4 +-
18563 clutter/cogl/gles/cogl-context.h | 6 +
18564 clutter/cogl/gles/cogl-defines.h.in | 12 +-
18565 clutter/cogl/gles/cogl-fixed-fragment-shader.glsl | 33 +-
18566 clutter/cogl/gles/cogl-fixed-vertex-shader.glsl | 19 +-
18567 clutter/cogl/gles/cogl-gles2-wrapper.c | 552 +++++++++++++++++----
18568 clutter/cogl/gles/cogl-gles2-wrapper.h | 131 +++--
18569 clutter/cogl/gles/cogl-texture-private.h | 21 +
18570 clutter/cogl/gles/cogl-texture.c | 281 ++++++++++-
18571 16 files changed, 1260 insertions(+), 179 deletions(-)
18573 commit b021f518c18eb142791238cb4ecde8b1ea3707c0
18574 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18575 Date: Mon Dec 22 13:29:10 2008 +0000
18577 Use "" as the default value for the :text property
18579 This follows the convention of GtkLabel/GtkEntry in GTK+ and the old
18582 It makes it easier to use strlen/strcmp etc on the output, since we can
18583 assume that it is always a string.
18585 This commit also updates the test unit for ClutterText to verify that
18586 the clutter_text_get_text() function also returns an empty string when
18587 a ClutterText actor has been created.
18589 clutter/clutter-text.c | 12 +++++++++---
18590 tests/conform/test-clutter-text.c | 3 ++-
18591 2 files changed, 11 insertions(+), 4 deletions(-)
18593 commit 4a934c363c559896c2dede5374cc33b63a7c01a7
18594 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18595 Date: Mon Dec 22 13:24:52 2008 +0000
18597 Do not include cogl-pango.h multiple times
18599 The clutter-private.h header already includes cogl-pango.h with
18600 the correct inclusion path, because the main context stores a
18601 pointer to the font map.
18603 There is no need for clutter-text.c to include cogl-pango.h
18604 again since it already includes clutter-private.h.
18606 clutter/clutter-private.h | 3 ++-
18607 clutter/clutter-text.c | 4 +---
18608 2 files changed, 3 insertions(+), 4 deletions(-)
18610 commit 6a980793c6b7f66c698a8426d92763827d73958e
18611 Author: Owen Taylor <otaylor@fishsoup.net>
18612 Date: Mon Dec 22 13:11:59 2008 +0000
18614 Return something reasonable from clutter_x11_handle_event()
18616 Instead of returning CLUTTER_X11_FILTER_CONTINUE always from
18617 clutter_x11_handle_event() return CLUTTER_X11_FILTER_REMOVE if
18618 the event was on a stage and translated to a ClutterEvent.
18620 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
18622 clutter/x11/clutter-event-x11.c | 26 +++++++++++++++++++++++---
18623 1 file changed, 23 insertions(+), 3 deletions(-)
18625 commit 8e88a487d997b305b63deb668b16f72f50c4850a
18626 Author: Robert Bragg <robert@linux.intel.com>
18627 Date: Sun Dec 21 21:12:43 2008 +0000
18629 [gitignore] Adds *.swn + *.swo (Vim files) & *.orig + *.reg (patch conflicts)
18631 .gitignore | 4 ++++
18632 1 file changed, 4 insertions(+)
18634 commit 3a6ffe3b7dacf82708392b4bd4f244a5ec28f66d
18635 Author: Robert Bragg <robert@linux.intel.com>
18636 Date: Sun Dec 21 21:08:10 2008 +0000
18638 [build] Replaces use of #include <cairo/cairo.h> with #include <cairo.h>
18640 The cairo pkg-config is crafted such that #include <cairo.h> should be used.
18641 If building with a private build of cairo installed to a custom prefix
18642 <cairo/cairo.h> can cause an un-intended cairo header to be picked up during
18643 compilation due to /usr/include being in the header search path.
18645 clutter/clutter-cairo-texture.h | 2 +-
18646 clutter/clutter-path.h | 2 +-
18647 2 files changed, 2 insertions(+), 2 deletions(-)
18649 commit c700d4c9a1019fb235e0a7919c2c6e21bdd458e6
18650 Author: Robert Bragg <robert@linux.intel.com>
18651 Date: Fri Dec 19 21:31:18 2008 +0000
18653 [tests] Ensures that test-viewport.c is built
18655 test-viewport.c wasn't listed correctly in the UNIT_TESTS variable
18656 (it was missing the .c extension, and so it wasn't being built.)
18658 tests/interactive/Makefile.am | 3 ++-
18659 1 file changed, 2 insertions(+), 1 deletion(-)
18661 commit a40666469d462d5bb24ce6ee7a8c5ccfc579c213
18662 Author: Robert Bragg <robert@linux.intel.com>
18663 Date: Fri Dec 19 21:22:45 2008 +0000
18665 [tests] Ensure that test-launcher.sh is found for out of tree builds
18667 When building out of tree the generated scripts for the unit tests
18668 need to explicitly reference the original src dir to be able to find
18669 test-launcher.sh, like this:
18670 $(top_srcdir)/tests/conform/test-launcher.sh
18672 Also test-launcher.sh now passes -m slow --verbose to gtester. Without
18673 -m slow then the wrappers dont work for some of the timeline tests.
18675 tests/conform/Makefile.am | 2 +-
18676 tests/conform/test-launcher.sh | 2 +-
18677 2 files changed, 2 insertions(+), 2 deletions(-)
18679 commit 4e493d1937e6e68e394dcb8a0ae7671dcc6d39e1
18680 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18681 Date: Fri Dec 19 18:21:36 2008 +0000
18683 Avoid masking math.h exported variables
18685 Our beloved math.h exports, from bits/mathcalls.h, a bare "y1" symbol.
18686 Apparently, it's unthinkable for code including <math.h> to also declare
18687 arguments or variable named "y0", "y1" and "yn".
18689 Anyway, the quick fix already used elsewhere in Clutter's codebase is
18690 to rename the colliding variables "y_0", "y_1" and "y_n" - and
18691 obviously everything similar to them as well, using the same pattern.
18693 clutter/clutter-path.c | 60 ++++++++++++++++++++++++++----------------------
18694 clutter/clutter-path.h | 24 +++++++++----------
18695 2 files changed, 44 insertions(+), 40 deletions(-)
18697 commit 42bba13135d97babd5c0a0ce3b65836d077fbd5a
18698 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18699 Date: Fri Dec 19 17:49:57 2008 +0000
18701 [docs] Remove a duplicate definition
18703 ClutterScriptable was defined twice inside the sections file.
18705 doc/reference/clutter/clutter-sections.txt | 1 -
18706 1 file changed, 1 deletion(-)
18708 commit c93cd4a096b9e37df5cdc01f0e49b8193034f73a
18709 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18710 Date: Fri Dec 19 17:48:30 2008 +0000
18712 [docs] Documentation fixes for CairoTexture
18714 Sync up the arguments name inside the gtk-doc annotations with their
18715 name inside the function declaration in the header file.
18717 clutter/clutter-cairo-texture.c | 18 +++++++++++++-----
18718 1 file changed, 13 insertions(+), 5 deletions(-)
18720 commit 2f230034255b6440fd442934f2997db1811e12f5
18721 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18722 Date: Fri Dec 19 17:44:24 2008 +0000
18726 Let's try to honour the coding style document, now that we have one.
18728 clutter/clutter-path.c | 91 ++++++++++++++++++++++++++++--------------------
18729 1 file changed, 54 insertions(+), 37 deletions(-)
18731 commit 81541e6940d70beaf68d856d870b96c74ddbfaac
18732 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18733 Date: Fri Dec 19 17:41:44 2008 +0000
18735 [docs] Parameter naming fixes
18737 The name of the parameter in the header and the one in the gtk-doc
18738 annotation on top of a function must match.
18740 Unfortunately, there is an index() function declared inside strings.h
18741 which makes gcc complain for the "index" argument as soon as we
18742 enable the extra compiler flags we use when distchecking.
18744 Hence, we need to rename "index" to "index_" in the header and in
18747 clutter/clutter-path.c | 34 +++++++++++++++++-----------------
18748 clutter/clutter-path.h | 2 +-
18749 2 files changed, 18 insertions(+), 18 deletions(-)
18751 commit 2e98fa46df84ba2b6dc4909c4638e493d889da3a
18752 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18753 Date: Fri Dec 19 17:30:50 2008 +0000
18755 [docs] Add last few missing symbols to the sections file
18757 doc/reference/clutter/clutter-sections.txt | 7 +++++++
18758 1 file changed, 7 insertions(+)
18760 commit cc52bbce0bca153bd2594a85eb4c0acb3707b762
18761 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18762 Date: Fri Dec 19 17:28:42 2008 +0000
18764 [docs] Add shader symbols to their sections
18766 doc/reference/clutter/clutter-sections.txt | 23 +++++++++++++++++++++++
18767 1 file changed, 23 insertions(+)
18769 commit 6a4a5e0a3b57f14368cd17833d34a8560e46886a
18770 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18771 Date: Fri Dec 19 17:25:18 2008 +0000
18773 [docs] Add ClutterPath unused symbols
18775 Add the symbols that gtk-doc can track to the sections file.
18777 doc/reference/clutter/clutter-sections.txt | 17 +++++++++++++++++
18778 1 file changed, 17 insertions(+)
18780 commit 4094590a528fc662091c030e3477e4eb6ba07aae
18781 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18782 Date: Fri Dec 19 17:21:30 2008 +0000
18784 [docs] Fix a typo in the binding pool section
18786 doc/reference/clutter/clutter-sections.txt | 2 +-
18787 1 file changed, 1 insertion(+), 1 deletion(-)
18789 commit 8d98c28dfa7d5be746f1aa8b351e4e8fea9ee3a7
18790 Merge: 5560157 64de041
18791 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18792 Date: Fri Dec 19 16:44:40 2008 +0000
18794 Merge branch 'cairo-texture'
18797 [cairo-texture] Remove the construct only restriction on surface size
18798 [cairo-texture] Silently discard 0x0 surfaces
18799 Re-indent ClutterPath header
18800 Add a test case for the new cairo path functions
18801 Add clutter_path_to_cairo_path and clutter_path_add_cairo_path
18802 Warn instead of returning in the IN_PAINT check
18803 Small documentation fixes
18804 Print a warning when creating a cairo_t while painting
18805 Do not set the IN_PAINT flag inside the Stage paint
18806 Set the IN_PAINT private flag
18807 [docs] Add ClutterCairoTexture to the API reference
18808 Add ClutterCairoTexture
18809 Require Cairo as a Clutter dependency
18813 Fix merge conflict in clutter/clutter-path.h
18815 commit 64de0411eaaffd5237c45475645005d282db05cf
18816 Author: Neil Roberts <neil@linux.intel.com>
18817 Date: Fri Dec 19 13:15:26 2008 +0000
18819 [cairo-texture] Remove the construct only restriction on surface size
18821 It is possible to change the surface size after construction with
18822 clutter_cairo_texture_set_surface_size so it doesn't seem right to
18823 restrict changing the properties.
18825 clutter_cairo_texture_resize_surface_internal is called in a handler
18826 for the notify signal. It is called there rather than directly in the
18827 set_property handler so that changing both properties in a single
18828 g_object_set will only cause one resize. The constructed override is
18831 resize_surface_internal will now bail out if the size of the surface
18832 is already the right size.
18834 clutter/clutter-cairo-texture.c | 30 ++++++++++++++++++++++--------
18835 1 file changed, 22 insertions(+), 8 deletions(-)
18837 commit cf5d69139d0ef7f380616e4eaf18fc82721f62f5
18838 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18839 Date: Fri Dec 19 13:42:17 2008 +0000
18841 [texture] Do not mix fixed point and units values
18843 Like we did for ClutterActor in commit cdb78ec4, fix ClutterTexture
18844 usage of CoglFixed and ClutterUnit values without conversion between
18847 clutter/clutter-texture.c | 40 ++++++++++++++++++++++++----------------
18848 1 file changed, 24 insertions(+), 16 deletions(-)
18850 commit f6e9a701e42ca4a01a41eaa7ab220bf48c23a49f
18851 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18852 Date: Fri Dec 19 13:03:53 2008 +0000
18854 [tests] Fix the actor detection
18856 The test-unproject interactive test assumed that only the rectangle was
18857 on the stage. As it turns out, labels can be picked as well.
18859 tests/interactive/test-unproject.c | 19 ++++++++++++-------
18860 1 file changed, 12 insertions(+), 7 deletions(-)
18862 commit cdb78ec4d2bdea875fb1b4514cf4ec0618e31a8e
18863 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18864 Date: Fri Dec 19 12:53:57 2008 +0000
18866 [units] Do not use fixed point and units interchangeably
18868 Clutter units are, at the moment, implemented as a value in fixed point
18869 notation using the same format as CoglFixed. This is, though, an
18870 implementation detail. For this reason, units should not be treated as
18871 CoglFixed values and should be converted to and from fixed point using
18872 the provided macros.
18874 This commit updates the usage of units and fixed point values in
18875 ClutterActor and rationalises some of the transformation code that
18876 heavily relied on the equivalency between them.
18878 clutter/clutter-actor.c | 569 +++++++++++++++++++++++++----------------------
18879 1 file changed, 298 insertions(+), 271 deletions(-)
18881 commit 5560157428e8fcfde5a903878eace9134475d318
18882 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18883 Date: Thu Dec 18 18:14:22 2008 +0000
18885 [docs] Fix a copy-and-paste typo in the coding style
18887 CODING_STYLE | 2 +-
18888 1 file changed, 1 insertion(+), 1 deletion(-)
18890 commit b63b1584bd24a625b226e46149a9353102ad8774
18891 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18892 Date: Thu Dec 18 17:56:11 2008 +0000
18894 [docs] Add coding style document
18896 We should formalise the current coding style of Clutter for
18897 third parties that wish to start hacking and contribute back
18900 CODING_STYLE | 379 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
18903 3 files changed, 385 insertions(+), 4 deletions(-)
18905 commit 5e0daa8ecd651a629b8a52eda6ba2fe5b915190d
18906 Author: Robert Bragg <robert@linux.intel.com>
18907 Date: Thu Dec 18 17:54:35 2008 +0000
18909 Improves tfp performance on Nvidia
18911 Some drivers (e.g. Nvidia) get upset if you try to create multiple glx pixmaps
18912 for the same server side pixmap object, even though you might have unique
18913 client side names, we now avoid hitting this problem by destroying the current
18914 glx pixmap early within clutter_glx_texture_pixmap_create_glx_pixmap.
18916 clutter/glx/clutter-glx-texture-pixmap.c | 7 +++++++
18917 1 file changed, 7 insertions(+)
18919 commit 9cd92fc540210b505b8db2819689ba582814b023
18920 Author: Neil Roberts <neil@linux.intel.com>
18921 Date: Thu Dec 18 17:40:36 2008 +0000
18923 [test-scale] Add a label showing the gravity
18925 A label is now displayed under the rectangle showing the current
18926 gravity. The text for the gravity is taken from the GEnumClass. This
18927 makes it easier to verify that the test is working correctly.
18929 tests/interactive/test-scale.c | 33 +++++++++++++++++++++++++--------
18930 1 file changed, 25 insertions(+), 8 deletions(-)
18932 commit 4168ed09de75d4bea08e206103e4eac3e1047d1c
18933 Author: Neil Roberts <neil@linux.intel.com>
18934 Date: Thu Dec 18 12:20:46 2008 +0000
18936 Fix calculation in clutter_cubic_bezier
18938 The calculation for cubic bezier curves had an extra multiplication by
18939 3 which was causing the curve to go over 1.0 very quickly. This had
18940 the affect of making test-animation appear to complete much before the
18941 completed signal is emitted.
18943 clutter/clutter-alpha.c | 10 +++++-----
18944 1 file changed, 5 insertions(+), 5 deletions(-)
18946 commit 2bf815131af32b8c5239425b8dacbacf29d503cf
18947 Author: Neil Roberts <neil@linux.intel.com>
18948 Date: Wed Dec 17 19:26:24 2008 +0000
18950 [clutter-interval] Fix calculation of interval for unsigned types
18952 The patch makes it cast to double before subtracting the original
18953 value from the target value. Otherwise if the target value is less
18954 than the original value then the subtraction will overflow and the
18955 factor will be multiplied by a very large number instead of the
18958 The problem is demonstrable using the border-width property of
18961 clutter/clutter-interval.c | 4 ++--
18962 1 file changed, 2 insertions(+), 2 deletions(-)
18964 commit e130e0c9b30ee688b6dcd9d1fece05ea88b558e7
18965 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18966 Date: Wed Dec 17 15:40:33 2008 +0000
18968 [cairo-texture] Silently discard 0x0 surfaces
18970 The current CairoTexture can be created with a surface size of 0
18971 by 0 pixels, but a warning will be printed.
18973 Worse, the surface can be resized to be 0 by 0 pixels without a
18974 warning. The :surface-width and :surface-height properties accept
18975 a minimum value of 0, and not check is performed on either the
18976 constructor or set_surface_size() parameters to enforce the "greater
18979 The correct and consistent behaviour is to allow a 0 by 0 pixels
18980 surface size everywhere; inside surface_resize_internal(), the
18981 current surface will be destroyed and if either :surface-width or
18982 :surface-height are set to 0, the resizing terminates.
18984 Attempting to create a Cairo context from a CairoTexture with
18985 either :surface-width or :surface-height set to 0 will result in
18990 - creating a CairoTexture with :surface-width or :surface-height
18991 set to zero and delaying the surface resize at a later point;
18992 - resizing the surface to 0 by 0 pixels to destroy the image
18993 surface used internally;
18994 - increase the consistency in the usage of CairoTexture.
18996 clutter/clutter-cairo-texture.c | 46 ++++++++++++++++++---------------------
18997 1 file changed, 21 insertions(+), 25 deletions(-)
18999 commit 140e4e1be29cfef0627177f91d5d9a2fd483f7e3
19000 Author: Neil Roberts <neil@linux.intel.com>
19001 Date: Wed Dec 17 14:47:23 2008 +0000
19003 Minor fix to documentation for clutter_actor_get_anchor_point
19005 In both versions of clutter_actor_get_anchor_point the description of
19006 the @anchor_y parameter was slightly wrong in different ways.
19008 clutter/clutter-actor.c | 6 +++---
19009 1 file changed, 3 insertions(+), 3 deletions(-)
19011 commit 335b650d0b74d02266dcabf3ba55422ecd613a39
19012 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19013 Date: Wed Dec 17 13:59:56 2008 +0000
19015 [tests] Create a real file for each test unit
19017 Currently, the conformance test suite creates symbolic links pointing
19018 to a wrapper script that just parses the name used to invoke it and
19019 calls the gtester with the correct path.
19021 Unfortunately, this presents two issues:
19023 - it does not really work on file systems that do not
19024 support symbolic links
19025 - it leaves behind the symbolic links, which cannot
19026 be automatically cleaning by 'make clean'
19028 Both can be solved by creating a small script that invokes the wrapper
19029 one with the test unit path.
19031 The Makefile will use test-conform to extract the unit test paths
19032 and generate a list that will be iterated over to create the
19033 executable name (using the "test-name" convention also used by the
19034 interactive tests, instead of "test_name"); the executable is then
19035 just a simple shell script that invokes the wrapper script passing
19036 the unit test path on the command line. The wrapper script will
19037 use the first argument to work correctly, so it could be simply
19040 ./test-wrapper.sh /path/to/unit_test
19042 Which is another improvement over the current implementation, where
19043 the wrapper script does not work when invoked directly.
19045 .gitignore | 68 ++++++++++++++--------------
19046 tests/conform/Makefile.am | 96 ++++++++++++++++++++++++----------------
19047 tests/conform/test-launcher.sh | 24 ++++++++++
19048 tests/conform/wrapper.sh | 18 --------
19049 4 files changed, 115 insertions(+), 91 deletions(-)
19051 commit 6b782ce4e720f07bd678ce613b81987fde13ff38
19052 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19053 Date: Tue Dec 16 15:53:57 2008 +0000
19055 Fix the selection behaviour around the 0th glyph
19057 After fixing the cursor position issues around the initial
19058 glyph of the layout, the selection position needs fixing as
19061 The fix is similar: check if the position of the selection
19062 is 0 and provide a fast path by setting the offset to 0.
19064 clutter/clutter-text.c | 11 +++++++++--
19065 1 file changed, 9 insertions(+), 2 deletions(-)
19067 commit ff92cc9766cfceb0cf390253b6c369099678691d
19068 Author: Neil Roberts <neil@linux.intel.com>
19069 Date: Tue Dec 16 15:39:53 2008 +0000
19071 Convert clutter_path_get_position to take a gdouble instead of an alpha value
19073 The gdouble value represents an interval along the path from 0.0 to
19074 1.0. This makes more sense than using an alpha value because paths are
19075 not directly related to ClutterAlphas and the rest of the Clutter API
19076 tends to expose gdouble arguments.
19078 clutter/clutter-behaviour-path.c | 5 ++++-
19079 clutter/clutter-path.c | 37 ++++++++++++++++++-------------------
19080 clutter/clutter-path.h | 2 +-
19081 tests/conform/test-path.c | 3 ++-
19082 4 files changed, 25 insertions(+), 22 deletions(-)
19084 commit d7ce56bb465735599de825d1545999999aa11125
19085 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19086 Date: Tue Dec 16 14:02:05 2008 +0000
19088 Support pango_layout_set_height() in ClutterText
19090 This is the port of the patch attached to bug 1266:
19092 ClutterLabel support for pango_layout_set_height()
19094 to the ClutterText actor. This patch adds support for the
19095 pango_layout_set_height() function inside the layout creation
19096 and caching, so that setting the height of a ClutterText will
19097 make PangoLayout try to fill out the given height before
19098 ellipsizing the contents of the ClutterText actor.
19100 The original patch is from Havoc Pennington.
19102 This commit ports the patch to ClutterText and applies a small
19103 change to the height computation pointed out by Behdad Esfahbod
19104 on GNOME's Bugzilla:
19106 http://bugzilla.gnome.org/show_bug.cgi?id=560931
19108 That the layout heights when doing a size request should be
19109 set to be G_MAXINT instead of -1.
19111 Unfortunately, the patch seems to break the conformance suite
19112 when setting the ellipsization on the layout.
19114 clutter/clutter-text.c | 149 +++++++++++++++++++++++++++++++-----------------
19115 1 file changed, 96 insertions(+), 53 deletions(-)
19117 commit ba586b46b304bbe3fe17b12b057574b8b1e08e32
19118 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19119 Date: Tue Dec 16 13:58:54 2008 +0000
19121 [tests] Make the layout cache fail at the right place
19123 The GTest report output allows the developer to know where exactly
19124 a test unit failure happened. The test-text-cache unit makes it
19125 very hard to pinpoint the exact failure location because it relies
19126 on the output to be printed out - which is not the case when the
19127 tests are run as part of a make check.
19129 This commit makes each sub-test inside the unit fail exactly where
19130 the check function fails, which makes it easier to know which sub-test
19133 tests/conform/test-text-cache.c | 38 ++++++++++++++++++++++++--------------
19134 1 file changed, 24 insertions(+), 14 deletions(-)
19136 commit d85a1cb5a1dfce2364ca604c9ad33855d48d73aa
19137 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19138 Date: Tue Dec 16 12:42:44 2008 +0000
19140 [docs] Add clutter_text_set_selection to gtk-doc
19142 Insert the newly added symbol to the ClutterText section in
19145 doc/reference/clutter/clutter-sections.txt | 1 +
19146 1 file changed, 1 insertion(+)
19148 commit a3fbdb594905cec0f822150b48c56837bc23dd73
19149 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19150 Date: Tue Dec 16 12:41:20 2008 +0000
19152 Add ClutterText::set_selection()
19154 The clutter_text_set_selection() function is a convenience
19155 method for setting the cursor position and the selection
19156 boundary to a given position in a single call, with sanity
19157 checks for the positions.
19159 clutter/clutter-text.c | 38 ++++++++++++++++++++++++++++++++++++++
19160 clutter/clutter-text.h | 3 +++
19161 2 files changed, 41 insertions(+)
19163 commit 2209e174328790b140bb4a43c53fcdf7436d4a75
19164 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19165 Date: Tue Dec 16 12:25:45 2008 +0000
19167 Fix ClutterText::get_selection()
19169 The clutter_text_get_selection() function was not checking the
19170 passed argument, and was still accessing the contents of the
19171 Text actor using clutter_text_get_text().
19173 This commit also adds the last few gtk-doc annotations missing
19176 clutter/clutter-text.c | 59 ++++++++++++++++++++++++++++++++++++++----------
19177 1 file changed, 47 insertions(+), 12 deletions(-)
19179 commit e28fb9ae103038e769553b488d1c084426edb966
19180 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19181 Date: Tue Dec 16 12:25:15 2008 +0000
19183 [docs] Add more gtk-doc annotations
19185 Almost reaching full documentation.
19187 clutter/clutter-text.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++-
19188 1 file changed, 49 insertions(+), 1 deletion(-)
19190 commit 4a43b582ac0de60464fbf0dfbebb26e549d452f6
19191 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19192 Date: Tue Dec 16 12:05:10 2008 +0000
19194 Use clutter_text_activate()
19196 Instead of repeating the same code for the ::activate signal
19197 emission, use the clutter_text_activate() function inside the
19198 'activate' key binding handler.
19200 clutter/clutter-text.c | 11 +----------
19201 1 file changed, 1 insertion(+), 10 deletions(-)
19203 commit 93d96dca52b21c63775a230f872de28fe0e0e3ea
19204 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19205 Date: Tue Dec 16 12:02:58 2008 +0000
19207 Add ClutterText::activate()
19209 The clutter_text_activate() function will emit the ::activate
19210 signal if the :activatable property is set.
19212 This function is useful for subclasses or application code, for
19213 example if we are going to use ::captured-event or ::key-press-event
19214 signal handlers to intercept the Return key and emit the ::activate
19217 clutter/clutter-text.c | 35 +++++++++++++++++++++++++++++++++++
19218 clutter/clutter-text.h | 1 +
19219 2 files changed, 36 insertions(+)
19221 commit 87f38475aed1827de5e48e0db0d5bff4ea1bcef5
19222 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19223 Date: Tue Dec 16 11:52:57 2008 +0000
19225 [docs] Add more gtk-doc annotations for ClutterText
19227 Document the ClutterText constructors and the :editable, :selectable
19228 and :activatable properties accessors.
19230 clutter/clutter-text.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++-
19231 1 file changed, 114 insertions(+), 2 deletions(-)
19233 commit e3ba2ddf0a0cdace9530ad8227fdd3a6a94bf36f
19234 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19235 Date: Tue Dec 16 11:30:47 2008 +0000
19237 [docs] Annotate properties and fix signals docs
19239 Annotate the properties without gtk-doc description, to get the
19242 Also, fix the ::cursor-event and ::activate signals documentation.
19244 clutter/clutter-text.c | 94 +++++++++++++++++++++++++++++++++++++++++++++---
19245 1 file changed, 89 insertions(+), 5 deletions(-)
19247 commit 32896d9aee66700f03417f3f88e0bba6d18d2e5c
19248 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19249 Date: Tue Dec 16 10:43:05 2008 +0000
19251 [docs] Add :cursor-size property accessors
19253 Add the ClutterText:cursor-size property accessors to the
19254 known gtk-doc symbols for the ClutterText section.
19256 doc/reference/clutter/clutter-sections.txt | 2 ++
19257 1 file changed, 2 insertions(+)
19259 commit 7ebb9ff6b7bc04d2a47a0d7202f7190ce41faa80
19260 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19261 Date: Tue Dec 16 10:39:52 2008 +0000
19263 Allow selecting with line-start and line-end bindings
19265 Instead of installing the line-start and line-end key bindings
19266 using the bare ClutterBindingPool API, we can use the internal
19267 clutter_text_add_move_binding(), which automatically installs
19268 the same key binding with the Shift modifier mask.
19270 This allows selecting when pressing Shift+Home or Shift+End.
19272 The selection behaviour is still incorrect around the zeroeth
19273 position, with all the text after the first line being selected.
19275 clutter/clutter-text.c | 37 ++++++++++++++++---------------------
19276 1 file changed, 16 insertions(+), 21 deletions(-)
19278 commit ea5a6abd9d599104ae4de7c0aecb529276d0d004
19279 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19280 Date: Tue Dec 16 10:37:45 2008 +0000
19282 Add :cursor-size property to ClutterText
19284 We can control the width of the cursor when painting by using
19287 The magic -1 number passed to the setter method will reset the
19288 cursor size to the default one of 2px.
19290 The getter method will return an unsigned integer with the
19293 clutter/clutter-text.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++-
19294 clutter/clutter-text.h | 3 ++
19295 2 files changed, 82 insertions(+), 1 deletion(-)
19297 commit ffb500d3a617ef3f0cfab4912c4ed4ca8c71599a
19298 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19299 Date: Tue Dec 16 10:19:56 2008 +0000
19301 Remove unused page up/down key bindings
19303 Moving the text by a "page" depends on being able to define a
19304 "page size" in terms of lines of text. Since we don't define
19305 something similar to an Adjustment that allows us to handle this
19306 behaviour, we should defer the paging implementation to a higher
19307 level class based on ClutterText.
19309 clutter/clutter-text.c | 35 -----------------------------------
19310 1 file changed, 35 deletions(-)
19312 commit dc49dab35074ca27fcccf015e8990270eeaa4185
19313 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19314 Date: Tue Dec 16 10:15:57 2008 +0000
19316 Fix line start and line end key binding behaviour
19318 Another fix for the key navigation behaviour around the zeroeth
19319 glyph in the layout.
19321 This commit adds a fast path for for the zero index when the
19322 cursor position is set as zero, in case we are using the line-start
19323 or line-end key bindings, similarly to what we did in commit
19324 be64cbcdc22952ce2fa9f902e153e3bd9f4a08c9 for the move-up and
19325 move-down bindings.
19327 clutter/clutter-text.c | 20 ++++++++++++--------
19328 1 file changed, 12 insertions(+), 8 deletions(-)
19330 commit be64cbcdc22952ce2fa9f902e153e3bd9f4a08c9
19331 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19332 Date: Mon Dec 15 18:46:08 2008 +0000
19334 Fix up/down key navigation
19336 The behaviour of ClutterText around the initial position is still
19337 a little bit erratic.
19339 This commit fixes the key navigation with Up and Down arrows around
19340 the first line of text.
19342 clutter/clutter-text.c | 24 ++++++++++++++++--------
19343 1 file changed, 16 insertions(+), 8 deletions(-)
19345 commit e615b8cc6bd6e77cc649e71db6ea62248e37a6cd
19346 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19347 Date: Mon Dec 15 18:24:42 2008 +0000
19349 Use units in position_to_coords()
19351 We loose precision with a direct conversion for PangoUnits to
19352 pixels, so we should do the conversion as needed, inside the
19353 callers of clutter_text_position_to_coords().
19355 clutter/clutter-text.c | 113 ++++++++++++++++++++++++++++++++++--------------
19356 1 file changed, 81 insertions(+), 32 deletions(-)
19358 commit 2714397fd517636461088f20521c80801b696b60
19359 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19360 Date: Mon Dec 15 18:23:25 2008 +0000
19362 Constify the cursor geometry in ::cursor-event
19364 We don't allow changing the cursor geometry inside the ::cursor-event
19365 signal handlers; for starters, it would make binding the signal a
19366 huge mess, and it would also potentially break the whole actor.
19368 clutter/clutter-text.h | 9 +++++----
19369 1 file changed, 5 insertions(+), 4 deletions(-)
19371 commit c68cf3564e4899f8a4f34326dee439b0ab7944f3
19372 Author: Neil Roberts <neil@linux.intel.com>
19373 Date: Mon Dec 15 16:32:21 2008 +0000
19375 [test-paint-wrapper] Use a separate paint guard for each actor
19377 Since commit c7c5cf9b ClutterCloneTexture causes an extra paint of the
19378 source actor during the paint run of the cloned texture if the source
19379 is not yet visible. When the stage is first shown it is redrawn
19380 immediatly before it is mapped which means get_paint_visibility will
19381 fail on the source actor so the inner paint will be run. The paint
19382 guards were a global variable so they didn't cope with a second actor
19385 The breakage didn't occur until commit d510a4b0 because
19386 get_paint_visibility was also broken.
19388 tests/interactive/test-paint-wrapper.c | 27 +++++++++++++++++++--------
19389 1 file changed, 19 insertions(+), 8 deletions(-)
19391 commit 2d166b250c0e0da33171f0d2f87735c965af50e9
19392 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19393 Date: Mon Dec 15 15:10:55 2008 +0000
19395 [docs] Add annotations for ClutterText structures
19397 ClutterText and ClutterTextClass were missing annotations for
19398 gtk-doc to pick up.
19400 clutter/clutter-text.h | 17 +++++++++++++++++
19401 1 file changed, 17 insertions(+)
19403 commit 39b575e6b43301354912d18a50b80085e8d92388
19404 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19405 Date: Mon Dec 15 15:08:12 2008 +0000
19407 Remove ClutterLabel and ClutterEntry
19409 Both ClutterLabel and ClutterEntry have been deprecated by
19412 clutter/clutter-entry.c | 1795 -----------------------------------------------
19413 clutter/clutter-entry.h | 165 -----
19414 clutter/clutter-label.c | 1347 -----------------------------------
19415 clutter/clutter-label.h | 128 ----
19416 4 files changed, 3435 deletions(-)
19418 commit ca310d49cab2b021471d4d094c1802fee7d705af
19419 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19420 Date: Mon Dec 15 15:00:37 2008 +0000
19422 Re-indent ClutterPath header
19424 Match the indentation and style of the other Clutter headers.
19426 clutter/clutter-path.h | 240 +++++++++++++++++++++---------------------------
19427 1 file changed, 103 insertions(+), 137 deletions(-)
19429 commit f6feed43863f6c42d6204e5006f92937a0709756
19430 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19431 Date: Mon Dec 15 14:29:59 2008 +0000
19433 Fix a typo in the ClutterParamSpecFixed declaration
19435 The ClutterParamSpecFixed constructor is declared in the header
19436 as taking ClutterFixed values, but the implementation takes
19437 ClutterUnit values instead. This obviously works because fixed
19438 and units are exactly the same type.
19440 This commit fixes the wrong parameters.
19442 clutter/clutter-fixed.c | 12 ++++++------
19443 1 file changed, 6 insertions(+), 6 deletions(-)
19445 commit b2f4363d95a9c70ca66c533bd068eb6e1994d0c0
19446 Author: Emmanuele Bassi <ebassi@gnome.org>
19447 Date: Sat Dec 13 11:53:03 2008 +0000
19449 Remove a double semi-colon typo
19451 Fixes bug 1351 - Extra ; in clutter-behaviour-ellipse.c
19453 Thanks to Haakon Sporsheim.
19455 clutter/clutter-behaviour-ellipse.c | 2 +-
19456 1 file changed, 1 insertion(+), 1 deletion(-)
19458 commit 4e0073cd508ad55c8d6b6d031f060ae9644620c2
19459 Author: Neil Roberts <neil@linux.intel.com>
19460 Date: Fri Dec 12 22:47:46 2008 +0000
19462 Fix the gtk-doc for some properties in ClutterActor
19464 Some of the properties were specified as ClutterActor::property (with
19465 two colons) but gtk-doc expects one colon so the documentation is not
19468 clutter/clutter-actor.c | 20 ++++++++++----------
19469 1 file changed, 10 insertions(+), 10 deletions(-)
19471 commit cd1992181c13fcb94ef8d952845017b7901e6e3c
19472 Author: Neil Roberts <neil@linux.intel.com>
19473 Date: Fri Dec 12 17:38:53 2008 +0000
19475 Fix the definition of clutter_actor_set_scale to match the declaration
19477 Trivial change to declare the parameter as gdouble instead of double
19478 so that it matches the header.
19480 clutter/clutter-actor.c | 4 ++--
19481 1 file changed, 2 insertions(+), 2 deletions(-)
19483 commit 965ec2762000543998e83e07f2f4690830231e2a
19484 Author: Neil Roberts <neil@linux.intel.com>
19485 Date: Fri Dec 5 18:37:46 2008 +0000
19487 Add a test case for the new cairo path functions
19489 The nodes of the test path have been reordered because Cairo coalesces
19490 multiple move operations into a single move so the comparison would
19491 fail if the two move nodes are consecutive.
19493 tests/conform/test-path.c | 104 ++++++++++++++++++++++++++++++++++++++++++---
19494 1 file changed, 99 insertions(+), 5 deletions(-)
19496 commit a462d19e1438dcb738362e63ddcb30a77ba5cdc2
19497 Author: Neil Roberts <neil@linux.intel.com>
19498 Date: Fri Dec 5 18:37:31 2008 +0000
19500 Add clutter_path_to_cairo_path and clutter_path_add_cairo_path
19504 Added doc for new cairo path functions to clutter-sections.txt
19506 clutter/clutter-path.c | 115 ++++++++++++++++++++++++++++
19507 clutter/clutter-path.h | 7 ++
19508 doc/reference/clutter/clutter-sections.txt | 2 +
19509 3 files changed, 124 insertions(+)
19511 commit 0e1a3c21248cf3ab14211bee8c93e0677769a723
19512 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19513 Date: Fri Dec 12 11:42:16 2008 +0000
19515 Warn instead of returning in the IN_PAINT check
19517 It's conceivable that a warning should be deemed enough, instead
19518 of just returning a NULL cairo_t when creating a context for the
19519 CairoTexture actor.
19521 clutter/clutter-cairo-texture.c | 11 ++++++-----
19522 1 file changed, 6 insertions(+), 5 deletions(-)
19524 commit 4d34872deab56c9b341742386c1740bf15b2a83c
19525 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19526 Date: Thu Dec 11 15:51:24 2008 +0000
19528 Small documentation fixes
19530 Fix the CairoTexture description, and some of the comments inside
19531 the code, especially with regards to the alpha channel unpremultiplication
19532 that we have to perform each time we upload the image surface to
19535 clutter/clutter-cairo-texture.c | 15 +++++++++++----
19536 1 file changed, 11 insertions(+), 4 deletions(-)
19538 commit cf9dea7cf6e079a8897c7b0d92da030c88cb964f
19539 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19540 Date: Thu Dec 11 15:48:43 2008 +0000
19542 Print a warning when creating a cairo_t while painting
19544 If you create a Cairo context in the middle of a paint run and then
19545 you destroy it, the CairoTexture will have to upload the contents of
19546 the image surface to the GL pipeline. This usually leads to slow
19547 downs and general performance degradation.
19549 ClutterCairoTexture will warn to the console if Clutter has been
19550 compiled with the debug messages and if create() or create_region()
19551 are called while an actor is in the middle of a paint.
19553 clutter/clutter-cairo-texture.c | 19 +++++++++++++++++--
19554 1 file changed, 17 insertions(+), 2 deletions(-)
19556 commit 1b88122873afac513449b03c0658ab3802c84f3d
19557 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19558 Date: Thu Dec 11 15:41:25 2008 +0000
19560 Do not set the IN_PAINT flag inside the Stage paint
19562 Since the CLUTTER_ACTOR_IN_PAINT private flag is set as part
19563 of the paint process by clutter_actor_paint(), there is no
19564 need to set it inside the ClutterStage paint function.
19566 clutter/clutter-stage.c | 4 ----
19567 1 file changed, 4 deletions(-)
19569 commit 3f2c9fe6b31af32ad643cce9154e17096eed432c
19570 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19571 Date: Thu Dec 11 15:39:28 2008 +0000
19573 Set the IN_PAINT private flag
19575 When calling clutter_actor_paint() we should be setting the
19576 CLUTTER_ACTOR_IN_PAINT private flag. This allows signalling
19577 to each Actor subclass that we are effectively in the middle
19578 of a paint sequence. Actor subclasses can check for this
19579 private flag and act based on its presence - for instance to
19580 avoid recursion, or to detect performance degradation cases.
19582 clutter/clutter-actor.c | 6 ++++++
19583 1 file changed, 6 insertions(+)
19585 commit 99bcf731cb168846de1bf922285f52bcb3c40a81
19586 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19587 Date: Thu Dec 11 15:37:21 2008 +0000
19589 [docs] Add ClutterCairoTexture to the API reference
19591 doc/reference/clutter/clutter-docs.xml | 1 +
19592 doc/reference/clutter/clutter-sections.txt | 29 ++++++++++++++++++++++++++++
19593 doc/reference/clutter/clutter.types | 1 +
19594 3 files changed, 31 insertions(+)
19596 commit e934ad03ca7880561dd282d8cc6abc29ba0c00f5
19597 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19598 Date: Thu Dec 11 15:24:07 2008 +0000
19600 Add ClutterCairoTexture
19602 Move the ClutterCairo actor from a separate library to an in-tree
19605 ClutterCairoTexture is a simple texture subclass that allows you
19606 to retrieve a Cairo context for a private image surface. When the
19607 Cairo context is destroyed it will cause the image surface
19608 contents to be uploaded to a GL texture.
19610 The image surface used is not hardware accelerated.
19612 clutter/Makefile.am | 2 +
19613 clutter/clutter-cairo-texture.c | 721 +++++++++++++++++++++++++++++++++++++++
19614 clutter/clutter-cairo-texture.h | 92 +++++
19615 clutter/clutter.h | 1 +
19616 4 files changed, 816 insertions(+)
19618 commit 49e762a291cb38873ecb5992c1d6d3e91f9ae9c8
19619 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19620 Date: Thu Dec 11 15:22:42 2008 +0000
19622 Require Cairo as a Clutter dependency
19624 Cairo has been an indirect dependency for Clutter since 0.8, through
19625 the PangoCairo API.
19627 Now we explicitly depend on Cairo in order to merge the clutter-cairo
19628 API into Clutter core.
19630 configure.ac | 2 +-
19631 1 file changed, 1 insertion(+), 1 deletion(-)
19633 commit c8dbbfaacff5b3d6ed2f9b28b65a10e15241dc0f
19634 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19635 Date: Thu Dec 11 15:01:28 2008 +0000
19637 [docs] Update the API reference
19639 Add all the unused API to the sections file; there are still
19640 some undocumented bits, but clutter-unused.txt is empty for
19643 Also, add ClutterText to the main XML document and remove
19644 ClutterLabel and ClutterEntry.
19646 doc/reference/clutter/Makefile.am | 1 +
19647 doc/reference/clutter/clutter-docs.xml | 3 +-
19648 doc/reference/clutter/clutter-sections.txt | 131 +++++++++++++++++++++++++++-
19649 doc/reference/clutter/clutter.types | 3 +-
19650 4 files changed, 132 insertions(+), 6 deletions(-)
19652 commit a50dfefbc33a8c0b0c7189058f4f7f521707a8fc
19653 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19654 Date: Thu Dec 11 15:00:22 2008 +0000
19656 Fix documentation issues
19658 Provide a description for the ClutterText section, and fix some
19659 misnamed arguments inside the header file.
19661 clutter/clutter-text.c | 16 ++++++++++++++++
19662 clutter/clutter-text.h | 4 ++--
19663 2 files changed, 18 insertions(+), 2 deletions(-)
19665 commit 0ac15903781b8deb9339027bdd4db2982f2629f3
19666 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19667 Date: Thu Dec 11 14:57:46 2008 +0000
19669 Lazily create the PangoContext on Text::init
19671 If we create the PangoContext for ClutterText inside the class
19672 initialization we might not have a Clutter main context yet.
19674 Ideally, we should store the Pango context inside the main context
19675 and create it on clutter_init(), but for now we can lazily create
19676 the PangoContext when we initialize a ClutterText instance for the
19679 clutter/clutter-text.c | 5 +++--
19680 1 file changed, 3 insertions(+), 2 deletions(-)
19682 commit 5a1837bc9ef117d47cc9e6dbea66245c95027a4f
19683 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19684 Date: Thu Dec 11 13:49:39 2008 +0000
19686 Remove ClutterEntry and ClutterLabel from the build
19688 For the time being, just don't include them or compile them; the
19689 files will be removed from the repository as soon as all the
19690 documentation annotations have been ported over to ClutterText.
19692 clutter/Makefile.am | 4 ----
19693 clutter/clutter.h | 2 --
19694 2 files changed, 6 deletions(-)
19696 commit ffa37dec2067ae69d2850a611758ea4d4ea48d0b
19697 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19698 Date: Thu Dec 11 13:48:45 2008 +0000
19700 Update the micro-bench tests to ClutterText
19702 Test the ClutterText rendering speed instead of ClutterLabel's.
19704 tests/micro-bench/test-text.c | 6 +++---
19705 1 file changed, 3 insertions(+), 3 deletions(-)
19707 commit 5c14044e5216274cd806122e9ac2550ebb39d9bf
19708 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19709 Date: Thu Dec 11 13:48:01 2008 +0000
19711 Update the interactive tests to ClutterText
19713 Instead of using ClutterLabel, use ClutterText to display some
19716 tests/interactive/test-clip.c | 4 ++--
19717 tests/interactive/test-cogl-tex-polygon.c | 14 ++++++------
19718 tests/interactive/test-depth.c | 10 ++++-----
19719 tests/interactive/test-easing.c | 8 +++----
19720 tests/interactive/test-fbo.c | 4 ++--
19721 tests/interactive/test-layout.c | 4 ++--
19722 tests/interactive/test-multistage.c | 8 +++----
19723 tests/interactive/test-project.c | 4 ++--
19724 tests/interactive/test-random-text.c | 2 +-
19725 tests/interactive/test-rotate.c | 4 ++--
19726 tests/interactive/test-shader.c | 2 +-
19727 tests/interactive/test-stage-read-pixels.c | 6 ++---
19728 tests/interactive/test-unproject.c | 33 ++++++++++++++--------------
19729 13 files changed, 51 insertions(+), 52 deletions(-)
19731 commit 24a616368845de3b2e1ee4c335f3051411dfecd6
19732 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19733 Date: Thu Dec 11 13:45:22 2008 +0000
19735 Do not compile the opacity and entry interactive tests
19737 The test-opacity interactive test is superceded by the equivalent
19738 units inside the conformance test suite.
19740 The test-entry interactive test is superceded by the test-text one.
19742 tests/interactive/Makefile.am | 2 --
19743 1 file changed, 2 deletions(-)
19745 commit 45de6df615c5573c38d635fd95c1bb06066e2c82
19746 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19747 Date: Thu Dec 11 13:39:35 2008 +0000
19751 Add the conformance test units for ClutterText.
19753 .gitignore | 13 +++++++++++++
19754 1 file changed, 13 insertions(+)
19756 commit edd6b65743132648172b2bfa99eb69be82fd1971
19757 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19758 Date: Thu Dec 11 12:26:47 2008 +0000
19760 Update the paint opacity unit test
19762 ClutterText behaviour with regards to the paint opacity has been
19763 changed by commit 07e19fff5ffa9617413fa6c3715914513fec3793.
19765 We need to update the test suite for the paint opacity to reflect
19766 that change as well.
19768 tests/conform/test-paint-opacity.c | 36 ++++++++++++++++++------------------
19769 1 file changed, 18 insertions(+), 18 deletions(-)
19771 commit 786bc4d4d5741b799d7da2a86cd584600a3a2993
19772 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19773 Date: Thu Dec 11 12:24:45 2008 +0000
19775 Allow only synthetic events with keyval 0
19777 We allow KeyEvents with a key symbol of '0' to fall through only
19778 if they are marked as synthetic. Otherwise we discard them without
19781 Synthetic events are useful to test ClutterText behaviour; in fact,
19782 we do use them inside the test suite exactly for that reason.
19784 clutter/clutter-text.c | 24 ++++++++++++++++++++----
19785 1 file changed, 20 insertions(+), 4 deletions(-)
19787 commit 77b3b9d5f494bb193611004456dd8f025e379c18
19788 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19789 Date: Thu Dec 11 12:21:57 2008 +0000
19791 Do not use contractions when not needed
19793 I understand we are not Pascal developers, and we don't have to
19794 use cute and cuddly names like "i_am_an_integer_counter", but
19795 a ClutterButtonEvent should be stored inside an "event" variable.
19796 Using "bev" instead? Mmmh, not so much.
19798 clutter/clutter-text.c | 6 +++---
19799 1 file changed, 3 insertions(+), 3 deletions(-)
19801 commit 2ca7cb46f95ec49e1016ddb880f2fd9ff6cc8c25
19802 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19803 Date: Thu Dec 11 12:18:26 2008 +0000
19805 Use the paint opacity when painting a ClutterText
19807 ClutterText should use the paint opacity for both text and
19810 ClutterLabel had the wrong behaviour, as it set the actor's
19811 opacity using the text color's alpha channel, and ClutterEntry
19812 completely disregarded the actor's opacity when painting the
19815 This commit harmonizes the ClutterText behaviour to always
19816 use a composition of the actor's paint opacity and the text
19817 and cursor alpha channel values, thus behaving more
19818 consistently with the rest of Clutter.
19820 clutter/clutter-text.c | 21 ++++++++++++++++++---
19821 1 file changed, 18 insertions(+), 3 deletions(-)
19823 commit e9c369f86d0eea327458cc4bd7b9bc750960a09f
19824 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19825 Date: Thu Dec 11 12:17:11 2008 +0000
19827 Add documentation annotations
19829 ClutterText is heavily under-documented. This commit ports most of
19830 the API documentation from ClutterLabel and ClutterEntry to
19833 clutter/clutter-text.c | 192 +++++++++++++++++++++++++++++++++++++++++++++++-
19834 1 file changed, 188 insertions(+), 4 deletions(-)
19836 commit cfb60228313d16c3a373e8d39b6c05e310ab4ef4
19837 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19838 Date: Thu Dec 11 12:15:49 2008 +0000
19842 Fix the arguments alignment whenever not consistent with the
19843 coding style rules.
19845 clutter/clutter-text.c | 24 ++++++++++++------------
19846 1 file changed, 12 insertions(+), 12 deletions(-)
19848 commit 7a93bcb64eef54c1fae50129111a2d810ad4f622
19849 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19850 Date: Thu Dec 11 12:14:53 2008 +0000
19852 Remove unused types
19854 Since ClutterText now uses ClutterBindingPool there is no more
19855 need for the internal key mapping types.
19857 clutter/clutter-text.c | 2 --
19858 1 file changed, 2 deletions(-)
19860 commit 06b00f9dfcaa35acf01723fce0e5e224acdadba7
19861 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19862 Date: Thu Dec 11 12:13:26 2008 +0000
19864 Remove units for Entry and Label
19866 ClutterText should supercede all unit tests for ClutterLabel and
19869 tests/conform/Makefile.am | 5 +-
19870 tests/conform/test-clutter-entry.c | 370 ------------------------------------
19871 tests/conform/test-conform-main.c | 16 +-
19872 tests/conform/test-label-cache.c | 276 ---------------------------
19873 tests/conform/test-text-cache.c | 276 +++++++++++++++++++++++++++
19874 5 files changed, 279 insertions(+), 664 deletions(-)
19876 commit f13e00b41189fafb2eebd3df214e19db9fb107b7
19877 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19878 Date: Thu Dec 11 12:10:46 2008 +0000
19880 Truncate selections on text insertion
19882 When inserting text on a key press event we should also truncate
19885 We should not truncate the selection when inserting any Unicode
19886 character, since changing the selection also changes the cursor
19887 position - and one of the invariants we inherited from ClutterEntry
19888 is that inserting characters programmatically does not change the
19891 clutter/clutter-text.c | 6 ++++--
19892 1 file changed, 4 insertions(+), 2 deletions(-)
19894 commit 35172a7615afa88eea20eee83634e8a07d701d5c
19895 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19896 Date: Thu Dec 11 12:08:20 2008 +0000
19898 Change the binding propagation when truncating a selection
19900 If a selection has been truncated inside a key binding handler,
19901 we should just return and let the usual key event handler continue.
19903 This fixes the case where we deleted a selection using the Delete
19904 or the Backspace keys.
19906 clutter/clutter-text.c | 4 ++--
19907 1 file changed, 2 insertions(+), 2 deletions(-)
19909 commit ec4c15f8e71faee23b9b92cd49cb2a011750775b
19910 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19911 Date: Thu Dec 11 12:07:20 2008 +0000
19913 Comment out the mapping API
19915 The test-text interactive test for ClutterText should not use
19916 the mapping API, since ClutterText does not have it anymore.
19918 tests/interactive/test-text.c | 2 ++
19919 1 file changed, 2 insertions(+)
19921 commit eae98800d2fd45cacbab9f82fb9345e7f23ea517
19922 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19923 Date: Thu Dec 11 12:03:17 2008 +0000
19925 Use ClutterBindPool inside ClutterText
19927 ClutterText should use the newly added ClutterBindingPool API to
19928 handle key events, instead of its homegrown code.
19930 This commit removes the action/mapping code and defers the entire
19931 key binding matching to a ClutterBindingPool created inside the
19932 Text class initialization function.
19934 clutter/clutter-text.c | 973 ++++++++++++++++++++++--------------------------
19935 clutter/clutter-text.h | 20 -
19936 2 files changed, 444 insertions(+), 549 deletions(-)
19938 commit b1c366a143eb1db68b46cb235e43761dfbb93745
19939 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19940 Date: Thu Dec 11 11:59:50 2008 +0000
19942 Add Text::get_chars() implementation and tests
19944 The clutter_text_get_chars() function returns a section of the
19945 contents of the Text actor, delimited by a start and an end position.
19947 This commit adds the implementation for that function and a test
19948 unit that guarantees the offset-to-bytes computations are correct.
19950 clutter/clutter-text.c | 35 ++++++++++++++++++++++++++++++++++-
19951 tests/conform/test-clutter-text.c | 31 +++++++++++++++++++++++++++++++
19952 tests/conform/test-conform-main.c | 7 +------
19953 3 files changed, 66 insertions(+), 7 deletions(-)
19955 commit 2fedd3263c4291aa2860e26ebface29913f909e7
19956 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19957 Date: Thu Dec 11 11:57:46 2008 +0000
19959 Do not namespace internal data structures
19961 Since the internal data structures are not exported (duh!), we
19962 can eschew the namespacing and save us some characters.
19964 clutter/clutter-text.c | 8 ++++----
19965 1 file changed, 4 insertions(+), 4 deletions(-)
19967 commit e93a7e243c3c43be59fbbfacaae9a55c5dd923a0
19968 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19969 Date: Thu Dec 11 11:56:44 2008 +0000
19971 Add comments in the test suite
19973 Comment why we need to enable the editability of the Text actor
19974 inside the test suite.
19976 This should clarify commit ea508ea528d61ae478d8bc4c88f54a89304f18e8
19978 tests/conform/test-clutter-text.c | 4 ++++
19979 1 file changed, 4 insertions(+)
19981 commit 4a1f4d6f9aa3c89750e9eac5f4d95f799d2d2291
19982 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19983 Date: Thu Dec 11 11:55:39 2008 +0000
19985 Move internal data structures on top
19987 Try to keep the declarations section of the source files clean and
19988 possibly consistent.
19990 clutter/clutter-text.c | 30 +++++++++++++++++-------------
19991 1 file changed, 17 insertions(+), 13 deletions(-)
19993 commit d84a88ac3b2a7dbc528c7f00a2dd0fc877d37783
19994 Author: Emmanuele Bassi <ebassi@linux.intel.com>
19995 Date: Thu Dec 11 11:54:32 2008 +0000
19997 Coding style consistency
19999 Channel mitch's spirit.
20001 This is also how I get to have the highest commit count on Clutter's
20004 clutter/clutter-text.c | 126 ++++++++++++++++++++++++------------------------
20005 1 file changed, 63 insertions(+), 63 deletions(-)
20007 commit d10f7127a2c07cf80c10c35eeacaa4b20269f740
20008 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20009 Date: Thu Dec 11 11:54:07 2008 +0000
20011 Implement Text:max-length
20013 The :max-length property establishes the maximum available
20014 length for the Text actor's contents, in characters.
20016 clutter/clutter-text.c | 42 +++++++++++++++++++++++++++---------------
20017 1 file changed, 27 insertions(+), 15 deletions(-)
20019 commit 191d1aebff0dce424f67a4ac9065570d35f519b7
20020 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20021 Date: Thu Dec 11 11:51:28 2008 +0000
20023 Update the ClutterText test unit
20025 Whenever we are sending specially crafted KeyEvents to a ClutterText
20026 we also need to set it editable, since the event handling code depends
20027 on the editability setting.
20029 tests/conform/test-clutter-text.c | 44 +++++++++++++++++++++----------------
20030 1 file changed, 25 insertions(+), 19 deletions(-)
20032 commit 1ff02f570e0dd214ffc4a29d82b8876b362d74f9
20033 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20034 Date: Thu Dec 11 11:50:02 2008 +0000
20036 Use the stored contents length in ::delete_chars()
20038 Instead of recomputing it, we can reuse the contents length we
20039 compute and store inside clutter_text_set_text().
20041 clutter/clutter-text.c | 2 +-
20042 1 file changed, 1 insertion(+), 1 deletion(-)
20044 commit 4cc57bdc4178571c7c296b09d09b8da93c828ead
20045 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20046 Date: Thu Dec 11 11:49:45 2008 +0000
20048 Improve the safety checks inside the text setters
20050 We should check that the contents of the Text actor are
20051 not NULL when computing the offsets in bytes.
20053 clutter/clutter-text.c | 27 +++++++++++++--------------
20054 1 file changed, 13 insertions(+), 14 deletions(-)
20056 commit c72722df8ce3d3c91a26b8fc41cb7af9c6b6d864
20057 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20058 Date: Thu Dec 11 11:49:14 2008 +0000
20060 Add :cursor-color-set property declaration
20062 The :cursor-color-set property is a read-only property that
20063 reflects whether the ClutterText actor is going to use the
20064 color set inside the :cursor-color property when painting
20067 clutter/clutter-text.c | 15 +++++++++++++--
20068 1 file changed, 13 insertions(+), 2 deletions(-)
20070 commit bdb0cc462d547c0e553c02f1692f35e60034d338
20071 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20072 Date: Thu Dec 11 11:48:17 2008 +0000
20074 General whitespace fixes in ClutterText
20076 Let's keep whitespace fixes to their own commit to avoid
20077 polluting git-blame.
20079 clutter/clutter-text.c | 105 ++++++++++++++++++++++++++++--------------------
20080 1 file changed, 62 insertions(+), 43 deletions(-)
20082 commit 7fa93ebe9ed7be18a6dba6174020434759db691b
20083 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20084 Date: Thu Dec 11 11:47:06 2008 +0000
20086 Replace offset_to_bytes() implementation
20088 We should re-use the offset_to_bytes() implementation from ClutterEntry
20089 as it guaranteed some behaviour and sanity checks that we want to keep
20090 inside ClutterText.
20092 clutter/clutter-text.c | 46 +++++++++++++++++++++++++++++++++++++++-------
20093 1 file changed, 39 insertions(+), 7 deletions(-)
20095 commit 94789e3cc3c84acbb63cc3e83a8fb949dd5186f5
20096 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20097 Date: Thu Dec 11 11:45:37 2008 +0000
20099 Add a separate test unit for ClutterText
20101 Instead of changing the unit for ClutterEntry, we add a new
20102 test unit specifically for ClutterText so that we can later tweak
20103 it specifically for the behaviour changes needed to make ClutterText
20106 tests/conform/Makefile.am | 3 +-
20107 tests/conform/test-clutter-entry.c | 2 +-
20108 tests/conform/test-clutter-text.c | 370 ++++++++++++++++++++++++++++++++++++
20109 tests/conform/test-conform-main.c | 17 ++
20110 4 files changed, 390 insertions(+), 2 deletions(-)
20112 commit 9169dff794889a9533f1cf778d452fdfdcc4edae
20113 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20114 Date: Thu Dec 11 11:43:56 2008 +0000
20116 Add text editing methods
20118 Port the text editing methods from ClutterEntry, so that
20119 ClutterText exposes the same API.
20121 clutter/clutter-text.c | 100 +++++++++++++++++++++++++++++++++++++++++-------
20122 1 file changed, 86 insertions(+), 14 deletions(-)
20124 commit 74257dfa273a6f283e01bdc91d5a74dea0bf38e0
20125 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20126 Date: Thu Dec 11 11:43:37 2008 +0000
20128 Add missing basic constructor
20130 ClutterText should have an empty constructor, mostly for
20131 bindings to use, that just proxies call to g_object_new()
20132 without setting any property.
20134 clutter/clutter-text.c | 6 ++++++
20135 clutter/clutter-text.h | 1 +
20136 2 files changed, 7 insertions(+)
20138 commit 7af992974e08707d583cdb94d7353e4e64ee5633
20139 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20140 Date: Thu Dec 11 11:42:33 2008 +0000
20142 Initialize the cursor position
20144 By default, the cursor position is initialized to -1, meaning
20145 "place the cursor always at the end of the text".
20147 clutter/clutter-text.c | 2 ++
20148 1 file changed, 2 insertions(+)
20150 commit d5df1bebcf28cb035ea9529fbc1352c8300f7e25
20151 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20152 Date: Thu Dec 11 11:40:55 2008 +0000
20154 Add text-visibility accessors for ClutterText
20156 A ClutterText can be put in "password mode" by setting the
20157 text as "invisible": every character inside the Text actor's
20158 contents will be replaced when building the Pango layout with
20159 a specific Unicode character.
20161 The Unicode character is set to '*' by default, but the user
20162 can be changed using the provided API.
20164 clutter/clutter-text.c | 654 +++++++++++++++++++++++++++++++++++-------------
20165 clutter/clutter-text.h | 21 +-
20166 2 files changed, 495 insertions(+), 180 deletions(-)
20168 commit 64af7bafe387571d7087dd4c99b4f459c1ca41c0
20169 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20170 Date: Thu Dec 11 11:37:46 2008 +0000
20172 Move test-threads to ClutterText
20174 The test-threads interactive test is a good candidate for the
20175 switch from ClutterLabel to ClutterText to verify that the
20176 behaviour of the two classes is the same.
20178 tests/interactive/test-threads.c | 10 +++++-----
20179 1 file changed, 5 insertions(+), 5 deletions(-)
20181 commit 97cf7e68199f9ac901777f7c68b5475373d5a4eb
20182 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20183 Date: Thu Dec 11 11:35:52 2008 +0000
20185 Correctly initialize the initial state of ClutterText
20187 Some of the values in ClutterText have an initial state that
20188 does not match a zero-ed out ClutterTextPrivate structure.
20190 clutter/clutter-text.c | 27 +++++++++++++++++++++++----
20191 1 file changed, 23 insertions(+), 4 deletions(-)
20193 commit fc168a34823567caead8e7cbfcf91b3f47b229e8
20194 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20195 Date: Thu Dec 11 11:33:10 2008 +0000
20197 Merge the ClutterLabel properties into ClutterText
20199 ClutterText should have the same properties as ClutterLabel.
20201 While at it, we can finally fix the disconnect between the wrap
20202 and wrap-mode properties and its accessors, that we perpetuated
20205 The ClutterText:line-wrap property and ClutterText:line-wrap-mode
20206 are mapped to the set_line_wrap(), get_line_wrap() and
20207 set_line_wrap_mode(), get_line_wrap_mode() accessor functions
20208 respectively. This should simplify bindings the Vala ones that
20209 map a property into a method.
20211 clutter/clutter-text.c | 1312 ++++++++++++++++++++++++++++++++----------------
20212 1 file changed, 886 insertions(+), 426 deletions(-)
20214 commit c5f51f7027dbbac373587621a52fc6f95f529e69
20215 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20216 Date: Thu Dec 11 11:31:48 2008 +0000
20218 Add Text::get_chars() method declaration
20220 Add the declaration for a clutter_text_get_chars() function that
20221 returns a portion of the contents of a Text actor.
20223 clutter/clutter-text.h | 3 +++
20224 1 file changed, 3 insertions(+)
20226 commit 430d1cf347beeaa619651f2a227d00e053b6b2da
20227 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20228 Date: Thu Dec 11 11:22:46 2008 +0000
20230 Add Actor::grab_key_focus() method
20232 Bug 1003 - Add clutter_actor_take_key_focus()
20234 The grab_key_focus() method is just a simple wrapper around
20235 clutter_stage_take_key_focus() that removes the need to get
20236 the ClutterStage of an actor in order to set the key focus.
20238 Based on a patch by Xan López.
20240 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
20241 Signed-off-by: Øyvind Kolås <pippin@linux.intel.com>
20243 clutter/clutter-actor.c | 25 +++++++++++++++++++++++++
20244 clutter/clutter-actor.h | 2 ++
20245 2 files changed, 27 insertions(+)
20247 commit 40fb75052ba11b80b41590f17ab3b194df11ae3f
20248 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20249 Date: Thu Dec 11 11:21:39 2008 +0000
20251 Merge Label and Entry API into ClutterText
20253 ClutterText should expose both ClutterLabel and ClutterEntry
20254 functionality using an API that matches the one provided by
20257 clutter/clutter-text.h | 150 ++++++++++++++++++++++++++++++++----------------
20258 1 file changed, 99 insertions(+), 51 deletions(-)
20260 commit 437f96982e5754f25630570818d4a5173bd9a8ce
20261 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20262 Date: Thu Dec 11 11:20:14 2008 +0000
20264 Expose the Text accessors as public API
20266 Fix up the header to expose ClutterText accessors for the main
20267 properties, matching ClutterLabel.
20269 clutter/clutter-text.c | 8 --------
20270 clutter/clutter-text.h | 47 +++++++++++++++++++++++------------------------
20271 2 files changed, 23 insertions(+), 32 deletions(-)
20273 commit 5ac16652df4fc165c6237464e6df250687bf023f
20274 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20275 Date: Thu Dec 11 11:18:05 2008 +0000
20277 Update the ClutterText interactive test
20279 Use ClutterText's own API instead of relying on the Label's API.
20281 ClutterText is not meant to be a subclass of ClutterLabel.
20283 tests/interactive/test-text.c | 8 ++++----
20284 1 file changed, 4 insertions(+), 4 deletions(-)
20286 commit 4d62da80adf7347d1be25cdc42255438e5d8fb64
20287 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20288 Date: Thu Dec 11 11:17:26 2008 +0000
20290 Coalesce ClutterLabel API usage
20292 ClutterText replaces ClutterLabel, so it should expose the same
20293 kind of API - ideally with the minimal amount of changes, so that
20294 the porting is trivial.
20296 clutter/clutter-text.c | 693 ++++++++++++++++++++++++++++++++++++++++++------
20297 1 file changed, 608 insertions(+), 85 deletions(-)
20299 commit a91bb5450f029200635d9fdaf470c27046ebdeae
20300 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20301 Date: Thu Dec 11 11:15:56 2008 +0000
20303 Group all the integer private fields
20305 Integer fields using the ": <bits>" notation should be packed
20306 together so that the compiler can optimize the structure size
20309 clutter/clutter-text.c | 19 ++++++++++---------
20310 1 file changed, 10 insertions(+), 9 deletions(-)
20312 commit f9bf187e5d0268886a96a40911debd21b666e5e0
20313 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20314 Date: Thu Dec 11 11:15:11 2008 +0000
20316 Use internal headers
20318 Since ClutterText is part of Clutter, it can use the internal
20319 and private headers instead of the catch-all clutter.h.
20321 clutter/clutter-text.c | 17 ++++++++++++++++-
20322 1 file changed, 16 insertions(+), 1 deletion(-)
20324 commit a98720ae19f4892676c043bb6e4f2258eb201827
20325 Author: Emmanuele Bassi <ebassi@linux.intel.com>
20326 Date: Thu Dec 11 11:12:48 2008 +0000
20328 Initial import of the Text actor from Tidy
20330 The TidyText actor is meant as a replacement for both ClutterLabel
20333 Any text-displaying and editing actor should derive from ClutterText
20334 and implement the various visual cues to differentiate the editable
20335 from the non-editable state. Those visual cues usually belong to
20336 a high-level toolkit, especially if themeing is involved.
20338 clutter/Makefile.am | 2 +
20339 clutter/clutter-text.c | 1561 +++++++++++++++++++++++++++++++++++++++++
20340 clutter/clutter-text.h | 136 ++++
20341 clutter/clutter.h | 1 +
20342 tests/interactive/Makefile.am | 3 +-
20343 tests/interactive/test-text.c | 176 +++++
20344 6 files changed, 1878 insertions(+), 1 deletion(-)
20346 commit 4973b684a619ad62ed4bad0103cdd38a3f34ccba
20347 Author: Emmanuele Bassi <ebassi@gnome.org>
20348 Date: Thu Dec 11 11:11:11 2008 +0000
20350 Resort the main Clutter include file
20352 Just for overall sanity we keep the include file sorted.
20354 clutter/clutter.h | 22 +++++++++++-----------
20355 1 file changed, 11 insertions(+), 11 deletions(-)
20357 commit ee72352de0da52ae977d42fe2b06e96a90cf4bee
20358 Author: Emmanuele Bassi <ebassi@gnome.org>
20359 Date: Wed Dec 10 23:12:22 2008 +0000
20364 1 file changed, 3 insertions(+)
20366 commit e21fee39b450beee1a140a3b075321687e9c6f05
20367 Merge: 9537f8e dc6545c
20368 Author: Neil Roberts <neil@linux.intel.com>
20369 Date: Wed Dec 10 12:25:25 2008 +0000
20371 Merge commit 'git-svn' into multiple-texture-rectangle
20373 commit 9537f8e4ae69af43848f679d6568e94eb800b266
20374 Author: Neil Roberts <neil@linux.intel.com>
20375 Date: Tue Dec 9 18:03:29 2008 +0000
20377 Use a single index array
20379 There's no point in clearing the index array because it is always the
20380 same sequence of indices regardless of the vertices. Instead it is
20381 just added to when there are more vertices than ever before.
20383 clutter/cogl/gl/cogl-texture.c | 51 ++++++++++++++++++++++++--------------
20384 clutter/cogl/gles/cogl-texture.c | 51 ++++++++++++++++++++++++--------------
20385 2 files changed, 66 insertions(+), 36 deletions(-)
20387 commit 2c9a79651a0d8b0400589b9e1232c941b09ebb2a
20388 Merge: 0bedd89 e3dd18d
20389 Author: Neil Roberts <neil@linux.intel.com>
20390 Date: Tue Dec 9 15:10:56 2008 +0000
20392 Merge commit 'git-svn' into multiple-texture-rectangle
20394 commit 0bedd891fb716e03b867e1f450205a2d503721cf
20395 Author: Neil Roberts <neil@linux.intel.com>
20396 Date: Tue Dec 9 15:10:33 2008 +0000
20398 Support cogl_texture_multiple_rectangles in GL ES backend
20400 clutter/cogl/gles/cogl-context.c | 14 +-
20401 clutter/cogl/gles/cogl-context.h | 11 +-
20402 clutter/cogl/gles/cogl-texture.c | 343 ++++++++++++++++++++++----------------
20403 3 files changed, 212 insertions(+), 156 deletions(-)
20405 commit 8fc949bfafe0ca5de2cf19081f122896e29a3794
20406 Author: Neil Roberts <neil@linux.intel.com>
20407 Date: Tue Dec 9 15:01:10 2008 +0000
20409 Minor fix to indentation in gl/cogl-texture.c
20411 clutter/cogl/gl/cogl-texture.c | 2 +-
20412 1 file changed, 1 insertion(+), 1 deletion(-)
20414 commit 73974de482cff70c124aa49869b77099382591c3
20415 Author: Neil Roberts <neil@linux.intel.com>
20416 Date: Tue Dec 9 13:16:42 2008 +0000
20418 Add gtk-doc for cogl_texture_multiple_rectangles
20420 clutter/cogl/cogl-texture.h | 18 ++++++++++++++++++
20421 doc/reference/cogl/cogl-sections.txt | 1 +
20422 2 files changed, 19 insertions(+)
20424 commit bf72b8cdc3c43221e0813475957712f3ad9c8265
20425 Author: Neil Roberts <neil@linux.intel.com>
20426 Date: Tue Dec 9 13:02:28 2008 +0000
20428 Use glDrawRangeElements to share vertices
20430 When drawing a quad from cogl_texture_multiple_rectangles share two of
20431 the vertices in each triangle by using indices.
20433 clutter/cogl/gl/cogl-context.c | 4 +
20434 clutter/cogl/gl/cogl-context.h | 1 +
20435 clutter/cogl/gl/cogl-texture.c | 157 +++++++++++++++++++++-------------------
20436 3 files changed, 88 insertions(+), 74 deletions(-)
20438 commit bafcfca797d29d3731b1af4675c341ed212fbd5d
20439 Merge: e3f077d 98035e4
20440 Author: Neil Roberts <neil@linux.intel.com>
20441 Date: Thu Dec 4 18:08:40 2008 +0000
20443 Merge commit 'git-svn' into multiple-texture-rectangle
20447 clutter/cogl/gl/cogl-texture.c
20449 commit e3f077d55f323d71efed19def7f6a740ff78c2ec
20450 Author: Neil Roberts <neil@linux.intel.com>
20451 Date: Thu Dec 4 17:50:03 2008 +0000
20453 Use the correct length in _cogl_texture_flush_vertices
20455 The check for whether there are any rectangles to flush was using the
20456 wrong value so it would always flush.
20458 Thanks to Johan Bilien for spotting.
20460 clutter/cogl/gl/cogl-texture.c | 2 +-
20461 1 file changed, 1 insertion(+), 1 deletion(-)
20463 commit 29505dd0ba651df08dcfb184f0b08efa5b4eddfe
20464 Author: Neil Roberts <neil@linux.intel.com>
20465 Date: Fri Nov 28 14:20:07 2008 +0000
20467 Use GL_TRIANGLES for the texture vertex array
20469 Most cards don't actually support GL_QUADS and they are deprecated in
20470 GL 3.0 so there is a chance it will perform faster with GL_TRIANGLES
20471 even though it has to submit two extra vertices.
20473 clutter/cogl/gl/cogl-texture.c | 32 +++++++++++++++++++++++---------
20474 1 file changed, 23 insertions(+), 9 deletions(-)
20476 commit ab347481aeccd28b0986fbc991c96d72bbc3f072
20477 Author: Neil Roberts <neil@linux.intel.com>
20478 Date: Fri Nov 28 13:14:10 2008 +0000
20480 Use cogl_texture_multiple_rectangles in CoglPangoRenderer
20482 The glyphs are queued into an array of rectangles instead of being
20483 drawn directly. Whenever a different texture is used or the sequence
20484 is complete the array is flushed.
20486 This is based on a patch from Owen Taylor.
20488 clutter/pango/cogl-pango-render.c | 78 ++++++++++++++++++++++++++++++-------
20489 1 file changed, 64 insertions(+), 14 deletions(-)
20491 commit b312cd2d5560de953cfc0438353f9f6d8e3cae9a
20492 Author: Neil Roberts <neil@linux.intel.com>
20493 Date: Fri Nov 28 12:44:21 2008 +0000
20495 Add cogl_texture_multiple_rectangles
20497 This takes an array of sets of 8 floats to describe the rectangles. It
20498 tries to send the geometry with a single glDrawArrays as far as
20499 possible. cogl_texture_rectangle is now just a wrapper around
20500 cogl_texture_multiple_rectangles.
20502 clutter/cogl/cogl-texture.h | 5 +++
20503 clutter/cogl/gl/cogl-texture.c | 74 +++++++++++++++++++++++++++-------------
20504 2 files changed, 55 insertions(+), 24 deletions(-)
20506 commit 10942e8e049a4bfdd3df5abd5036c63f5676df92
20507 Author: Neil Roberts <neil@linux.intel.com>
20508 Date: Fri Nov 28 12:33:19 2008 +0000
20510 Make cogl_texture_rectangle use the vertex array
20512 cogl_texture_quad_hw and _sw now just add vertices to the vertex
20513 array. The last texture used is stored and if a different texture is
20514 encountered then flushes the vertices. cogl_texture_rectangle always
20515 flushes the vertices after calling either of the functions.
20517 clutter/cogl/gl/cogl-context.h | 7 +-
20518 clutter/cogl/gl/cogl-texture.c | 199 ++++++++++++++++++++++------------------
20519 2 files changed, 118 insertions(+), 88 deletions(-)
20521 commit 93ea1681bb21704a51370c0a2e7bc8f791a38d5a
20522 Author: Neil Roberts <neil@linux.intel.com>
20523 Date: Thu Nov 27 16:44:39 2008 +0000
20525 Use a GArray for the texture vertices in cogl_texture_polygon
20527 Previously it was a dynamic array that was manually reallocated.
20529 clutter/cogl/gl/cogl-context.c | 11 +++++++----
20530 clutter/cogl/gl/cogl-context.h | 3 +--
20531 clutter/cogl/gl/cogl-texture.c | 32 +++++++++-----------------------
20532 3 files changed, 17 insertions(+), 29 deletions(-)