1 commit 1f3f718a50b8138194057b3827459e402006b0f6
2 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3 Date: Fri Sep 24 15:07:17 2010 +0100
7 NEWS | 33 +++++++++++++++++++++++++++++++++
9 2 files changed, 35 insertions(+), 2 deletions(-)
11 commit 34407c14b00d35392e70b27e4b579f24f28e023a
12 Author: Elliot Smith <elliot.smith@intel.com>
13 Date: Fri Sep 24 14:48:53 2010 +0100
15 cookbook: Reduce complexity of sample ClutterAnimator code for recipe
17 http://bugzilla.clutter-project.org/show_bug.cgi?id=2341
19 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
21 doc/cookbook/examples/animations-moving-animator.c | 24 ++------------------
22 1 file changed, 2 insertions(+), 22 deletions(-)
24 commit 4640dad6afdce4469b64cef3fea9a426afcb0ce8
25 Author: Øyvind Kolås <pippin@linux.intel.com>
26 Date: Fri Sep 24 13:28:08 2010 +0100
28 animator: fix removal of all keys
30 When removing all keys in a ClutterAnimator, the hash table with
31 object/property name pairs went out of sync. This change makes
32 the animator always clear this hash table upon key-removal; and
33 refreshing it if the animator's timeline is running.
37 clutter/clutter-animator.c | 23 +++++++----------------
38 1 file changed, 7 insertions(+), 16 deletions(-)
40 commit f834b8b138f1f405a7afa7e56560e4014f8bb990
41 Author: Robert Bragg <robert@linux.intel.com>
42 Date: Thu Sep 23 22:18:42 2010 +0100
44 material: Don't prune ancestry if it owns some layers
46 Each time a material property changes we look to see if any of its
47 ancestry has become redundant and if so we prune that redundant
50 There was a problem with the logic that handles this though because we
51 weren't considering that a material which is a layer state authority may
52 still defer to ancestors to define the state of individual layers.
54 For example a material that derives from a parent with 5 layers can
55 become a STATE_LAYERS authority by simply changing it's ->n_layers count
56 to 4 and in that case it can still defer to its ancestors to define the
57 state of those 4 layers.
59 This patch checks first if a material is a layer state authority and if
60 so only tries to prune its ancestry if it also *owns* all the individual
61 layers it depends on. (I.e. if g_list_length
62 (material->layer_differences) != material->n_layers then it's not safe
63 to try pruning its ancestry!)
65 http://bugzilla-attachments.gnome.org/attachment.cgi?id=170907
67 clutter/cogl/cogl/cogl-material.c | 21 +++++++++++++++++++++
68 1 file changed, 21 insertions(+)
70 commit ffd5c32209bc6784c554134dd8c61536191c1e29
71 Author: Jammy Zhou <jammy.zhou@linaro.org>
72 Date: Tue Sep 21 11:37:52 2010 +0800
74 cogl-framebuffer.c: GL_DEPTH_STENCIL not supported in gles
76 There is GL_INVALID_ENUM error for GL_DEPTH_STENCIL when call
77 glRenderbufferStorage() with OpenGL ES backend. So enable this
78 only for OpenGL backend.
80 Signed-off-by: Robert Bragg <robert@linux.intel.com>
82 clutter/cogl/cogl/cogl-framebuffer.c | 2 ++
83 1 file changed, 2 insertions(+)
85 commit 4533edeef03b452aa79671fd6f80e659b2f09fa9
86 Author: Emmanuele Bassi <ebassi@linux.intel.com>
87 Date: Thu Sep 23 17:03:17 2010 +0100
89 cookbook: Further clarification of the anchor point
91 Make sure to add a note on the behaviour of the anchor point. Ideally,
92 it would be nice to have a recipe about it in the Actor section.
94 doc/cookbook/animations.xml | 17 ++++++++++++++++-
95 1 file changed, 16 insertions(+), 1 deletion(-)
97 commit ce0bd4e26cd1cff6a9f446b1c54a440751d15fe7
98 Author: Elliot Smith <elliot.smith@intel.com>
99 Date: Thu Sep 23 16:18:29 2010 +0100
101 cookbook: Recipe for "moving actors"
103 This recipe explains how to use the three animation
104 approaches (implicit, State, Animator) to animate movement
107 Includes some guidelines about which approach to use when, with
108 a full code example for each approach.
110 The discussion section covers some subtleties around animated
111 movement; namely: moving actors out of their containers; anchor
112 points and movement; moving in the depth axis; interactions
113 between animated movement and constraints.
115 doc/cookbook/Makefile.am | 2 +
116 doc/cookbook/animations.xml | 474 +++++++++++++++++++++
117 doc/cookbook/videos/animations-moving-anchors.ogv | Bin 0 -> 18806 bytes
118 doc/cookbook/videos/animations-moving-depth.ogv | Bin 0 -> 23536 bytes
119 4 files changed, 476 insertions(+)
121 commit b8d36a364f6db8cb75eaacf27e7e6c109f4f336e
122 Author: Elliot Smith <elliot.smith@intel.com>
123 Date: Thu Sep 23 11:19:00 2010 +0100
125 cookbook: Fixed markup in animations section
127 Fixed indentation on some mark-up in an unrelated recipe.
129 doc/cookbook/animations.xml | 14 +++++++-------
130 1 file changed, 7 insertions(+), 7 deletions(-)
132 commit 6307876552c95389c7c41acfa5483dd669d620eb
133 Author: Elliot Smith <elliot.smith@intel.com>
134 Date: Wed Sep 22 16:58:08 2010 +0100
136 cookbook: Example of animated movement with ClutterAnimator
138 Added an example showing how to randomly animate the
139 simultaneous movement on the x axis of three actors,
140 using ClutterAnimator.
142 doc/cookbook/examples/Makefile.am | 2 +
143 doc/cookbook/examples/animations-moving-animator.c | 145 ++++++++++++++++++++
144 2 files changed, 147 insertions(+)
146 commit f1b2f1e8c55816753362cd038da18e0e572d9978
147 Author: Elliot Smith <elliot.smith@intel.com>
148 Date: Tue Sep 21 17:45:03 2010 +0100
150 cookbook: Example of animated movement with ClutterState
152 Added an example showing how to move two actors between
153 two states (one minimised, one maximised) using ClutterState
154 to do the movement. Also shows how movement can be mixed
155 with other animation (in this case, scaling).
157 doc/cookbook/examples/Makefile.am | 2 +
158 doc/cookbook/examples/animations-moving-state.c | 98 +++++++++++++++++++++++
159 2 files changed, 100 insertions(+)
161 commit 5bca30300e21338ff8118f41e9f9e449625bc96a
162 Author: Elliot Smith <elliot.smith@intel.com>
163 Date: Tue Sep 21 17:44:00 2010 +0100
165 cookbook: Example of simple movement animation
167 Added example showing how to move an actor in one of the
168 three axes (x,y,z) in response to a button event on the
171 doc/cookbook/examples/Makefile.am | 2 +
172 doc/cookbook/examples/animations-moving-implicit.c | 93 ++++++++++++++++++++
173 2 files changed, 95 insertions(+)
175 commit 884ead03e1232b1f35c70098869cf9802f8ef836
176 Author: Emmanuele Bassi <ebassi@linux.intel.com>
177 Date: Thu Sep 23 16:17:24 2010 +0100
179 Add some more argument validation
181 This is all internal, so we shouldn't need it; unfortunately, it seems
182 we're passing invalid data internally, so for the time being catching
183 inconsistencies should at least emit a warning for us to backtrace.
185 clutter/clutter-private.h | 5 +++--
186 clutter/clutter-stage.c | 15 +++++++++++++--
187 2 files changed, 16 insertions(+), 4 deletions(-)
189 commit f66e1de0e35f7e310db919926bbc06d8b03becbf
190 Author: Robert Bragg <robert@linux.intel.com>
191 Date: Thu Sep 23 16:03:06 2010 +0100
193 actor: don't pass NULL to _stage_set_pick_buffer_valid
195 This adds a check in clutter_actor_real_queue_redraw after calling
196 _clutter_actor_get_stage_internal to check in case the actor doesn't yet
197 have an associated stage so we can avoid passing a NULL stage pointer to
198 _clutter_stage_set_pick_buffer_valid which could cause a crash.
200 clutter/clutter-actor.c | 3 ++-
201 1 file changed, 2 insertions(+), 1 deletion(-)
203 commit 37d0dbe6b2da3f7747780f638ac39c3f9c0e3818
204 Author: Robert Bragg <robert@linux.intel.com>
205 Date: Thu Sep 23 15:45:27 2010 +0100
207 docs: Put deprecated Cogl symbols into new section
209 This adds a "Cogl deprecated API" chapter to the Cogl reference manual
210 so we can group all the documentation for deprecated symbols together
211 instead of having them clutter up the documentation of symbols we would
212 rather developers used.
214 doc/reference/cogl/cogl-docs.xml.in | 28 ++++++++++
215 doc/reference/cogl/cogl-sections.txt | 99 +++++++++++++++++++++++-----------
216 2 files changed, 96 insertions(+), 31 deletions(-)
218 commit 779c780500dd263b5bc0244d0e0b5693cdd3cd6c
219 Author: Robert Bragg <robert@linux.intel.com>
220 Date: Wed Aug 25 22:31:30 2010 +0100
222 docs: update the overview paragraph for Cogl
224 Instead of describing OpenGL as "a low level OpenGL abstraction
225 library" it is now summarised as "modern 3D graphics API".
227 doc/reference/cogl/cogl-docs.xml.in | 12 +++++++-----
228 1 file changed, 7 insertions(+), 5 deletions(-)
230 commit 2bc739ab445264b01700bada43755e6ab27d0aec
231 Author: Robert Bragg <robert@linux.intel.com>
232 Date: Wed Aug 25 20:36:20 2010 +0100
234 docs: cogl-texture-3d wasn't listed as experimental
236 The CoglTexture3D API is only available when defining
237 COGL_ENABLE_EXPERIMENTAL_API so it should be listed in the experimental
238 section of the API reference.
240 doc/reference/cogl/cogl-docs.xml.in | 2 +-
241 1 file changed, 1 insertion(+), 1 deletion(-)
243 commit a89b8f430449ea02467aa6d11bd501841ef22756
244 Author: Robert Bragg <robert@linux.intel.com>
245 Date: Wed Aug 25 20:33:27 2010 +0100
247 docs: Use "Cogl" not "COGL" in Cogl API reference
249 Cogl isn't an acronym so we should use "Cogl" instead of "COGL" in
252 doc/HACKING | 6 +++---
253 doc/reference/clutter/running-clutter.xml | 6 +++---
254 doc/reference/clutter/subclassing-ClutterActor.xml | 9 ++++-----
255 doc/reference/cogl/cogl-docs.xml.in | 14 +++++++-------
256 4 files changed, 17 insertions(+), 18 deletions(-)
258 commit 4c8867ea07cf5ed8d36c0f7a351f91b254d93693
259 Author: Emmanuele Bassi <ebassi@linux.intel.com>
260 Date: Thu Sep 23 15:15:37 2010 +0100
262 table-layout: Invert row/column in arguments
264 *** This is an API change ***
266 The general pattern for axis-aligned arguments is:
271 If we consider columns an x-aligned argument, and row a y-aligned
272 argument, then we need to update the TableLayout functions to be:
282 clutter/clutter-table-layout.c | 100 ++++++++++++++++-----------------
283 clutter/clutter-table-layout.h | 8 +--
284 tests/interactive/test-table-layout.c | 22 ++++----
285 3 files changed, 65 insertions(+), 65 deletions(-)
287 commit 462d4c832a61731507bf1900d5ed7ec223c1fc57
288 Author: Emmanuele Bassi <ebassi@linux.intel.com>
289 Date: Thu Sep 23 13:36:56 2010 +0100
291 docs: Mention Uncrustify in the coding style document
293 doc/CODING_STYLE | 5 +++++
294 1 file changed, 5 insertions(+)
296 commit 5335689340c2748842999b40a43563f1f3be9fad
297 Author: Emmanuele Bassi <ebassi@linux.intel.com>
298 Date: Thu Sep 23 13:36:41 2010 +0100
300 Update the uncrustify configuration
302 build/clutter-uncrustify.cfg | 18 +++++++++++++++---
303 1 file changed, 15 insertions(+), 3 deletions(-)
305 commit 46357db3898eb28bb07faffb5ea8a0b8841fcaec
306 Author: Emmanuele Bassi <ebassi@linux.intel.com>
307 Date: Thu Sep 23 13:00:06 2010 +0100
309 Add uncrustify configuration file
311 Patch submission should include a pass of uncrustify to conform to the
314 Uncrustify is not perfect - but at least it's a start.
316 build/clutter-uncrustify.cfg | 117 ++++++++++++++++++++++++++++++++++++++++++
317 1 file changed, 117 insertions(+)
319 commit 56929942a81a99105cd11dc4fa5afffcca26429e
320 Author: Robert Bragg <robert@linux.intel.com>
321 Date: Sat Sep 11 00:29:05 2010 +0100
323 picking: Fix tracking of pick buffer validity
325 We have an optimization to track when there are multiple picks per
326 frame so we can do a full render of the pick buffer to reduce the
327 number of pick renders for a static scene.
329 There was a problem though in that we were tracking this information in
330 the ClutterMainContext, but conceptually this doesn't really make sense
331 because the pick buffer is associated with a stage framebuffer and there
332 can be multiple stages for one context.
334 This patch moves the state tracking to ClutterStage.
336 clutter/clutter-actor.c | 17 +++++------------
337 clutter/clutter-main.c | 16 ++++++----------
338 clutter/clutter-private.h | 9 ++++++---
339 clutter/clutter-stage.c | 46 +++++++++++++++++++++++++++++++++++++++++++++
340 4 files changed, 63 insertions(+), 25 deletions(-)
342 commit b2a56c9cda148bcca6e9695a488562fa45d66f9a
343 Author: Robert Bragg <robert@linux.intel.com>
344 Date: Thu Sep 23 11:35:42 2010 +0100
346 Revert "picking: Fix tracking of pick buffer validity"
348 This reverts commit d7e86e26960f4cb2f5f0600357f5df89bd1c46c1.
350 This was a half baked patch that was pushed a bit early since it broke
351 test-texture-pick-with-alpha + the commit message refers to a change on
352 the wip/paint-box branch that hasn't happened yet.
354 clutter/clutter-actor.c | 12 ++++++++++++
355 clutter/clutter-main.c | 16 ++++++++++------
356 clutter/clutter-private.h | 10 +++-------
357 clutter/clutter-stage.c | 46 ---------------------------------------------
358 4 files changed, 25 insertions(+), 59 deletions(-)
360 commit d7e86e26960f4cb2f5f0600357f5df89bd1c46c1
361 Author: Robert Bragg <robert@linux.intel.com>
362 Date: Sat Sep 11 00:29:05 2010 +0100
364 picking: Fix tracking of pick buffer validity
366 We have an optimization to track when there are multiple picks per
367 frames so we can do a full render of the pick buffer to reduce the
368 number of pick renders for a static scene.
370 There were two problems with how we were tracking this state though.
371 Firstly we were tracking this information in the ClutterMainContext, but
372 conceptually this doesn't really make sense because the pick buffer is
373 associated with a stage framebuffer and there can be multiple stages for
374 one context. Secondly - since the change to how redraws are queued - we
375 weren't marking the pick buffer as invalid when a queuing a redraw, we
376 were only marking the buffer invalid when signaling/finishing the
377 queue-redraw process, which is now deferred until just before a paint.
378 This meant using clutter_stage_get_actor_at_pos after a scenegraph
379 change could give a wrong result if it just read from an existing (but
380 technically invalid) pick buffer.
382 This patch moves the state tracking to ClutterStage, and ensures the
383 buffer is invalidated in _clutter_stage_queue_actor_redraw.
385 http://bugzilla.clutter-project.org/show_bug.cgi?id=2283
387 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
389 clutter/clutter-actor.c | 12 ------------
390 clutter/clutter-main.c | 16 ++++++----------
391 clutter/clutter-private.h | 10 +++++++---
392 clutter/clutter-stage.c | 46 +++++++++++++++++++++++++++++++++++++++++++++
393 4 files changed, 59 insertions(+), 25 deletions(-)
395 commit 60c9dc25df59956cc28c2b243a69c76c66b4135e
396 Author: Emmanuele Bassi <ebassi@linux.intel.com>
397 Date: Wed Sep 22 12:46:47 2010 +0100
399 box-layout: Small cleanups
401 clutter/clutter-box-layout.c | 23 ++++++++++++-----------
402 1 file changed, 12 insertions(+), 11 deletions(-)
404 commit acc7d48e47b275c9320cc4b5817aec8eb0fe1e25
405 Author: Emmanuele Bassi <ebassi@linux.intel.com>
406 Date: Wed Sep 22 10:07:42 2010 +0100
408 docs: Update the coding style
410 Make sure to document:
414 • interface definition
416 doc/CODING_STYLE | 187 +++++++++++++++++++++++++++++++++++++++++++++++-------
417 1 file changed, 164 insertions(+), 23 deletions(-)
419 commit bcd4385a0e1fe34f0be6cac906ff32ab42c43d3c
420 Author: Neil Roberts <neil@linux.intel.com>
421 Date: Tue Sep 21 13:17:53 2010 +0100
423 test-conform: Delay initializing Clutter until a test is run
425 Instead of calling clutter_init immediately, test-conformance now only
426 calls it as part of test_conform_simple_fixture_setup. The conformance
427 tests assert that only one test is run per instance of
428 test-conformance so it should never end up calling clutter_init
429 twice. Delaying clutter_init has the advantage that calling
430 "test-conformance -l" will still work even on systems with no X
431 server. This could be useful for automated build systems.
433 tests/conform/test-conform-common.c | 21 +++++++++++++++++++++
434 tests/conform/test-conform-main.c | 15 ---------------
435 2 files changed, 21 insertions(+), 15 deletions(-)
437 commit ddf1e4c77bde95a71a325998ebc3b984116d0c19
438 Author: Emmanuele Bassi <ebassi@linux.intel.com>
439 Date: Tue Sep 21 13:32:31 2010 +0100
441 effects: Make sure we're using GLSL 1.10
443 clutter/clutter-blur-effect.c | 22 +++++++++++-----------
444 clutter/clutter-colorize-effect.c | 1 +
445 clutter/clutter-desaturate-effect.c | 1 +
446 3 files changed, 13 insertions(+), 11 deletions(-)
448 commit 9f2b62a595805c3d8bae1c9e5692959296aa5d28
449 Author: Emmanuele Bassi <ebassi@linux.intel.com>
450 Date: Tue Sep 21 13:17:51 2010 +0100
452 introspection: Build ClutterJson before Clutter
454 Since the latter requires the former.
456 clutter/Makefile.am | 2 +-
457 1 file changed, 1 insertion(+), 1 deletion(-)
459 commit 66ba609f3b704b0950e4bd2b94b0ec9c485dc0b5
460 Author: Emmanuele Bassi <ebassi@linux.intel.com>
461 Date: Tue Sep 21 13:15:56 2010 +0100
463 Require the installed JSON-GLib
465 Continue to provide the internal copy for 1.4, but require an explicit
468 The internal copy will be removed for Clutter 1.6.
472 2 files changed, 5 insertions(+), 1 deletion(-)
474 commit 4037f76a3e7aba3acac710e0bc73ba31a9dfcfc2
475 Author: Emmanuele Bassi <ebassi@linux.intel.com>
476 Date: Tue Sep 21 12:02:41 2010 +0100
478 build: Update the remote publish path for the cookbook
480 doc/cookbook/Makefile.am | 6 ++++--
481 1 file changed, 4 insertions(+), 2 deletions(-)
483 commit 8f4d61e663770d6a24b75d77418a145eba7c104f
484 Author: Neil Roberts <neil@linux.intel.com>
485 Date: Mon Sep 20 12:04:51 2010 +0100
487 clutter-box-layout: Swap the default request mode
489 The request mode set by the box layout was previously width-for-height
490 in a vertical layout and height-for-width in a horizontal layout which
491 seems to be wrong. For example, if width-for-height is used in a
492 vertical layout then the width request will come second with the
493 for_height parameter set. However a vertical layout doesn't pass the
494 for_height parameter on to its children so doing the requests in that
495 order doesn't help. If the layout contains a ClutterText then both the
496 width and height request for it will have -1 for the for_width and
497 for_height parameters so the text would end up allocated too small.
499 http://bugzilla.clutter-project.org/show_bug.cgi?id=2328
501 clutter/clutter-box-layout.c | 6 +++---
502 1 file changed, 3 insertions(+), 3 deletions(-)
504 commit 699e8bbed28687dd91aba6b0518d43f815cae456
505 Merge: af42cdb e92b186
506 Author: Emmanuele Bassi <ebassi@linux.intel.com>
507 Date: Mon Sep 20 14:33:26 2010 +0100
509 Merge branch 'cookbook-layouts-bind-constraint'
511 * cookbook-layouts-bind-constraint:
512 cookbook: Add recipe about sync'ing actor sizes
513 cookbook: Example using allocation-changed to sync actor size
514 cookbook: Simple example to demonstrate bind constraint
515 cookbook: Example of using a bind constraint for an overlay
517 commit af42cdbe875bf2c2db00ac7b380870545e2aaebf
518 Author: Emmanuele Bassi <ebassi@linux.intel.com>
519 Date: Mon Sep 20 14:31:53 2010 +0100
521 docs: Description fixes for State.set_animator()
523 clutter/clutter-state.c | 11 +++++++----
524 1 file changed, 7 insertions(+), 4 deletions(-)
526 commit 695839c6f3527e3838bf104d26d3ff32b85aff3f
527 Author: Bastian Winkler <buz@netbuz.org>
528 Date: Fri Sep 17 13:21:03 2010 +0200
530 state: Request the animator for the default state
532 Try to use the default-state animator in case there is no animator for
533 this specific state change request.
535 http://bugzilla.clutter-project.org/show_bug.cgi?id=2325
537 clutter/clutter-state.c | 4 ++++
538 1 file changed, 4 insertions(+)
540 commit 172fc6bfedeefcb337ccefbf38b427c5be2591cd
541 Author: Bastian Winkler <buz@netbuz.org>
542 Date: Wed Sep 15 15:59:39 2010 +0200
544 state: Fix the usage of ClutterAnimator in ClutterScript
546 Fix the transition parser to allow transitions that have only an
547 animator and no keys defined.
549 http://bugzilla.clutter-project.org/show_bug.cgi?id=2325
551 clutter/clutter-state.c | 30 +++++++++++++++++-------------
552 1 file changed, 17 insertions(+), 13 deletions(-)
554 commit 2d41d5afcb6e69d45ac5ca9575aa96f943484abf
555 Author: Bastian Winkler <buz@netbuz.org>
556 Date: Wed Sep 15 14:46:19 2010 +0200
558 state: Create a new target state in clutter_state_set_animator
560 clutter_state_set_animator needs to create a new state in order to use a
561 ClutterAnimator with a target state that doesn't exist yet.
563 http://bugzilla.clutter-project.org/show_bug.cgi?id=2325
565 clutter/clutter-state.c | 2 +-
566 1 file changed, 1 insertion(+), 1 deletion(-)
568 commit 9399760030325f513e640a781b6139372a8cca5a
569 Author: Dominique Leuenberger <dimstar@opensuse.org>
570 Date: Mon Sep 20 14:13:49 2010 +0100
572 build: Pass CLUTTER_CFLAGS to g-ir-scanner
574 http://bugzilla.clutter-project.org/show_bug.cgi?id=2327
576 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
578 clutter/Makefile.am | 8 ++++----
579 1 file changed, 4 insertions(+), 4 deletions(-)
581 commit ce174654bf7d743ec2eb18b92c72ab64c9ed7a10
582 Author: Emmanuele Bassi <ebassi@linux.intel.com>
583 Date: Mon Sep 20 13:15:44 2010 +0100
585 docs: API reference fixes
587 clutter/clutter-timeout-pool.h | 4 +++
588 clutter/cogl/cogl/cogl-path.h | 2 ++
589 clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.h | 18 ++++++----
590 doc/reference/cally/cally-sections.txt | 36 ++++++++++----------
591 doc/reference/clutter/clutter-sections.txt | 4 +--
592 5 files changed, 36 insertions(+), 28 deletions(-)
594 commit d9f762f525f91b6eb86ebc6539d4573abddb1875
595 Author: Emmanuele Bassi <ebassi@linux.intel.com>
596 Date: Mon Sep 20 11:30:23 2010 +0100
598 build: Remove unnecessary newline
601 1 file changed, 1 deletion(-)
603 commit e3e08c0eaf69db51cd901cd16e80bcb41903ef81
604 Author: Frederik Hahne <frederik.hahne@googlemail.com>
605 Date: Mon Sep 20 11:23:31 2010 +0100
607 po: Update German translation
609 po/de.po | 39 +++++++++++++--------------------------
610 1 file changed, 13 insertions(+), 26 deletions(-)
612 commit 7fe0df393b905319a261258c68019c4edc29bcea
613 Author: Emmanuele Bassi <ebassi@linux.intel.com>
614 Date: Sat Sep 18 08:41:52 2010 +0100
616 texture: Add more validation on the material
618 If set_cogl_texture() is called after unsetting the Texture's material
619 then we really want to make a copy of the template.
621 Also, we should assert more often if the internal state goes horribly
622 wrong: at least, we'll have a backtrace.
624 clutter/clutter-texture.c | 10 +++++++++-
625 1 file changed, 9 insertions(+), 1 deletion(-)
627 commit 66104f51123538a57b9aa077569a8e68d9438e9b
628 Author: Neil Roberts <neil@linux.intel.com>
629 Date: Fri Sep 17 17:10:39 2010 +0100
631 Fix the ordering of the arguments for clutter_table_layout_set_span
633 The order of the row_span and column_span arguments was different in
634 the declaration from that in the definition. This was causing the
635 gtk-doc to also have the wrong order.
637 clutter/clutter-table-layout.h | 4 ++--
638 1 file changed, 2 insertions(+), 2 deletions(-)
640 commit 760fa8efd6817ec9c3a1ef5800eb9c64c0f1baf6
641 Author: Neil Roberts <neil@linux.intel.com>
642 Date: Fri Sep 17 17:18:09 2010 +0100
644 cogl-object-private.h: Include cogl-debug.h
646 If COGL_OBJECT_DEBUG is defined then cogl-object-private.h will call
647 COGL_NOTE in the ref and unref macros. For this to work the debug
648 header needs to also be included or COGL_NOTE won't necessarily be
651 clutter/cogl/cogl/cogl-object-private.h | 1 +
652 1 file changed, 1 insertion(+)
654 commit e92b18671905f5690320883cc4854dd76dc17d15
655 Author: Elliot Smith <elliot.smith@intel.com>
656 Date: Thu Sep 16 15:55:21 2010 +0100
658 cookbook: Add recipe about sync'ing actor sizes
660 The recipe covers how to use ClutterBindConstraint
661 to bind actor sizes together.
663 It gives some examples of where this approach is appropriate,
664 as well as explaining an alternative using allocation-changed
665 or notify::* signals.
667 Three examples are given:
669 1. Resizing a texture to the stage.
670 2. Resizing a rectangle to act as a transparent overlay on
671 top of a texture (using constraints).
672 3. Resizing a rectangle to act as a transparent overlay on
673 top of a texture, but with a size proportional to the texture
674 (using a handler connected to allocation-changed signals
675 emitted by the texture).
677 doc/cookbook/Makefile.am | 1 +
678 .../images/layouts-bind-constraint-stage.png | Bin 0 -> 11084 bytes
679 doc/cookbook/layouts.xml | 220 ++++++++++++++++++++
680 3 files changed, 221 insertions(+)
682 commit c3cbf1533fdb6174894f38d5956802ce46df4238
683 Author: Elliot Smith <elliot.smith@intel.com>
684 Date: Thu Sep 16 13:42:09 2010 +0100
686 cookbook: Example using allocation-changed to sync actor size
688 An alternative method (not using constraints) to bind
689 one actor's size and position to another. Used as
690 an example in the recipe about resizing one actor in
691 sync with a source actor.
693 doc/cookbook/examples/Makefile.am | 2 +
694 .../examples/layouts-bind-constraint-allocation.c | 70 ++++++++++++++++++++
695 2 files changed, 72 insertions(+)
697 commit 8a149521cef9f2693d0c32e3cc4bf85a62dee026
698 Author: Elliot Smith <elliot.smith@intel.com>
699 Date: Wed Sep 15 16:05:15 2010 +0100
701 cookbook: Simple example to demonstrate bind constraint
703 A simple example showing how to scale an actor to the stage.
705 Demonstrates ClutterBindConstraint and ClutterAlignConstraint
706 in a fashion suitable for a short recipe.
708 doc/cookbook/examples/Makefile.am | 2 +
709 .../examples/layouts-bind-constraint-stage.c | 55 ++++++++++++++++++++
710 2 files changed, 57 insertions(+)
712 commit a0f63a3153c023f6a3299b95c0e7259d1eba013d
713 Author: Elliot Smith <elliot.smith@intel.com>
714 Date: Wed Sep 15 15:50:32 2010 +0100
716 cookbook: Example of using a bind constraint for an overlay
718 Example code which loads an image into a texture, and resizes
719 the image in response to +/- key presses. The overlay is
720 a transparent rectangle which is bound to the height and
721 width of the texture; on clicking the texture, the overlay
722 is made visible by increasing its opacity.
724 This demonstrates how to use constraints to simplify code
725 for resizing an actor which is "dependent" on another actor.
727 doc/cookbook/examples/Makefile.am | 2 +
728 .../examples/layouts-bind-constraint-overlay.c | 135 ++++++++++++++++++++
729 2 files changed, 137 insertions(+)
731 commit 68da998c9bc81fa7f2f163032e19640aae9100e7
732 Author: Emmanuele Bassi <ebassi@linux.intel.com>
733 Date: Fri Sep 17 14:54:31 2010 +0100
735 docs: Add sub-classing notes on ActorMeta and Constraint
737 clutter/clutter-actor-meta.c | 8 ++++++--
738 clutter/clutter-constraint.c | 26 ++++++++++++++++++++++++++
739 2 files changed, 32 insertions(+), 2 deletions(-)
741 commit f7e8b471132b062d4bc0169cb9f2f5306451603f
742 Author: Emmanuele Bassi <ebassi@linux.intel.com>
743 Date: Fri Sep 17 12:43:23 2010 +0100
745 flow-layout: Blow the cached preferred size if needed
747 If the FlowLayout layout manager wasn't allocated the same size it
748 requested then it should blow its caches and recompute the layout
749 with the given allocation size.
751 clutter/clutter-flow-layout.c | 21 +++++++++++++++++++++
752 1 file changed, 21 insertions(+)
754 commit cdff2a9e7a5c44f214978b6a3d6b0cce33b4e5f5
755 Author: Emmanuele Bassi <ebassi@linux.intel.com>
756 Date: Fri Sep 17 12:13:29 2010 +0100
758 constraint: Re-implement using update_allocation()
760 Instead of using the fixed position and size API, use the newly added
761 update_allocation() virtual function in ClutterConstraint to change the
762 allocation of a ClutterActor. This allows using constraints inside
763 layout managers, and also allows Constraints to react to changes in the
764 size of an actor without causing relayout cycles.
766 http://bugzilla.clutter-project.org/show_bug.cgi?id=2319
768 clutter/clutter-align-constraint.c | 98 +++++++++++++++++++++------------
769 clutter/clutter-bind-constraint.c | 105 +++++++++++++++++++++---------------
770 clutter/clutter-bind-constraint.h | 2 -
771 3 files changed, 124 insertions(+), 81 deletions(-)
773 commit 5da0064de7b77cdb7147371631cf1b9c31f60509
774 Author: Emmanuele Bassi <ebassi@linux.intel.com>
775 Date: Fri Sep 17 12:09:56 2010 +0100
777 constraint: Add ::update_allocation()
779 The Constraint should plug directly into the allocation mechanism, and
780 modify the allocation of the actor to which they are applied to. This is
781 similar to the mechanism used by the Effect class to modify the paint
782 sequence of an actor.
784 clutter/clutter-actor.c | 35 +++++++++++++++++++++++++----------
785 clutter/clutter-constraint.c | 29 +++++++++++++++++++++++++++--
786 clutter/clutter-constraint.h | 4 ++++
787 clutter/clutter-private.h | 4 ++++
788 4 files changed, 60 insertions(+), 12 deletions(-)
790 commit bdcac5617be1c6a774259379a668619ba387c2bc
791 Author: Emmanuele Bassi <ebassi@linux.intel.com>
792 Date: Fri Sep 17 12:08:52 2010 +0100
794 test-bind: Fix colors and set the name of the boxes
796 tests/interactive/test-bind.c | 4 +++-
797 1 file changed, 3 insertions(+), 1 deletion(-)
799 commit 8ca47e3b20f17545e6fcc89e0940d485158308ef
800 Author: Emmanuele Bassi <ebassi@linux.intel.com>
801 Date: Fri Sep 17 11:40:10 2010 +0100
803 build: Use the power of abs_builddir
805 When calling test-conformance to get the list of conformance tests.
807 tests/conform/Makefile.am | 4 ++--
808 1 file changed, 2 insertions(+), 2 deletions(-)
810 commit 5529619254aac0f33dc5ee0646b920a63f7b46bb
811 Author: Emmanuele Bassi <ebassi@linux.intel.com>
812 Date: Fri Sep 17 11:39:20 2010 +0100
814 build: Enable COGL_OBJECT_DEBUG in the debug flags
816 The CoglObject debugging code is enabled by a separate flag.
818 http://bugzilla.clutter-project.org/show_bug.cgi?id=2318
821 1 file changed, 1 insertion(+), 1 deletion(-)
823 commit d1b4495f7f1694c8b1a671a489d82e124f45c822
824 Author: Robert Bragg <robert@linux.intel.com>
825 Date: Thu Sep 16 12:58:42 2010 +0100
827 offscreen-effect: Update handling of transforms
829 In line with the changes made in f5f066df9ce7 to clean up how Clutter
830 deals with transformations of actors this patch updates the code in
831 clutter-offscreen-effect.c. We now query the projection matrix from the
832 stage instead of the perspective and instead of duplicating the logic to
833 setup the stage view transform we now use
834 _clutter_actor_apply_modelview_transform for the stage instead.
836 clutter/clutter-offscreen-effect.c | 64 +++++++++++++-----------------------
837 1 file changed, 23 insertions(+), 41 deletions(-)
839 commit f0ab8edac0e3e5a5792f48588ab9d24774ff7e72
840 Author: Neil Roberts <neil@linux.intel.com>
841 Date: Thu Sep 16 11:12:51 2010 +0100
843 clutter.modules: Specify the checkoutdir for the gtk2 module
845 If no checkoutdir is specified then jhbuild seems to use the name of
846 the module which in this case would be 'gtk+'. This ends up
847 overwriting the checkout of the master branch of gtk+ and causes all
848 kinds of build problems. This patch adds a checkoutdir attribute to
849 the gtk2 module to force it to checkout into the gtk2 directory.
851 build/clutter.modules | 1 +
852 1 file changed, 1 insertion(+)
854 commit 8a09e91ef84e483d9fd8dd93cd04d11da241925d
855 Author: Emmanuele Bassi <ebassi@linux.intel.com>
856 Date: Wed Sep 15 16:46:06 2010 +0100
858 Post-release version bump to 1.3.15
861 1 file changed, 1 insertion(+), 1 deletion(-)
863 commit b776f6b4fbe05b493d0b36619c95ece5443c443b
864 Author: Emmanuele Bassi <ebassi@linux.intel.com>
865 Date: Wed Sep 15 16:12:39 2010 +0100
867 Release Clutter 1.3.14 (developers snapshot)
871 po/clutter-1.0.pot | 470 ++++++++++++++++++++++++------------------------
872 po/de.po | 501 +++++++++++++++++++++++++++-------------------------
873 po/it.po | 468 ++++++++++++++++++++++++------------------------
874 po/pl.po | 468 ++++++++++++++++++++++++------------------------
875 po/zh_CN.po | 468 ++++++++++++++++++++++++------------------------
876 7 files changed, 1218 insertions(+), 1183 deletions(-)
878 commit 037a1b82cc19752d44121a530fac3516a6c25c71
879 Author: Emmanuele Bassi <ebassi@linux.intel.com>
880 Date: Wed Sep 15 15:56:42 2010 +0100
882 build: Add cogl-debug-options.h
884 clutter/cogl/cogl/Makefile.am | 1 +
885 1 file changed, 1 insertion(+)
887 commit 7d2706e8ba09444572d9dcd122b466ff020849f9
888 Author: Emmanuele Bassi <ebassi@linux.intel.com>
889 Date: Wed Sep 15 15:35:05 2010 +0100
891 docs: Fix the name of the parameters
893 clutter/clutter-drag-action.c | 3 ++-
894 1 file changed, 2 insertions(+), 1 deletion(-)
896 commit 73385414524fe03771d135cc3bd94a37b35def4b
897 Author: Neil Roberts <neil@linux.intel.com>
898 Date: Wed Sep 15 14:39:05 2010 +0100
900 cogl: Make cogl_util_next_p2 internal and fix the documentation
902 cogl_util_next_p2 is declared in cogl-util.h which is a private header
903 so it shouldn't be possible for an application to use it. It's
904 probably not a function we'd like to export from Cogl so it seems
905 better to keep it private. This patch renames it to _cogl_util_next_p2
906 so that it won't be exported from the shared library.
908 The documentation for the function is also slightly wrong because it
909 stated that the function returned the next power greater than
910 'a'. However the code would actually return 'a' if it's already a
911 power of two. I think the actual behaviour is more useful so this
912 patch changes the documentation rather than the code.
914 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 4 ++--
915 clutter/cogl/cogl/cogl-util.c | 11 ++++++-----
916 clutter/cogl/cogl/cogl-util.h | 2 +-
917 3 files changed, 9 insertions(+), 8 deletions(-)
919 commit 42dacf97f82ac506613db662a676df92a9cc4d3a
920 Author: Neil Roberts <neil@linux.intel.com>
921 Date: Wed Sep 15 14:07:30 2010 +0100
923 cogl-vertex-buffer: Don't always set COGL_MATERIAL_FLUSH_FALLBACK_MASK
925 Previously CoglVertexBuffer would always set the flush options flags
926 to at least contain COGL_MATERIAL_FLUSH_FALLBACK_MASK. The code then
927 later checks whether any flags are set before deciding whether to copy
928 the material to implement the overrides. This means that it would
929 always end up copying the material even if there are no fallback
930 layers. This patch changes it so that it only sets
931 COGL_MATERIAL_FLUSH_FALLBACK_MASK if fallback_layers != 0.
933 clutter/cogl/cogl/cogl-vertex-buffer.c | 9 ++++++---
934 1 file changed, 6 insertions(+), 3 deletions(-)
936 commit 8cfb158f63a1e1f4af614e17b0198850ff3bdbce
937 Author: Robert Bragg <robert@linux.intel.com>
938 Date: Tue Sep 14 20:25:23 2010 +0100
940 material-arbfp: fix updating params if sharing progs
942 If a single arbfp program is being shared between multiple CoglMaterials
943 then we need to make sure we update all program.local params when
944 switching between materials. Previously we had a dirty flag to track
945 when combine_constant params were changed but didn't take in to account
946 that different materials sharing the same program may have different
949 clutter/cogl/cogl/cogl-material-arbfp.c | 12 +++++++++++-
950 1 file changed, 11 insertions(+), 1 deletion(-)
952 commit d87522596d5c2c1001716d6806684e1fa8580109
953 Author: Robert Bragg <robert@linux.intel.com>
954 Date: Tue Sep 14 18:50:50 2010 +0100
956 material-arbfp: Another pass at simplifying the code
958 Previously the backend private state was used to either link to an
959 authority material or provide authoritative program state. The mechanism
960 seemed overly complex and felt very fragile. I made a recent comment
961 which added a lot of documentation to make it easier to understand but
962 still it didn't feel very elegant.
964 This patch takes a slightly different approach; we now have a
965 ref-counted ArbfpProgramState object which encapsulates a single ARBfp
966 program and the backend private state now just has a single member which
967 is a pointer to one of these arbfp_program_state objects. We no longer
968 need to cache pointers to our arbfp-authority and so we can get rid of
969 a lot of awkward code that ensured these pointers were
970 updated/invalidated at the right times. The program state objects are
971 not tightly bound to a material so it will also allow us to later
972 implement a cache mechanism that lets us share state outside a materials
973 ancestry. This may help to optimize code not following the
974 recommendations of deriving materials from templates, avoiding one-shot
975 materials and not repeatedly modifying materials because even if a
976 material's ancestry doesn't naturally lead us to shareable state we can
977 fallback to searching for shareable state using central hash tables.
979 clutter/cogl/cogl/cogl-material-arbfp.c | 600 +++++++++++++------------------
980 1 file changed, 256 insertions(+), 344 deletions(-)
982 commit f6dc3ddcbaf919e1ddcc218b6a1b7b570f4ff829
983 Author: Robert Bragg <robert@linux.intel.com>
984 Date: Mon Jul 5 21:33:26 2010 +0100
986 material: Adds experimental cogl_material_foreach_layer API
988 This adds a way to iterate the layer indices of the given material since
989 cogl_material_get_layers has been deprecated. The user provides a
990 callback to be called once for each layer.
992 Because modification of layers in the callback may potentially
993 invalidate any number of the internal CoglMaterialLayer structures and
994 invalidate the material's layer cache this should be more robust than
995 cogl_material_get_layers() which used to return a const GList *
996 pointing directly to internal state.
998 clutter/cogl/cogl/cogl-material-arbfp.c | 12 ++--
999 clutter/cogl/cogl/cogl-material-opengl.c | 18 ++---
1000 clutter/cogl/cogl/cogl-material-private.h | 10 +--
1001 clutter/cogl/cogl/cogl-material.c | 108 ++++++++++++++++++++---------
1002 clutter/cogl/cogl/cogl-material.h | 33 +++++++++
1003 5 files changed, 129 insertions(+), 52 deletions(-)
1005 commit d5eebedaa3c9e4ee54c7efffefd195c2e012c4d9
1006 Author: Robert Bragg <robert@linux.intel.com>
1007 Date: Tue Sep 14 12:13:30 2010 +0100
1009 material: don't declare backend vtables in headers
1011 This fixes the material backends to declare their constant vtable in the
1012 c file with a corresponding extern declaration in the header. This
1013 should fix complaints about duplicate symbols seen on OSX.
1015 clutter/cogl/cogl/cogl-material-arbfp-private.h | 2 +-
1016 clutter/cogl/cogl/cogl-material-arbfp.c | 2 ++
1017 clutter/cogl/cogl/cogl-material-fixed-private.h | 2 +-
1018 clutter/cogl/cogl/cogl-material-fixed.c | 2 ++
1019 clutter/cogl/cogl/cogl-material-glsl-private.h | 2 +-
1020 clutter/cogl/cogl/cogl-material-glsl.c | 2 ++
1021 6 files changed, 9 insertions(+), 3 deletions(-)
1023 commit 5583d9c12eb7b042a400b2d0e77f88fb06a414aa
1024 Author: Robert Bragg <robert@linux.intel.com>
1025 Date: Tue Sep 14 00:33:46 2010 +0100
1027 material-arbfp: don't recompile for constant changes
1029 Instead of lazily incorporating combine constants as arbfp PARAM
1030 constants in the source directly we now use program.local parameters
1031 instead so we can avoid repeating codegen if a material's combine
1032 constant is updated. This should be a big win for applications animating
1033 a constant used for example in an animated interpolation, such as
1036 http://bugzilla.clutter-project.org/show_bug.cgi?id=2280
1038 clutter/cogl/cogl/cogl-material-arbfp.c | 68 ++++++++++++++++++++-----------
1039 1 file changed, 45 insertions(+), 23 deletions(-)
1041 commit 2815cf471972cefded669bd4596d46f91178a049
1042 Author: Robert Bragg <robert@linux.intel.com>
1043 Date: Tue Sep 14 00:27:57 2010 +0100
1045 material-arbfp: don't redo codegen for texture changes
1047 This makes it so we don't consider LAYER_STATE_TEXTURE changes to affect
1048 the arbfp code. This should avoid a lot of unneeded passes of
1049 code generation for applications modifying the texture for a layer.
1051 clutter/cogl/cogl/cogl-material-arbfp.c | 12 +++++++++---
1052 1 file changed, 9 insertions(+), 3 deletions(-)
1054 commit 3adeef6604966e4b61a6058eb6ae00629cfcf7c9
1055 Author: Robert Bragg <robert@linux.intel.com>
1056 Date: Tue Sep 14 00:18:02 2010 +0100
1058 material: make layer/material_pre_changes mutually exclusive
1060 This makes it so we only notify backends of either a single material
1061 change or a single layer change. Previously all material STATE_LAYERS
1062 changes would be followed by a more detailed layer change.
1064 For backends that perform code generation for fragment processing they
1065 typically need to understand the details of how layers get changed to
1066 determine if they need to repeat codegen. It doesn't help them to report
1067 a material STATE_LAYERS change for all layer changes since it's so
1068 broad, they really need to wait for the layer change to be notified.
1070 What does help though is to report a STATE_LAYERS change for a change in
1071 material->n_layers because they typically do need to repeat codegen in
1074 clutter/cogl/cogl/cogl-material-arbfp.c | 7 +++++++
1075 clutter/cogl/cogl/cogl-material.c | 22 +++++++++++++++++++++-
1076 2 files changed, 28 insertions(+), 1 deletion(-)
1078 commit 16e9794318b9fe13126b0b19c77a54c4714262a2
1079 Author: Robert Bragg <robert@linux.intel.com>
1080 Date: Mon Sep 13 23:52:18 2010 +0100
1082 material-arbfp: fixes for how we track private state
1084 This fixes a number of issues relating to how we track the arbfp private
1085 state associated with CoglMaterials. At the same time it adds much more
1086 extensive code documentation to try and make it a bit more approachable.
1088 clutter/cogl/cogl/cogl-material-arbfp.c | 175 +++++++++++++++++++++++++------
1089 1 file changed, 143 insertions(+), 32 deletions(-)
1091 commit a114843f744cacc43a4bed4a7186f1746673f01a
1092 Author: Robert Bragg <robert@linux.intel.com>
1093 Date: Mon Sep 13 23:05:49 2010 +0100
1095 material: pass material owner for layer pre changes
1097 When notifying a backend about a layer being modified we now pass the
1098 layers current owner for reference. NB: Although a layer can indirectly
1099 be referenced by multiple layers, a layer is considered immutable once
1100 it has dependants, so there is only ever one material associated with a
1101 layer being modified. Passing the material pointer to the backends
1102 layer_pre_change callback can be useful for backends that associate
1103 their private state with materials and may need to update that state in
1104 response to layer changes.
1106 clutter/cogl/cogl/cogl-material-arbfp.c | 11 ++++++++++-
1107 clutter/cogl/cogl/cogl-material-private.h | 3 ++-
1108 clutter/cogl/cogl/cogl-material.c | 7 ++++---
1109 3 files changed, 16 insertions(+), 5 deletions(-)
1111 commit d9a32f979c7fc2c3e7bd58c29b36208be1fd01c9
1112 Author: Robert Bragg <robert@linux.intel.com>
1113 Date: Mon Sep 13 22:56:44 2010 +0100
1115 arbfp: rename get_arbfp_authority clarifying semantics
1117 This renames the get_arbfp_authority function to
1118 get_arbfp_authority_no_check to clarify that the function doesn't
1119 validate that the authority cache is still valid by looking at the age
1120 of the referenced material. The function should only be used when we
1121 *know* the cache has already been checked.
1123 clutter/cogl/cogl/cogl-material-arbfp.c | 16 ++++++++++------
1124 1 file changed, 10 insertions(+), 6 deletions(-)
1126 commit ed1123a06b6afe3d98342f2550cb6f5cd248a578
1127 Author: Robert Bragg <robert@linux.intel.com>
1128 Date: Mon Sep 13 21:26:31 2010 +0100
1130 material: track if material change is layer change
1132 We now pass a boolean to _cogl_material_pre_change_notify to know when
1133 a material change is as a result of a layer change. We plan to use this
1134 information to avoid notifying the backends about material changes if
1135 they are as a result of layer changes. This will simplify the handling
1136 of state changes in the backends because they can assume that layer and
1137 material changes are mutually exclusive.
1139 clutter/cogl/cogl/cogl-material.c | 52 +++++++++++++++++++++----------------
1140 1 file changed, 29 insertions(+), 23 deletions(-)
1142 commit 53acf4d1b0ad372205c1b8f1dcecfef2777d13d5
1143 Author: Robert Bragg <robert@linux.intel.com>
1144 Date: Mon Sep 13 21:21:09 2010 +0100
1146 material: Adds _get_layer_combine_constant API
1148 This adds an internal _cogl_material_get_layer_combine_constant function
1149 so we can query the current layer combine constant back. We should
1150 probably make this a public property getter, but for now we just need
1151 this so we can read the constant in the arbfp backend.
1153 clutter/cogl/cogl/cogl-material-private.h | 5 +++++
1154 clutter/cogl/cogl/cogl-material.c | 26 ++++++++++++++++++++++++++
1155 2 files changed, 31 insertions(+)
1157 commit 7f95015c6d0f7e1652b88d8e534cee323eb408f4
1158 Author: Robert Bragg <robert@linux.intel.com>
1159 Date: Mon Sep 13 21:17:30 2010 +0100
1161 material: track unit state with arbfp private state
1163 We are going to start tracking more per-texture unit state with arbfp
1164 private state so this adds an internal UnitState type and we allocate an
1165 array of these when setting up a new private state structure. The first
1166 thing that has been moved into this is the sampled boolean to know when
1167 a particular texture unit gets sampled from in the generated arbfp code.
1169 clutter/cogl/cogl/cogl-material-arbfp.c | 36 +++++++++++++++++++++++--------
1170 1 file changed, 27 insertions(+), 9 deletions(-)
1172 commit 98516061c328fd4306b2059cd6bc7d443d4900a3
1173 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1174 Date: Wed Sep 15 11:56:59 2010 +0100
1176 Enumeration value should be on the same line
1178 The glib-mkenums script is not clever enough to deal with
1180 FLAGS_VALUE = FLAGS_A |
1183 And since this breaks the enumeration GType and the introspection data,
1184 we cannot really wait for it to be fixed.
1186 See: https://bugzilla.gnome.org/show_bug.cgi?id=629741
1188 http://bugzilla.clutter-project.org/show_bug.cgi?id=2238
1190 clutter/cogl/cogl/cogl-buffer.h | 3 +--
1191 1 file changed, 1 insertion(+), 2 deletions(-)
1193 commit d45c1671d12ad056362e7fb39a0ca8ca9a981660
1194 Author: Robert Bragg <robert@linux.intel.com>
1195 Date: Wed Sep 1 15:15:20 2010 +0100
1197 cogl-framebuffer: fix leak when popping framebuffer
1199 We were using g_slist_remove_link instead of g_slist_delete_link
1200 resulting in a memory leak. Thanks to Simon Lanzmich for
1203 clutter/cogl/cogl/cogl-framebuffer.c | 2 +-
1204 1 file changed, 1 insertion(+), 1 deletion(-)
1206 commit 88023d438d3124792ba58ad624ba537b27568528
1207 Author: Robert Bragg <robert@linux.intel.com>
1208 Date: Mon Aug 16 21:11:42 2010 +0100
1210 Initialize the cogl uprof state in cogl_create_context
1212 This avoids the use of of gcc constructor and destructor attributes to
1213 initialize the cogl uprof context and optionally print a cogl uprof
1214 report at app exit. We now initialize the uprof context in
1215 cogl_context_create instead.
1217 clutter/cogl/cogl/cogl-context.c | 17 +++++++++++++++++
1218 clutter/cogl/cogl/cogl-profile.c | 30 ++++++++++++++++--------------
1219 clutter/cogl/cogl/cogl-profile.h | 3 +++
1220 3 files changed, 36 insertions(+), 14 deletions(-)
1222 commit d9ee3be835465650ea474b971f028b49321ca7e2
1223 Author: Robert Bragg <robert@linux.intel.com>
1224 Date: Mon Jul 26 15:21:18 2010 +0100
1226 journal: provide more detailed uprof instrumentation
1228 This adds more timing around key stages of the journal flushing process.
1230 clutter/cogl/cogl/cogl-journal.c | 39 ++++++++++++++++++++++++++++++++++++
1231 clutter/cogl/cogl/cogl-material.c | 40 ++++++++++++++++++++++++++-----------
1232 2 files changed, 67 insertions(+), 12 deletions(-)
1234 commit fb7bf9ce0231ee4f54675ebe71b01b5e4bf98bc5
1235 Author: Robert Bragg <robert@linux.intel.com>
1236 Date: Mon Jun 21 15:36:46 2010 +0100
1238 profile: Update to uprof-0.3 dep for --enable-profile
1240 When building with --enable-profile we now depend on the uprof-0.3
1241 developer release which brings a few improvements:
1243 » It lets us "fix" how we initialize uprof so that instead of using a shared
1244 object constructor/destructor (which was a hack used when first adding
1245 uprof support to Clutter) we can now initialize as part of clutter's
1246 normal initialization code. As a side note though, I found that the way
1247 Clutter initializes has some quite serious problems whenever it
1248 involves GOptionGroups. It is not able to guarantee the initialization
1249 of dependencies like uprof and Cogl. For this reason we still use the
1250 contructor/destructor approach to initialize uprof in Cogl.
1252 » uprof-0.3 provides a better API for adding custom columns when reporting
1253 timer and counter statistics which lets us remove quite a lot of manual
1254 report generation code in clutter-profile.c.
1256 » uprof-0.3 provides a shared context for tracking mainloop timer
1257 statistics. This means any mainloop based library following the same
1258 "Mainloop" timer naming convention can use the shared context and no
1259 matter who ends up owning the final mainloop the statistics will always
1260 be in the same place. This allows profiling of Clutter with an
1261 external mainloop such as with the Mutter compositor.
1263 » uprof-0.3 can export statistics over dbus and comes with an ncurses
1264 based ui to vizualize timer and counter stats live.
1266 The latest version of uprof can be cloned from:
1267 git://github.com/rib/UProf.git
1270 clutter/clutter-debug.h | 65 +++---
1271 clutter/clutter-main.c | 45 ++++-
1272 clutter/clutter-profile.c | 345 ++++++++++++++++++++------------
1273 clutter/clutter-profile.h | 8 +
1274 clutter/cogl/cogl/cogl-debug-options.h | 145 ++++++++++++++
1275 clutter/cogl/cogl/cogl-debug.c | 37 +---
1276 clutter/cogl/cogl/cogl-debug.h | 18 +-
1277 clutter/cogl/cogl/cogl-profile.c | 48 +++++
1278 clutter/cogl/cogl/cogl-profile.h | 4 +
1279 clutter/cogl/cogl/cogl-texture-3d.c | 1 +
1281 12 files changed, 514 insertions(+), 206 deletions(-)
1283 commit a45f67bbdcd8cb53c2daebd11acebd906647eda3
1284 Author: Neil Roberts <neil@linux.intel.com>
1285 Date: Mon Sep 6 17:18:11 2010 +0100
1287 cogl-framebuffer: Clear the renderbuffer list on failure
1289 When try_creating_fbo fails it deletes any intermediate render buffers
1290 that were created. However it doesn't clear the list so I think if it
1291 failed a second time it would try to delete the render buffers
1292 again. This could potentially cause problems if a subsequent fbo is
1293 created because the destructor for the original might delete the
1294 renderbuffers of the new fbo.
1296 clutter/cogl/cogl/cogl-framebuffer.c | 4 ++++
1297 1 file changed, 4 insertions(+)
1299 commit 570fa3f0442d528af8aa50114fc79085c541b661
1300 Author: Robert Bragg <robert@linux.intel.com>
1301 Date: Sat Sep 11 02:31:03 2010 +0100
1303 clone: scale src with apply_transform not cogl_scale
1305 Since a ClutterClone may be allocated a different size than its source
1306 actor we need to apply a scale factor before painting the source actor.
1307 We were manually using cogl_scale to do this in clutter_clone_paint but
1308 really this kind of thing is best handled in an implementation of the
1309 apply_transform virtual so Clutter can be aware of the transform for
1310 other purposes, such as input transformations. Also we want to provide
1311 an implementation of the get_paint_volume virtual where Clutter will
1312 also expect to be able to use the apply_transform virtual to transform
1313 the volume into its parent's coordinate space.
1315 clutter/clutter-clone.c | 46 ++++++++++++++++++++++++++++++----------------
1316 1 file changed, 30 insertions(+), 16 deletions(-)
1318 commit ad398d583b7b5e2b3e3a0c00eda6b5eb358121d9
1319 Author: Robert Bragg <robert@linux.intel.com>
1320 Date: Wed Sep 8 01:41:01 2010 +0100
1322 glx: Mark stage clip initialized even for NULL user clip
1324 If a NULL clip is passed to clutter_stage_glx_add_redraw_clip then we
1325 update the redraw clip to have width of 0, but we weren't setting
1326 stage_glx->initialized_redraw_clip = TRUE. This could result in a full,
1327 unclipped stage redraw being reduced to a clipped redraw.
1329 clutter/glx/clutter-stage-glx.c | 5 ++---
1330 1 file changed, 2 insertions(+), 3 deletions(-)
1332 commit 8d2a3d608869ef09aff42db7bc537ae927f8d1c1
1333 Author: Robert Bragg <robert@linux.intel.com>
1334 Date: Tue Sep 7 22:02:23 2010 +0100
1336 actor: warn if allocating actor not descending from stage
1338 This adds a verbose warning that will be displayed if
1339 clutter_actor_allocate is passed an actor that isn't a descendent of a
1340 ClutterStage. Layouting should always bubble up from a stage so this
1341 condition is likely to indicate a buggy container that allocating a
1342 child that it has already unparented.
1344 clutter/clutter-actor.c | 7 +++++++
1345 1 file changed, 7 insertions(+)
1347 commit ff4c24f0a498e2922b20160482fa2c60ca8d9c40
1348 Author: Robert Bragg <robert@linux.intel.com>
1349 Date: Tue Sep 7 17:00:49 2010 +0100
1351 geometry: Adds a clutter_geometry_intersects API
1353 This adds a public function named clutter_geometry_intersects which
1354 determines if two geometries intersect or not returning TRUE if so else
1357 clutter/clutter-actor.c | 26 ++++++++++++++++++++++++++
1358 clutter/clutter-types.h | 8 +++++---
1359 doc/reference/clutter/clutter-sections.txt | 1 +
1360 3 files changed, 32 insertions(+), 3 deletions(-)
1362 commit 8a2e164354c36bc817f8d48d630808f00cb9d06f
1363 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1364 Date: Mon Aug 16 16:02:53 2010 +0100
1366 actor-box: Correctly clamp to pixel
1368 Use ceilf() to round up the right side of the actor's box, and floorf()
1369 to round down the left side.
1371 clutter/clutter-actor.c | 8 ++++----
1372 1 file changed, 4 insertions(+), 4 deletions(-)
1374 commit f5f066df9ce7f7de19015371cf8399534661b959
1375 Author: Robert Bragg <robert@linux.intel.com>
1376 Date: Tue Sep 7 13:10:55 2010 +0100
1378 Try to clean up how we handle actor transformations
1380 When building actor relative transforms, instead of using the matrix
1381 stack to combine transformations and making assumptions about what is
1382 currently on the stack we now just explicitly initialize an identity
1383 matrix and apply transforms to that.
1385 This removes the full_vertex_t typedef for internal transformation code
1386 and we just use ClutterVertex.
1388 ClutterStage now implements apply_transform like any other actor now
1389 and the code we had in _cogl_setup_viewport has been moved to the
1390 stage's apply_transform instead.
1392 ClutterStage now tracks an explicit projection matrix and viewport
1393 geometry. The projection matrix is derived from the perspective whenever
1394 that changes, and the viewport is updated when the stage gets a new
1395 allocation. The SYNC_MATRICES mechanism has been removed in favour of
1396 _clutter_stage_dirty_viewport/projection() APIs that get used when
1397 switching between multiple stages to ensure cogl has the latest
1398 information about the onscreen framebuffer.
1400 clutter/clutter-actor.c | 752 +++++++++++------------------------
1401 clutter/clutter-backend.c | 22 +-
1402 clutter/clutter-main.c | 28 --
1403 clutter/clutter-private.h | 42 +-
1404 clutter/clutter-stage.c | 288 +++++++++++++-
1405 clutter/clutter-texture.c | 18 +-
1406 clutter/osx/clutter-stage-osx.c | 7 -
1407 clutter/win32/clutter-stage-win32.c | 7 -
1408 clutter/x11/clutter-stage-x11.c | 41 +-
1409 doc/clutter-actor-invariants.txt | 5 -
1410 10 files changed, 592 insertions(+), 618 deletions(-)
1412 commit ab008948cfdde8ca9a9842c2e9000db0d0f3ad49
1413 Author: Robert Bragg <robert@linux.intel.com>
1414 Date: Tue Sep 7 11:55:23 2010 +0100
1416 actor: Add _get_stage_internal to clutter-private.h
1418 This adds _clutter_actor_get_stage_internal to clutter-private.h since
1419 we plan to use it in clutter-offscreen-effect when preparing to
1420 redirect an actor offscreen.
1422 clutter/clutter-actor.c | 28 +++++++++++++---------------
1423 clutter/clutter-private.h | 1 +
1424 2 files changed, 14 insertions(+), 15 deletions(-)
1426 commit 64088ea4de6334e10ad99c0844ffab057f1557ab
1427 Merge: 28f28c0 e8e360e
1428 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1429 Date: Mon Sep 13 15:51:18 2010 +0100
1431 Merge remote branch 'elliot/cookbook-animations-reuse'
1433 * elliot/cookbook-animations-reuse:
1434 cookbook: Added a recipe for reusing a complex animation
1435 cookbook: Added id for section in "rotating an actor" recipe
1436 cookbook: Simplified and clarified example code
1437 cookbook: Cleaned up the "animations reuse" example
1438 cookbook: Refactored reusable animation example
1439 cookbook: Added example for animation reuse recipe
1441 commit 28f28c030994621d931a7ed61bd529644947f9c3
1442 Author: Murray Cumming <murrayc@murrayc.com>
1443 Date: Mon Sep 13 16:16:25 2010 +0200
1445 Remove trailin enum commas, avoiding C++ warnings.
1447 http://bugzilla.clutter-project.org/show_bug.cgi?id=2314
1449 clutter/clutter-align-constraint.h | 2 +-
1450 clutter/clutter-event.h | 4 ++--
1451 clutter/clutter-types.h | 2 +-
1452 clutter/cogl/cogl/cogl-types.h | 2 +-
1453 clutter/cogl/cogl/cogl-vertex-buffer.h | 2 +-
1454 5 files changed, 6 insertions(+), 6 deletions(-)
1456 commit e8e360eaa7207a677738ce15496499ac7196a5b5
1457 Author: Elliot Smith <elliot.smith@intel.com>
1458 Date: Mon Sep 13 14:29:37 2010 +0100
1460 cookbook: Added a recipe for reusing a complex animation
1462 This recipe explains how to "reuse" the same animation
1463 definition for different actors, by creating a new
1464 instance of a "rig" (empty container) and animation
1465 for the rig each time the animation is required.
1467 An actor is then re-parented to the rig and animated
1468 using it, rather than being animated directly.
1470 JSON is used to define the rig + animator, to make
1471 creating new instances of them simpler. The recipe
1472 also discusses various caveats around using this
1473 approach, rather than directly animating an actor.
1475 doc/cookbook/Makefile.am | 1 +
1476 doc/cookbook/animations.xml | 378 ++++++++++++++++++++++++++++++
1477 doc/cookbook/videos/animations-reuse.ogv | Bin 0 -> 60837 bytes
1478 3 files changed, 379 insertions(+)
1480 commit 6548bee56ca8401d2e9d31e33bf4fcd5a65b92f5
1481 Author: Elliot Smith <elliot.smith@intel.com>
1482 Date: Mon Sep 13 10:28:16 2010 +0100
1484 cookbook: Added id for section in "rotating an actor" recipe
1486 Added an id to a section in the "rotating an actor" recipe,
1487 so that it can be referred to from the "reusing an animation"
1490 doc/cookbook/animations.xml | 2 +-
1491 1 file changed, 1 insertion(+), 1 deletion(-)
1493 commit 82ab00930b63d3860f96ac99da9cdc8128de1aee
1494 Author: Elliot Smith <elliot.smith@intel.com>
1495 Date: Thu Sep 9 12:02:02 2010 +0100
1497 cookbook: Simplified and clarified example code
1499 Modified the "animation reuse" sample code to provide
1500 a simpler example to explain in the recipe.
1502 Also modified variable names to mirror the names used
1503 for the previous "complex animation" example and added
1504 some more comments, to further simplify and support the
1507 .../examples/animations-reuse-animation.json | 36 +++++--------------
1508 doc/cookbook/examples/animations-reuse-ui.json | 37 +++++++++++++++++---
1509 doc/cookbook/examples/animations-reuse.c | 20 ++++++++---
1510 3 files changed, 56 insertions(+), 37 deletions(-)
1512 commit d7a3e35f46593e04cf8cfe5eca18e3b2c06ff35b
1513 Author: Elliot Smith <elliot.smith@intel.com>
1514 Date: Wed Sep 1 11:18:15 2010 +0100
1516 cookbook: Cleaned up the "animations reuse" example
1518 With some help from pippin, moved variable declarations
1519 into more sensible positions within their functions,
1520 changed a function name, and found a better way
1521 to unref a script once its associated actor has
1524 .../examples/animations-reuse-animation.json | 1 -
1525 doc/cookbook/examples/animations-reuse.c | 30 +++++++++-----------
1526 2 files changed, 14 insertions(+), 17 deletions(-)
1528 commit d4190cbf8ce8c667110744976c8cdd52ff3ede81
1529 Author: Elliot Smith <elliot.smith@intel.com>
1530 Date: Wed Sep 1 10:21:23 2010 +0100
1532 cookbook: Refactored reusable animation example
1534 Extracted the animation into its own JSON definition,
1535 then create a new script and get the animation each
1536 time a rectangle is clicked.
1538 Removes the need to reparent onto the background and
1539 copy property values to the rectangle after the animation,
1540 and generally much cleaner.
1542 .../examples/animations-reuse-animation.json | 63 ++++++++++
1543 doc/cookbook/examples/animations-reuse-ui.json | 53 +++++++++
1544 doc/cookbook/examples/animations-reuse.c | 102 ++++++----------
1545 doc/cookbook/examples/animations-reuse.json | 124 --------------------
1546 4 files changed, 155 insertions(+), 187 deletions(-)
1548 commit acc28cf60c482bf56bb298630a9d1b75f350d31b
1549 Author: Elliot Smith <elliot.smith@intel.com>
1550 Date: Tue Aug 31 17:42:37 2010 +0100
1552 cookbook: Added example for animation reuse recipe
1554 Added an example showing how to reuse a ClutterAnimator
1555 instance to animate multiple actors at different times
1556 using an animatable rig, combined with reparenting.
1558 doc/cookbook/examples/Makefile.am | 2 +
1559 doc/cookbook/examples/animations-reuse.c | 117 +++++++++++++++++++++++++
1560 doc/cookbook/examples/animations-reuse.json | 124 +++++++++++++++++++++++++++
1561 3 files changed, 243 insertions(+)
1563 commit 209bef6f8a4059d8cb7a6b4d3c64d25898f46047
1564 Author: Alejandro Piñeiro <apinheiro@igalia.com>
1565 Date: Thu Jul 22 13:19:34 2010 +0200
1567 cally: fixing public headers
1569 Cally headers were including specific clutter object headers.
1571 This caused a problem including cally.h on a external program.
1573 http://bugzilla.clutter-project.org/show_bug.cgi?id=2234
1575 clutter/cally/cally-actor.h | 2 +-
1576 clutter/cally/cally-clone.h | 2 +-
1577 clutter/cally/cally-group.h | 2 +-
1578 clutter/cally/cally-rectangle.h | 2 +-
1579 clutter/cally/cally-stage.h | 2 +-
1580 clutter/cally/cally-text.h | 2 +-
1581 clutter/cally/cally-texture.h | 2 +-
1582 7 files changed, 7 insertions(+), 7 deletions(-)
1584 commit dec0863f58d7a67791d29cf0e53eb24ea09b222c
1585 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1586 Date: Mon Sep 13 11:31:46 2010 +0100
1588 build: Add tesselator to the include paths
1590 clutter/cogl/cogl/Makefile.am | 1 +
1591 1 file changed, 1 insertion(+)
1593 commit 94e2c7a9495e61640f602e01c3d5adff9338affe
1594 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1595 Date: Mon Sep 13 02:15:44 2010 +0100
1597 build: Generate ClutterJson in the top directory
1599 Instead of doing the shlib trick, build ClutterJson (if needed) inside
1600 the top-level clutter/ directory - similar to a non-recursive layout.
1602 Hopefully, one day, we'll be able to do this with a real non-recursive
1605 clutter/Makefile.am | 35 +++++++++++++++++++++++------------
1606 clutter/json/Makefile.am | 30 ------------------------------
1607 2 files changed, 23 insertions(+), 42 deletions(-)
1609 commit 40af71fad72794af90cf6b11f15e5fa64bed188d
1610 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1611 Date: Mon Sep 13 02:01:50 2010 +0100
1613 build: List the units inside a file
1615 This avoids trying to run test-conformance -l multiple times.
1617 tests/conform/Makefile.am | 9 ++++++---
1618 1 file changed, 6 insertions(+), 3 deletions(-)
1620 commit c03458a86175075bf7a46d8e58f7e3db5bd74f76
1621 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1622 Date: Mon Sep 13 02:01:21 2010 +0100
1624 build: Remove gir files from dist
1626 The introspection data is going to be generated, so it should never be
1629 clutter/Makefile.am | 4 ++--
1630 clutter/cogl/cogl/Makefile.am | 2 +-
1631 clutter/json/Makefile.am | 4 +++-
1632 3 files changed, 6 insertions(+), 4 deletions(-)
1634 commit 64924f0e98ed06924d8968d22e5ee257ee858db1
1635 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1636 Date: Sun Sep 12 19:25:47 2010 +0100
1638 build: Do not build a noinst library for the tesselator
1640 Let's try to keep Cogl's build as non-recursive as possible, in the hope
1641 that one day we'll be able to make it fully non-recursive along with the
1644 clutter/cogl/cogl/Makefile.am | 59 +++++++++++++++++++++++++-----
1645 clutter/cogl/cogl/tesselator/Makefile.am | 41 ---------------------
1647 3 files changed, 50 insertions(+), 51 deletions(-)
1649 commit 732eecf5c6c097b9f6ede3da376f61504e5cb48c
1650 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1651 Date: Fri Sep 10 18:21:45 2010 +0100
1653 cookbook: Use the new CLUTTER_KEY_* symbol constants
1655 Instead of the deprecated CLUTTER_* ones.
1657 doc/cookbook/events.xml | 18 +++++++++---------
1658 1 file changed, 9 insertions(+), 9 deletions(-)
1660 commit f2669df6b5c1c9c45c0694443f6748399d0a181c
1661 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1662 Date: Fri Sep 10 18:21:19 2010 +0100
1664 build: Disable deprecated API when building the cookbook examples
1666 Make sure we always use the latest API.
1668 doc/cookbook/examples/Makefile.am | 2 ++
1669 1 file changed, 2 insertions(+)
1671 commit 4ee05f8e21db9d2262befdc9d07f462bbd95446d
1672 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1673 Date: Fri Sep 10 13:41:49 2010 +0100
1675 keysyms: Update the macros to CLUTTER_KEY_*
1677 The keysyms defines in clutter-keysyms.h are generated from the X11 key
1678 symbols headers by doing the equivalent of a pass of sed from XK_* to
1679 CLUTTER_*. This might lead to namespace collisions, down the road.
1680 Instead, we should use the CLUTTER_KEY_* namespace.
1682 This commit includes the script, taken from GDK, that parses the X11
1683 key symbols and generates two headers:
1685 - clutter-keysyms.h: the default included header, with CLUTTER_KEY_*
1686 - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_*
1688 The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is
1689 not defined - essentially deprecating all the old key symbols.
1691 This does not change any ABI and, assuming that an application or
1692 library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source
1693 compatibility is still guaranteed.
1696 clutter/Makefile.am | 3 +
1697 clutter/clutter-keysyms-compat.h | 2208 +++++++++++++++
1698 clutter/clutter-keysyms-update.pl | 216 ++
1699 clutter/clutter-keysyms.h | 4193 +++++++++++++++-------------
1700 clutter/clutter-text.c | 46 +-
1701 doc/reference/clutter/Makefile.am | 1 +
1702 tests/conform/test-binding-pool.c | 30 +-
1703 tests/conform/test-clutter-text.c | 8 +-
1704 tests/interactive/Makefile.am | 4 +-
1705 tests/interactive/test-actor-clone.c | 4 +-
1706 tests/interactive/test-actors.c | 4 +-
1707 tests/interactive/test-binding-pool.c | 10 +-
1708 tests/interactive/test-box-layout.c | 14 +-
1709 tests/interactive/test-clip.c | 9 +-
1710 tests/interactive/test-cogl-shader-arbfp.c | 6 +-
1711 tests/interactive/test-cogl-shader-glsl.c | 6 +-
1712 tests/interactive/test-layout.c | 23 +-
1713 tests/interactive/test-paint-wrapper.c | 4 +-
1714 tests/interactive/test-pixmap.c | 6 +-
1715 tests/interactive/test-text-field.c | 12 +-
1716 tests/interactive/test-threads.c | 4 +-
1717 22 files changed, 4725 insertions(+), 2091 deletions(-)
1719 commit 1447eff00fe70f16350ee16dd86f5f8758ff3065
1720 Author: Lucas Rocha <lucasr.at.mundo@gmail.com>
1721 Date: Fri Sep 10 17:48:12 2010 +0100
1723 introspection: Add full path for the Clutter-1.0 inclusion
1725 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
1727 clutter/Makefile.am | 2 +-
1728 1 file changed, 1 insertion(+), 1 deletion(-)
1730 commit edb54574fa8ee8aaefd0f7021b7a5310b429f49b
1731 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1732 Date: Fri Sep 10 14:27:56 2010 +0100
1734 build: Disable deprecated API when building Clutter
1736 Make sure we don't use deprecated API internally by adding
1737 CLUTTER_DISABLE_DEPRECATED to the AM_CPPFLAGS.
1739 This requires adding -UCLUTTER_DISABLE_DEPRECATED to the introspection
1740 scanner CFLAGS, otherwise the deprecated API will never be introspected
1741 and the data generated will not be compatible.
1743 clutter/Makefile.am | 7 ++++---
1744 1 file changed, 4 insertions(+), 3 deletions(-)
1746 commit d76f64a10cdfbfe44f5cf3f35351ae8f3307d7df
1747 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1748 Date: Fri Sep 10 14:27:37 2010 +0100
1750 Do not use deprecated API internally
1752 clutter/clutter-backend.c | 8 +++++++-
1753 clutter/clutter-main.c | 18 ++++++++++++++----
1754 clutter/clutter-text.c | 32 ++++++++++++++++++++++++--------
1755 3 files changed, 45 insertions(+), 13 deletions(-)
1757 commit 0bd18fbcc9f9a01fe24945251a1a3e860b7c80a7
1758 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1759 Date: Fri Sep 10 12:24:37 2010 +0100
1763 NEWS | 21 +++++++++++++++++++++
1764 1 file changed, 21 insertions(+)
1766 commit 01362effca53d0a3149e3f81f6374b1440cbe2cd
1767 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1768 Date: Fri Sep 10 11:42:11 2010 +0100
1770 actor: Add a method for querying key focus
1772 A simple convenience method on Clutter.Actor for checking whether
1773 it has key focus assigned on the Stage to which it belongs.
1775 clutter/clutter-actor.c | 24 ++++++++++++++++++++++++
1776 clutter/clutter-actor.h | 2 ++
1777 doc/reference/clutter/clutter-sections.txt | 1 +
1778 3 files changed, 27 insertions(+)
1780 commit 71a4db613569cd08572db517a045224161ba67d7
1781 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1782 Date: Fri Sep 10 11:18:53 2010 +0100
1784 animation: Allow detaching an animation from an actor
1786 When animating an actor through clutter_actor_animate() and friends we
1787 might want forcibly detach the animation instance from the actor in
1788 order to start a new one - for instance, in response to user
1791 Currently, there is no way to do that except in a very convoluted way,
1792 by emitting the ::completed signal and adding a special case in the
1793 signal handlers; this is due to the fact that clutter_actor_animate()
1794 adds more logic than the one added by clutter_animation_set_object(),
1795 so calling set_object(NULL) or unreferencing the animation instance
1796 itself won't be enough.
1798 The right way to approach this is to add a new method to Clutter.Actor
1799 that detaches any eventual Animation currently referencing it.
1801 http://bugzilla.clutter-project.org/show_bug.cgi?id=2051
1803 clutter/clutter-animation.c | 53 ++++++++++++++++++++++++++++
1804 clutter/clutter-animation.h | 1 +
1805 doc/reference/clutter/clutter-sections.txt | 1 +
1806 3 files changed, 55 insertions(+)
1808 commit 3aa2d00c3bf034b478fcc040056c25ef6f46baa0
1809 Author: Colin Walters <walters@verbum.org>
1810 Date: Thu Sep 9 23:01:40 2010 +0100
1812 introspection: Don't look for installed Cogl-1.0.gir
1814 If we're depending on an uninstalled .gir, use --include-uninstalled.
1815 We need to explicitly specify Cogl to let the scanner know it's also
1818 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
1820 clutter/Makefile.am | 7 ++++++-
1821 1 file changed, 6 insertions(+), 1 deletion(-)
1823 commit 5f5369990fec5bfc734604761ed4ea49e78e6aa3
1824 Author: Colin Walters <walters@verbum.org>
1825 Date: Thu Sep 9 13:32:13 2010 -0400
1827 introspection: Don't look for installed Clutter-1.0.gir
1829 If we're depending on an uninstalled .gir, use --include-uninstalled.
1831 clutter/Makefile.am | 4 ++--
1832 1 file changed, 2 insertions(+), 2 deletions(-)
1834 commit 72a4fd9250564a75f9cef89a3070d5d0ab5a5c24
1835 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1836 Date: Thu Sep 9 16:45:51 2010 +0100
1838 po: Update Polish localization
1840 po/pl.po | 174 +++++++++++++++++++++++++++++---------------------------------
1841 1 file changed, 82 insertions(+), 92 deletions(-)
1843 commit d86dc377dea38678efa1f8b8e3aa5759f37d01ac
1844 Author: Chris Kühl <chrisk@openismus.com>
1845 Date: Thu Sep 9 16:41:37 2010 +0200
1847 Added documentation for alpha parameter in Behaviour constructors.
1849 http://bugzilla.clutter-project.org/show_bug.cgi?id=2304
1851 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
1853 clutter/clutter-behaviour-depth.c | 6 +++++-
1854 clutter/clutter-behaviour-ellipse.c | 6 +++++-
1855 clutter/clutter-behaviour-opacity.c | 10 +++++++---
1856 clutter/clutter-behaviour-path.c | 18 +++++++++++++++---
1857 clutter/clutter-behaviour-rotate.c | 6 +++++-
1858 clutter/clutter-behaviour-scale.c | 10 +++++++---
1859 6 files changed, 44 insertions(+), 12 deletions(-)
1861 commit 9e1cd15b48f4e6a9bb6928bf1218e7bea2b1b1ed
1862 Author: Neil Roberts <neil@linux.intel.com>
1863 Date: Thu Sep 9 12:15:59 2010 +0100
1865 cogl-vertex-buffer: Flush the framebuffer state first
1867 Flushing the framebuffer state can cause some drawing to occur if the
1868 framebuffer has a clip stack which needs the stencil buffer. This was
1869 causing the array pointers set up by enable_state_for_drawing_buffer
1870 to get mangled so it would crash when it hits glDrawArrays. This patch
1871 moves the framebuffer state flush to before it sets up the array
1874 http://bugzilla.clutter-project.org/show_bug.cgi?id=2297
1876 clutter/cogl/cogl/cogl-vertex-buffer.c | 13 ++++++++-----
1877 1 file changed, 8 insertions(+), 5 deletions(-)
1879 commit 0e325404aa50fcca400d0cb8020a36bcd81f4c37
1880 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1881 Date: Thu Sep 9 11:58:03 2010 +0100
1883 build: Allow using gettext 0.17
1885 This requires some autotools magic when setting up the environment
1886 through autogen.sh, because autoreconf does not do the right thing
1889 The correct order for setting up localization is:
1895 otherwise aclocal will copy the system's gettext.m4 instead of honouring
1896 the version we specified with AM_GNU_GETTEXT_VERSION in configure.ac.
1898 autogen.sh | 124 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1900 2 files changed, 107 insertions(+), 19 deletions(-)
1902 commit cfab64c1db609d7fd4840dd83a161af7527c17ab
1903 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1904 Date: Thu Sep 9 11:39:56 2010 +0100
1906 po: Update German localization
1908 po/de.po | 325 ++++++++++++++++++++++++++++++++------------------------------
1909 1 file changed, 166 insertions(+), 159 deletions(-)
1911 commit bcf20955d32b580195f45bf507a5970003f464cf
1912 Author: Robert Bragg <robert@linux.intel.com>
1913 Date: Wed Sep 8 23:33:45 2010 +0100
1915 ClutterX11TexturePixmap: Fix unbalanced error trapping
1917 I think this is what commit 2cf140550635 intended to do since it
1918 specifically mentioned cleaning up the trap in
1919 clutter_x11_texture_pixmap_set_pixmap, but although it moved the untrap
1920 to only be done in the case where Pixmap != None it left the position of
1921 the trap itself unchanged. This meant the error trapping wouldn't be
1922 balanced if pixmap == None since the untrap wouldn't be done. We now
1923 only trap and untrap around the XGetGeometry call done when pixmap !=
1926 http://bugzilla.clutter-project.org/show_bug.cgi?id=2303
1928 clutter/x11/clutter-x11-texture-pixmap.c | 3 +--
1929 1 file changed, 1 insertion(+), 2 deletions(-)
1931 commit 089a20e79d3f542ad74f34d7a318ef19718bdc40
1932 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1933 Date: Wed Sep 8 18:27:12 2010 +0100
1935 build: Add ClutterX11 introspection generation
1937 clutter/Makefile.am | 32 ++++++++++++++++++++++++++++++++
1938 1 file changed, 32 insertions(+)
1940 commit 32ea9702e664db8e0601362d2d1aae6c726f3c63
1941 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1942 Date: Wed Sep 8 17:50:38 2010 +0100
1944 build: Add XML files to the ignore blacklist
1946 tests/conform/Makefile.am | 1 +
1947 1 file changed, 1 insertion(+)
1949 commit f8bd45dbcea77e19a6a7e37edad535f6d3edd7cd
1950 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1951 Date: Wed Sep 8 17:39:04 2010 +0100
1953 x11-texture-pixmap: Do not go through g_object_get()
1955 The pixmap width and height are stored in our own private data
1956 structure; going through g_object_get() is pointless overhead.
1958 clutter/x11/clutter-x11-texture-pixmap.c | 16 +++++++---------
1959 1 file changed, 7 insertions(+), 9 deletions(-)
1961 commit 2cf14055063568038be607bd8f7ce3eea2285475
1962 Author: Owen W. Taylor <otaylor@fishsoup.net>
1963 Date: Wed Sep 8 11:34:58 2010 -0400
1965 Clean up CoglTexturePixmapX11 first
1967 With currently distributed versions of Mesa, calling XFreePixmap()
1968 before glxDestroyPixmap() will cause an X error from DRI. So, we
1969 need to make sure that we get rid of the CoglTexturePixmapX11 before
1972 clutter_x11_texture_pixmap_dispose(): Call
1973 clutter_x11_texture_pixmap_set_pixmap() instead of using XFreePixmap
1974 directly so that we leverage the text-clearing hack and destroy
1975 things in the right order.
1977 clutter_x11_texture_pixmap_set_pixmap(): Don't do a pointless roundtrip
1978 and trap a pointless error when setting pixmap to None.
1980 clutter_x11_texture_pixmap_set_pixmap(): Free damage resources when
1981 we are setting Pixmap to None.
1983 clutter_x11_texture_pixmap_set_window(): When setting a new window
1984 or setting the window to None, immedediately call
1985 cluter_x11_texture_pixmap_set_pixmap(). This means that set_window(None)
1986 immediately will free any referenced resources related to the window.
1988 http://bugzilla.clutter-project.org/show_bug.cgi?id=2303
1990 clutter/x11/clutter-x11-texture-pixmap.c | 46 ++++++++++++++++--------------
1991 1 file changed, 24 insertions(+), 22 deletions(-)
1993 commit ca8db4c2ee16e8c711baa40803c3dcd75ca2f382
1994 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1995 Date: Wed Sep 8 17:04:21 2010 +0100
1997 Add caller-allocates annotations
1999 For ClutterColor, ClutterUnits, ClutterInterval and the Perspective
2000 accessor in ClutterStage.
2002 clutter/clutter-color.c | 18 +++++++++---------
2003 clutter/clutter-fixed.c | 2 +-
2004 clutter/clutter-interval.c | 6 +++---
2005 clutter/clutter-stage.c | 3 ++-
2006 clutter/clutter-units.c | 23 ++++++++++++-----------
2007 5 files changed, 27 insertions(+), 25 deletions(-)
2009 commit 8a5686d83503d9b9a5c8e083d8613a8e9d1cf1f5
2010 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2011 Date: Wed Sep 8 16:41:47 2010 +0100
2013 Further annotation fixes
2015 clutter/clutter-actor.c | 10 +++++-----
2016 clutter/clutter-animator.c | 2 +-
2017 clutter/clutter-behaviour.c | 2 +-
2018 clutter/clutter-color.c | 8 ++++----
2019 clutter/clutter-container.c | 2 +-
2020 clutter/clutter-device-manager.c | 4 ++--
2021 clutter/clutter-frame-source.c | 4 +++-
2022 clutter/clutter-layout-manager.c | 6 +++---
2023 clutter/clutter-list-model.c | 2 +-
2024 clutter/clutter-main.c | 12 +++++++++---
2025 clutter/clutter-model.c | 4 ++--
2026 clutter/clutter-path.c | 3 ++-
2027 clutter/clutter-score.c | 10 +++++-----
2028 clutter/clutter-script.c | 7 ++++---
2029 clutter/clutter-stage-manager.c | 4 ++--
2030 clutter/clutter-stage-window.h | 16 ++++++++++++++++
2031 clutter/clutter-state.c | 2 +-
2032 clutter/clutter-timeout-pool.h | 4 ++++
2033 18 files changed, 66 insertions(+), 36 deletions(-)
2035 commit f1c44a27a17c66c80ac92f7365b7fcc85c9f0847
2036 Author: Owen W. Taylor <otaylor@fishsoup.net>
2037 Date: Wed Sep 8 10:37:58 2010 -0400
2039 introspection: Add missing (out) annotations
2041 Comprehensively add (out) annotations to functions parameters
2042 returning int/float/double.
2044 Not handled here: structure out returns like ClutterColor or
2045 ClutterPerspective or GValue that should get (out caller-allocates).
2047 Not handled here: Cogl
2049 http://bugzilla.clutter-project.org/show_bug.cgi?id=2302
2051 clutter/clutter-actor.c | 2 +-
2052 clutter/clutter-behaviour-depth.c | 4 ++--
2053 clutter/clutter-behaviour-ellipse.c | 10 +++++-----
2054 clutter/clutter-behaviour-opacity.c | 4 ++--
2055 clutter/clutter-behaviour-rotate.c | 6 +++---
2056 clutter/clutter-behaviour-scale.c | 8 ++++----
2057 clutter/clutter-cairo-texture.c | 4 ++--
2058 clutter/clutter-color.c | 6 +++---
2059 clutter/clutter-script-parser.c | 2 +-
2060 clutter/clutter-text.c | 6 +++---
2061 10 files changed, 26 insertions(+), 26 deletions(-)
2063 commit e4870ebaf461170e78f2ed6787beda541501d561
2064 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2065 Date: Wed Sep 8 15:15:57 2010 +0100
2067 Constify Event accessors and copy method
2069 This is still C, but at least we can get some sort of safety net when
2070 using the API correctly.
2072 clutter/clutter-backend.c | 6 ++---
2073 clutter/clutter-backend.h | 10 ++++----
2074 clutter/clutter-event.c | 48 ++++++++++++++++++-------------------
2075 clutter/clutter-event.h | 48 ++++++++++++++++++-------------------
2076 clutter/clutter-private.h | 10 ++++----
2077 clutter/x11/clutter-backend-x11.c | 6 ++---
2078 6 files changed, 64 insertions(+), 64 deletions(-)
2080 commit 8fb4c7b9a9f58a2137dfe981fac0001d4c64505c
2081 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2082 Date: Wed Sep 8 14:48:40 2010 +0100
2084 po: Rename the POT file
2088 po/clutter-1.0.pot | 1828 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2089 po/clutter.pot | 1828 ----------------------------------------------------
2090 4 files changed, 1830 insertions(+), 1830 deletions(-)
2092 commit 144da2ae3b49715ea72052a3722e03872694aa92
2093 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2094 Date: Wed Sep 8 14:40:52 2010 +0100
2096 po: Add clutter.pot to the repository
2098 Since we're not using intltool, and since we need to let people on
2099 Transifex generate their translations, we need to add the POT file
2103 po/clutter.pot | 1828 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2104 2 files changed, 1828 insertions(+), 1 deletion(-)
2106 commit 82bef432ed095b031408d858c00bffc140b21ed1
2107 Author: ElleUca <elle.uca@libero.it>
2108 Date: Wed Sep 8 12:44:43 2010 +0100
2110 po: Add italian translation
2112 po/it.po | 1837 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2113 1 file changed, 1837 insertions(+)
2115 commit 33b0d5ddb5d6b056db8371717d1600ce7572a095
2116 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2117 Date: Wed Sep 8 12:25:25 2010 +0100
2119 po: Update the translation files
2121 We are finally able to add the properties nicks and blurbs to the list
2122 of translatable strings, for UI builders to use. This means bumping the
2123 list of strings from 20-ish to a whopping 400. Whoopsie.
2125 po/de.po | 1852 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
2126 po/pl.po | 1849 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
2127 po/zh_CN.po | 1850 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
2128 3 files changed, 5369 insertions(+), 182 deletions(-)
2130 commit 948da3728d770c2c328286f3263322215aa76eec
2131 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2132 Date: Wed Sep 8 12:25:02 2010 +0100
2134 Add more /po files to the ignore list
2137 1 file changed, 2 insertions(+)
2139 commit 94c17dba51d9836c0add5f0b4bbd5b2306bfda8a
2140 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2141 Date: Wed Sep 8 12:23:50 2010 +0100
2143 build: Update autogen.sh
2145 Remove the fix-ups for shave and gtk-doc with libtool 1.5: we don't use
2146 shave any more, and we require libtool 2.2.
2148 Also remove the unnecessary autopoint: we use autoreconf, which calls it
2151 autogen.sh | 14 ++------------
2152 1 file changed, 2 insertions(+), 12 deletions(-)
2154 commit dfca349bbe8219d03db16cf7bc2d7e39cd4275f2
2155 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2156 Date: Wed Sep 8 12:22:58 2010 +0100
2158 build: Bump gettext version
2160 Apparently, gettext can only work with the same exact version it's
2164 1 file changed, 1 insertion(+), 1 deletion(-)
2166 commit dc8c7be7f0680095e6e507f05e01939d161e84e5
2167 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2168 Date: Wed Sep 8 11:56:06 2010 +0100
2170 Ignore more files under /po
2172 .gitignore | 10 ++++++++++
2173 1 file changed, 10 insertions(+)
2175 commit 4fedbad24e4ec434236b7b6c7f73421bd59c2130
2176 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2177 Date: Wed Sep 8 11:53:07 2010 +0100
2179 Update ignore files for m4 macros
2182 1 file changed, 4 insertions(+)
2184 commit a9e29e6fbafd073e78e19a74577b0d3d631a2214
2185 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2186 Date: Wed Sep 8 11:50:09 2010 +0100
2190 po/Makevars | 41 +++++++++++++++++++++++++++++++++++++++++
2191 1 file changed, 41 insertions(+)
2193 commit 98cac30d82299b3739f3801f71b5e2e931eb2e8d
2194 Author: Javier Jardón <jjardon@gnome.org>
2195 Date: Wed Sep 8 00:35:06 2010 +0200
2197 build: Use upstream gettext instead the glib one
2199 Fixes http://bugzilla.clutter-project.org/show_bug.cgi?id=2300
2202 clutter/Makefile.am | 1 +
2204 po/Makefile.in.in | 264 ---------------------------------------------------
2205 4 files changed, 6 insertions(+), 266 deletions(-)
2207 commit c4ca75350f54160482db2081219b9d8a77820f84
2208 Author: Owen W. Taylor <otaylor@fishsoup.net>
2209 Date: Tue Sep 7 19:56:42 2010 -0400
2211 introspection: Fix annotation for clutter_container_get_children()
2213 (element-type) should have a full name like Clutter.Actor rather than
2214 a non-namespaced name like Actor. gobject-introspection has become
2215 more strict about this with the recent scanner rewrite.
2217 http://bugzilla.clutter-project.org/show_bug.cgi?id=2301
2219 clutter/clutter-container.c | 2 +-
2220 1 file changed, 1 insertion(+), 1 deletion(-)
2222 commit 5e57539f3bdcb4d6004c3bcc9177706b175c500d
2223 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2224 Date: Tue Sep 7 21:10:40 2010 +0100
2226 build: Update introspection.m4
2228 build/autotools/introspection.m4 | 10 ++++++++--
2229 1 file changed, 8 insertions(+), 2 deletions(-)
2231 commit e678c746daf0ccd740328cae01feb5efa53f012c
2232 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2233 Date: Tue Sep 7 16:17:51 2010 +0100
2235 build: Add escaping in AS_IF()
2237 Based on a patch by: Owen W. Taylor <otaylor@fishsoup.net>
2239 configure.ac | 21 ++++++++++-----------
2240 1 file changed, 10 insertions(+), 11 deletions(-)
2242 commit 287b3ba542080dd4466060d05ac153dbec8dcde6
2243 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2244 Date: Tue Sep 7 15:23:35 2010 +0100
2246 Makefile.am.enums: Forgot an AM_V_GEN
2248 build/autotools/Makefile.am.enums | 2 +-
2249 1 file changed, 1 insertion(+), 1 deletion(-)
2251 commit 368b24b42054599e36c1e5125f84a2d032fd3377
2252 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2253 Date: Tue Sep 7 14:47:59 2010 +0100
2255 build: Fix up rules for enums and marshallers
2257 • Use addprefix instead of manually concatenating $(srcdir)
2258 • Use AM_V_GEN instead of QUIET_GEN, to avoid inter-dependencies
2259 • Do basic checks on GLIB_MKENUMS and GLIB_GENMARSHAL being defined
2260 • Do checks on the required variables being defined
2262 build/autotools/Makefile.am.enums | 26 +++++++++++++++++---------
2263 build/autotools/Makefile.am.marshal | 21 ++++++++++++++-------
2264 2 files changed, 31 insertions(+), 16 deletions(-)
2266 commit d7e5e9247bd5af2267a52087b74bbf4d2e17974f
2267 Author: Damien Lespiau <damien.lespiau@intel.com>
2268 Date: Tue Sep 7 14:17:18 2010 +0100
2270 build: Make the generated glib-mkenums c file depend on the headers
2272 What happens now if you rename an enum inside a header:
2274 • glib-mkenums generates the header file
2275 • a comparison is made with the previous version of the heade is made
2276 and no difference is found as you don't remove or create enums
2277 • the compilation of the generated mkenums c file fails because it has
2278 not been regenerated with the new, renamed, enum.
2280 That's why the generated clutter-enum-types.c needs to depend on the
2283 Of course such scenario should not happen in stable releases as enums
2284 are part of the API, but renaming enums happens in the development cycle
2285 and create compilation errors (very annoying when doing git bissects for
2288 build/autotools/Makefile.am.enums | 2 +-
2289 1 file changed, 1 insertion(+), 1 deletion(-)
2291 commit 1eae9fcd7edd3f8e330cd4be691e62fe759b67ec
2292 Author: Henrik Hedberg <hhedberg@innologies.fi>
2293 Date: Fri Sep 3 20:00:40 2010 +0300
2295 drag-action: Added x-drag-threshold and y-drag-threshold properties
2297 *** This is an API change ***
2299 Replaced the original drag-threshold property with two separate
2300 horizontal (x-drag-threshold) and vertical (y-drag-threshold)
2303 It is some times necessary to have different drag thresholds for the
2304 horizontal and vertical axes. For example, when a draggable actor is
2305 inside a horizontal scrolling area, only vertical movement must begin
2306 dragging. That can be achieved by setting the x-drag-threshold to
2307 G_MAXUINT while y-drag-threshold is something usual, say, 20 pixels.
2309 This is different than drag axis, because after the threshold
2310 has been cleared by the pointer, the draggable actor can be dragged
2311 along both axes (if allowed by the drag-axis property).
2313 http://bugzilla.clutter-project.org/show_bug.cgi?id=2291
2315 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2317 clutter/clutter-drag-action.c | 124 ++++++++++++++++++++++++++++++-----------
2318 clutter/clutter-drag-action.h | 7 ++-
2319 tests/interactive/test-drag.c | 19 +++++--
2320 3 files changed, 110 insertions(+), 40 deletions(-)
2322 commit ba9aa3b332cd8f6bd57983a5dfbb6a24e8fd8ad9
2323 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2324 Date: Mon Sep 6 18:08:44 2010 +0100
2326 texture: Move the material unref() in ::dispose
2328 clutter/clutter-texture.c | 28 +++++++++++++++-------------
2329 1 file changed, 15 insertions(+), 13 deletions(-)
2331 commit 128e981f6cf6e9a5b32da1b908d83f6c01d384fa
2332 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2333 Date: Mon Sep 6 17:50:57 2010 +0100
2335 texture: Do some more validation in get_cogl_texture()
2337 Check the layer type, even though right now we only have one type
2340 clutter/clutter-texture.c | 9 ++++++++-
2341 1 file changed, 8 insertions(+), 1 deletion(-)
2343 commit 7e56a98413817479d0501ce8af9fad3e6411104d
2344 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2345 Date: Thu Sep 2 14:48:30 2010 +0100
2347 texture: Use a base material for all instances
2349 Creating new materials for every Texture instance results in a lot of
2350 ARBfp programs being generated/compiled. Since most textures will just
2351 be similar we should create a template material for all of them, and
2352 then copy it in every instance. Cogl will try to optimize the generation
2353 of the program and, hopefully, will reuse the same program most of the
2356 With this change, a simple test shows that loading 48 textures will
2357 result in just two programs being compiled - with and without batching
2360 http://bugzilla.clutter-project.org/show_bug.cgi?id=2295
2362 clutter/clutter-texture.c | 19 ++++++++++--
2363 tests/interactive/Makefile.am | 1 +
2364 tests/interactive/test-texture-material.c | 47 +++++++++++++++++++++++++++++
2365 3 files changed, 65 insertions(+), 2 deletions(-)
2367 commit 283dce8e21b58bd769e923e9239d5607b820ddd9
2368 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2369 Date: Mon Sep 6 18:07:07 2010 +0100
2371 material: Check before unreferencing a texture
2373 When disposing a material layer of type 'texture' we should check that
2374 the texture handle is still valid before calling cogl_handle_unref().
2375 This avoids an assertion failure when disposing a ClutterTexture.
2377 clutter/cogl/cogl/cogl-material.c | 3 ++-
2378 1 file changed, 2 insertions(+), 1 deletion(-)
2380 commit b4120b81e4a472fff5f7388b4cfc8f717ecc23f0
2381 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2382 Date: Mon Sep 6 16:11:46 2010 +0100
2384 Add some more introspection annotations
2386 clutter/clutter-main.c | 6 +++---
2387 clutter/clutter-offscreen-effect.c | 4 +++-
2388 clutter/cogl/cogl/cogl-material.h | 2 +-
2389 clutter/cogl/cogl/cogl-offscreen.h | 11 ++++++-----
2390 clutter/cogl/cogl/cogl-types.h | 2 +-
2391 5 files changed, 14 insertions(+), 11 deletions(-)
2393 commit 070e239b6d887d43ff57320b7e325c8d689ce0ef
2394 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2395 Date: Fri Sep 3 17:15:22 2010 +0100
2397 docs: Fix up the Cogl API reference build
2399 doc/reference/cogl/Makefile.am | 41 ++++++++++++++++++++---------------
2400 doc/reference/cogl/cogl-docs.xml.in | 2 +-
2401 2 files changed, 25 insertions(+), 18 deletions(-)
2403 commit 7abe63953ef95eb197fe8e0069b5ddeb078f2ffd
2404 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2405 Date: Fri Sep 3 16:56:12 2010 +0100
2407 cogl-shader: Add deprecation guards for cogl_program_uniform_*
2409 clutter/cogl/cogl/cogl-shader.h | 14 +++++++++-----
2410 1 file changed, 9 insertions(+), 5 deletions(-)
2412 commit abef73bb58aa69ec63ebe2dbaed959da7dec0bb5
2413 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2414 Date: Fri Sep 3 16:55:12 2010 +0100
2416 Replace cogl_color_set_from_* with cogl_color_init_from_*
2418 The former is not yet "officially" deprecated by the latter, but it's
2419 confusing to have them both in the code base.
2421 clutter/clutter-deform-effect.c | 2 +-
2422 clutter/clutter-main.c | 2 +-
2423 clutter/clutter-offscreen-effect.c | 2 +-
2424 clutter/clutter-page-turn-effect.c | 2 +-
2425 clutter/clutter-stage.c | 36 +++++++++++------------
2426 clutter/clutter-text.c | 10 +++----
2427 clutter/clutter-texture.c | 12 ++++----
2428 clutter/cogl/cogl/cogl-material.c | 4 +--
2429 clutter/cogl/cogl/cogl.c | 6 ++--
2430 clutter/cogl/pango/cogl-pango-display-list.c | 10 +++----
2431 clutter/cogl/pango/cogl-pango-render.c | 10 +++----
2432 doc/cookbook/examples/text-shadow.c | 2 +-
2433 doc/cookbook/examples/textures-crossfade-cogl.c | 2 +-
2434 doc/cookbook/examples/textures-reflection.c | 4 +--
2435 doc/cookbook/textures.xml | 4 +--
2436 tests/conform/test-cogl-backface-culling.c | 2 +-
2437 tests/conform/test-cogl-blend-strings.c | 4 +--
2438 tests/conform/test-cogl-materials.c | 2 +-
2439 tests/conform/test-cogl-viewport.c | 2 +-
2440 tests/interactive/test-box-layout.c | 2 +-
2441 tests/interactive/test-cogl-tex-polygon.c | 10 +++----
2442 21 files changed, 64 insertions(+), 66 deletions(-)
2444 commit 0e2b0e496ee6b5f96e76e8dfa36dbf9a9b172de0
2445 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2446 Date: Fri Sep 3 16:52:06 2010 +0100
2448 docs: Add annotation glossary to the Cogl API reference
2450 It's the only way to let gtk-doc know that we're using annotations in
2453 doc/reference/cogl/cogl-docs.xml.in | 6 ++++++
2454 1 file changed, 6 insertions(+)
2456 commit 0caef5c8aab1ad5b417375a8417cc26f40d4ac6f
2457 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2458 Date: Fri Sep 3 16:10:44 2010 +0100
2460 docs: Fixes for gtk-doc
2462 clutter/clutter-alpha.c | 4 ++--
2463 clutter/clutter-interval.c | 2 +-
2464 clutter/cogl/cogl/cogl-matrix.h | 8 ++++----
2465 doc/reference/clutter/clutter-sections.txt | 2 ++
2466 4 files changed, 9 insertions(+), 7 deletions(-)
2468 commit b06b7109d6498f6d9f4083fd2464aca9d1c443b2
2469 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2470 Date: Fri Sep 3 15:53:52 2010 +0100
2475 1 file changed, 1 insertion(+)
2477 commit 7fee8cf26a07a41910ca730a4c22b61ddbc1e372
2478 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2479 Date: Fri Sep 3 15:44:03 2010 +0100
2481 cookbook: Add a short introduction for the Text chapter
2483 doc/cookbook/text.xml | 16 +++++++++++++---
2484 1 file changed, 13 insertions(+), 3 deletions(-)
2486 commit 655c60aaa9d90aeed6869faf9c0209006aa0cd61
2487 Author: Elliot Smith <elliot.smith@intel.com>
2488 Date: Fri Sep 3 14:31:44 2010 +0100
2490 cookbook: Added recipe for complex animation
2492 Uses ClutterAnimator to implement a reasonably complex
2493 animation of a single actor (movement along a path with
2494 simultaneous scaling).
2496 Provides a metaphor for thinking about ClutterAnimator
2497 animations (stage directions) and explains keys and key
2498 frames in some depth. Also compares ClutterAnimator
2499 with other possible approaches to this type of animation
2500 (implicit animations, ClutterState).
2502 doc/cookbook/Makefile.am | 1 +
2503 doc/cookbook/animations.xml | 427 ++++++++++++++++++++++++++++
2504 doc/cookbook/videos/animations-complex.ogv | Bin 0 -> 34212 bytes
2505 3 files changed, 428 insertions(+)
2507 commit 60ff660d421fd5aeefd18978cecaac60b6c13d88
2508 Author: Elliot Smith <elliot.smith@intel.com>
2509 Date: Fri Sep 3 11:56:33 2010 +0100
2511 cookbook: Added a second example to show "overlapping" transitions
2513 Added another JSON example to show how transitions can
2514 be easily overlapped when using ClutterAnimator (two
2515 sequences of 5 transitions, simultaneous with two
2516 sequences of 1 transition).
2518 Modified the C JSON loader program so it can be used with
2519 this example as well.
2521 .../examples/animations-complex-overlapping.json | 80 ++++++++++++++++++++
2522 doc/cookbook/examples/animations-complex.c | 9 ++-
2523 2 files changed, 87 insertions(+), 2 deletions(-)
2525 commit c0aa72a04259564d462ca4b80e080eacac885ecd
2526 Author: Elliot Smith <elliot.smith@intel.com>
2527 Date: Wed Sep 1 18:02:07 2010 +0100
2529 cookbook: Added complex animations example
2531 To support recipe about using ClutterAnimator to create
2534 doc/cookbook/examples/Makefile.am | 2 +
2535 doc/cookbook/examples/animations-complex.c | 64 ++++++++++++++++++++
2536 doc/cookbook/examples/animations-complex.json | 80 +++++++++++++++++++++++++
2537 3 files changed, 146 insertions(+)
2539 commit 9210c46730fa839c0e050a8be4ff04979730932c
2540 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2541 Date: Fri Sep 3 14:05:20 2010 +0100
2545 NEWS | 27 +++++++++++++++++++++++++++
2546 1 file changed, 27 insertions(+)
2548 commit 6c1559b6113d5eaa1f4b96110d365b7142d7de04
2549 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2550 Date: Fri Sep 3 13:55:07 2010 +0100
2552 build: Allow disabling linking with -Bsymbolic
2554 Some debugging tools might require full visibility for the Clutter
2555 symbols; for this reason, and to match what the Clutter dependencies
2556 already allow, we should provide a configure switch to disable linking
2557 with the -Bsymbolic flag.
2560 configure.ac | 35 ++++++++++++++++++++++-------------
2561 2 files changed, 25 insertions(+), 13 deletions(-)
2563 commit 3e74f42f07c0d4a5f830a49274cfe9a78268217f
2564 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2565 Date: Fri Sep 3 12:14:50 2010 +0100
2567 introspection: Add annotations
2569 Reduce the amount of warnings coming from g-ir-scanner.
2571 clutter/clutter-actor.c | 9 +++++----
2572 clutter/clutter-alpha.c | 4 +++-
2573 clutter/clutter-animator.c | 4 +++-
2574 clutter/clutter-behaviour.c | 2 +-
2575 clutter/clutter-box.c | 4 +++-
2576 clutter/clutter-container.c | 4 ++--
2577 clutter/clutter-event.c | 4 +++-
2578 clutter/clutter-interval.c | 4 ++--
2579 clutter/clutter-layout-manager.c | 6 ++++--
2580 clutter/clutter-main.c | 2 +-
2581 clutter/clutter-path.c | 2 +-
2582 clutter/clutter-script.c | 3 ++-
2583 clutter/clutter-shader.c | 12 +++++++++---
2584 clutter/clutter-state.c | 12 ++++++++----
2585 clutter/clutter-texture.c | 16 +++++++++-------
2586 clutter/clutter-timeline.c | 9 +++++----
2587 16 files changed, 61 insertions(+), 36 deletions(-)
2589 commit 67792b875038fbe4a4fbc339f463ee73ac811c40
2590 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2591 Date: Fri Sep 3 11:33:20 2010 +0100
2593 docs: Update the dependencies
2595 We depend on G-I 0.9.5 after the latest slew of changes.
2597 We also depend on UProf 0.3.
2600 1 file changed, 2 insertions(+), 2 deletions(-)
2602 commit 710c7aed400eb320581f160dc9cd0f4cba8676a8
2603 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2604 Date: Fri Sep 3 11:09:57 2010 +0100
2606 build: Use Makefile.introspection
2608 Whenever possible, instead of writing our own rules for generating GIR
2611 clutter/Makefile.am | 103 ++++++++++++++++-------------------------
2612 clutter/cogl/cogl/Makefile.am | 36 +++++++-------
2613 clutter/json/Makefile.am | 41 +++++++++-------
2614 configure.ac | 23 ++++-----
2615 4 files changed, 89 insertions(+), 114 deletions(-)
2617 commit f7854dd90ffe22a08b2e182e10484320f360b2c9
2618 Author: Colin Walters <walters@verbum.org>
2619 Date: Thu Sep 2 11:45:42 2010 -0400
2621 introspection: Build fixes
2623 This patch merges in substantial work from
2624 Emmanuele Bassi <ebassi@linux.intel.com>
2626 * Use new introspection --include-uninstalled API since we don't want
2627 to try to find the clutter-1.0.pc file before it's installed.
2628 * Use --pkg-export for Clutter-1.0.gir, since we want the .gir file to
2629 contain the associated pkg-config file.
2630 * Drop the use of --pkg for dependencies; those come from the associated
2631 .gir files. (Actually, --pkg is almost never needed)
2634 http://bugzilla.clutter-project.org/show_bug.cgi?id=2292
2636 clutter/Makefile.am | 34 +++++++++++++---------------------
2637 clutter/cogl/cogl/Makefile.am | 2 +-
2638 clutter/json/Makefile.am | 3 +--
2640 4 files changed, 16 insertions(+), 25 deletions(-)
2642 commit 24b12d626c3afdaa94b4119e218cf5b7436d0478
2643 Author: Damien Lespiau <damien.lespiau@intel.com>
2644 Date: Thu Sep 2 16:22:45 2010 +0100
2646 cex100: Remove C99-ism
2648 We were declaring a variable in the middle of the code. Blasphemy, for
2651 clutter/egl/clutter-backend-cex100.c | 33 +++++++++++++++++----------------
2652 1 file changed, 17 insertions(+), 16 deletions(-)
2654 commit 0216f0b2810f6c3f7db2b7ad615a9e259ab7059f
2655 Author: Damien Lespiau <damien.lespiau@intel.com>
2656 Date: Thu Sep 2 16:20:10 2010 +0100
2658 cex100: Use % not # to document constants
2660 gtk-doc contants should be prefixed by %, not # (types).
2662 clutter/egl/clutter-cex100.h.in | 2 +-
2663 1 file changed, 1 insertion(+), 1 deletion(-)
2665 commit 0a0a59cf7bdc5d4ee3639923f19cb57bf666815b
2666 Author: Damien Lespiau <damien.lespiau@intel.com>
2667 Date: Sat Aug 28 12:06:11 2010 +0100
2669 cex100: Add an API to configure the buffering mode of the GDL plane
2671 GDL planes can be double or triple buffered. Let the user choose between
2672 the two modes befored initalizing Clutter.
2674 clutter/egl/clutter-backend-cex100.c | 21 +++++++++++----------
2675 clutter/egl/clutter-cex100.h.in | 27 +++++++++++++++++++++++++++
2676 doc/reference/clutter/clutter-sections.txt | 2 ++
2677 3 files changed, 40 insertions(+), 10 deletions(-)
2679 commit 01fcd11efd0f02833370901dc47d042dc067627a
2680 Author: Damien Lespiau <damien.lespiau@intel.com>
2681 Date: Sat Aug 28 10:43:39 2010 +0100
2683 cex100: Add an API to configure the GDL plane to use
2685 Intel CE3100 and CE4100 have several planes (framebuffers) and a
2686 hardware blender to blend the planes togeteher to produce the final
2689 clutter_cex100_set_plane() lets you configure which framebuffer clutter
2690 will use for its rendering.
2693 clutter/egl/Makefile.am | 1 +
2694 clutter/egl/clutter-backend-cex100.c | 35 +++++++++++++++
2695 clutter/egl/clutter-cex100.h.in | 64 ++++++++++++++++++++++++++++
2697 doc/reference/clutter/Makefile.am | 2 +
2698 doc/reference/clutter/building-clutter.xml | 2 +-
2699 doc/reference/clutter/clutter-docs.xml.in | 1 +
2700 doc/reference/clutter/clutter-sections.txt | 6 +++
2701 9 files changed, 114 insertions(+), 1 deletion(-)
2703 commit 70dc3ecbd6986b0f9ded6ec9c7d4634dda5c5465
2704 Author: Damien Lespiau <damien.lespiau@intel.com>
2705 Date: Fri Aug 27 16:19:00 2010 +0100
2707 egl: Fix the installed headers
2709 • Use the public COGL_HAS_GLES[12] define instead of the HAVE_COGL_*
2710 ones which are private and defined in config.h,
2711 • Install clutter-egl-headers.h which is needed by clutter-egl.h,
2712 • Remove clutter-stage.h as it's uneeded and does not work since the
2713 single clutter.h include policy,
2714 • Install the egl headers into their own egl directory as the x11 and
2715 glx backends do. The include should then be <clutter/egl/clutter-egl.h>,
2716 so document it. It does not really break anything as nobody could
2717 have used those broken headers.
2719 clutter/egl/Makefile.am | 4 ++--
2720 clutter/egl/clutter-egl-headers.h | 12 +++++++-----
2721 clutter/egl/clutter-egl.h | 6 ++++--
2722 3 files changed, 13 insertions(+), 9 deletions(-)
2724 commit e1e5db00327db6d37850aaad7bb8fb42ffe29e57
2725 Author: Damien Lespiau <damien.lespiau@gmail.com>
2726 Date: Thu Aug 12 09:25:17 2010 -0400
2728 cex100: Add a Clutter EGL backend for CE3100/CE4100 SoCs
2730 Intel CE3100 and CE4100 SoCs are designed for TVs. They have separate
2731 framebuffers that are blended together by a piece of hardware to make
2732 the final output. The library that allows you to initialize and
2733 configure those planes is called GDL. A EGL GDL winsys can then be
2734 use with those planes as NativeWindowType to select which plane to use.
2736 This patch adds a new ClutterBackendCex100 backend that can be
2737 selected at compile time with the new --with-flavour=cex100 option.
2739 clutter/cogl/cogl/Makefile.am | 4 +
2740 clutter/egl/Makefile.am | 3 +
2741 clutter/egl/clutter-backend-cex100.c | 332 ++++++++++++++++++++++++++++++++++
2742 clutter/egl/clutter-backend-cex100.h | 60 ++++++
2743 clutter/egl/clutter-backend-egl.c | 2 +
2744 configure.ac | 49 ++++-
2745 6 files changed, 449 insertions(+), 1 deletion(-)
2747 commit af983faccd6fc91ea328d19ace2bb61df2c0f9fd
2748 Author: Damien Lespiau <damien.lespiau@gmail.com>
2749 Date: Thu Aug 12 09:05:01 2010 -0400
2751 egl: Fix compilation for EGL native
2753 Some minor fixes here and there: missing include, wrongly placed #endif,
2754 unused variable warning fixes, missing #ifdef.
2756 Make ClutterStageEGL a subclass of either ClutterStageX11 or GObject
2757 depending if you compile with X11 support (EGLX) or not (native).
2759 clutter/cogl/cogl/cogl-material-glsl.c | 1 +
2760 clutter/egl/clutter-backend-egl.c | 1 -
2761 clutter/egl/clutter-stage-egl.h | 18 +++++++++++++++---
2762 3 files changed, 16 insertions(+), 4 deletions(-)
2764 commit 12a5bf2e06114e60e8286ee7fd75e73ce16f487c
2765 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2766 Date: Wed Sep 1 17:56:15 2010 +0100
2768 offscreen-effect: Rename create_target to create_buffer
2770 *** This is an API change ***
2772 The create_target() virtual function should return a CoglHandle to a
2773 texture; clutter_offscreen_effect_get_target(), instead, returns a
2774 CoglMaterial to be painted in the implementation of the paint_target()
2777 Instead of equating textures with materials, and confusing the user of
2778 the API, we should mark the difference more prominently.
2780 First of all, we should return a CoglMaterial* (now that we have that
2781 as a public type) in get_target(); having handles all over the place
2782 does not make it easier to distinguish the semantics of the virtual
2785 Then we should rename create_target() to create_texture(), to make it
2786 clear that what should be returned is a texture that is used as the
2787 backing for the offscreen framebuffer.
2789 clutter/clutter-offscreen-effect.c | 45 +++++++++++++++-------------
2790 clutter/clutter-offscreen-effect.h | 14 ++++-----
2791 doc/reference/clutter/clutter-sections.txt | 2 +-
2792 3 files changed, 32 insertions(+), 29 deletions(-)
2794 commit 6c40b100839e3597e9ab5f1d3e32c9d42d1af87c
2795 Author: Elliot Smith <elliot.smith@intel.com>
2796 Date: Tue Aug 31 14:39:03 2010 +0100
2798 cookbook: Added recipe for signal handling in ClutterScript
2800 Added a recipe explaining how to connect signals to handlers
2801 in the JSON definition used by ClutterScript; also shows
2802 how to connect the signals in code once the JSON has been
2805 Includes guidelines on writing handlers (i.e. need to use
2806 -export-dynamic and non-static functions) and example
2807 which connects a handler for motion events on a rectangle.
2809 doc/cookbook/script.xml | 266 +++++++++++++++++++++++++++++++++++++++++++++++
2810 1 file changed, 266 insertions(+)
2812 commit a67111a17cf5427096272276c2117c9f8d92a978
2813 Author: Elliot Smith <elliot.smith@intel.com>
2814 Date: Fri Aug 27 16:31:00 2010 +0100
2816 cookbook: Added example of connecting signals in ClutterScript
2818 To support recipe about connecting signals in script.
2820 doc/cookbook/examples/Makefile.am | 2 +
2821 doc/cookbook/examples/script-signals.c | 91 +++++++++++++++++++++++++++++
2822 doc/cookbook/examples/script-signals.json | 40 +++++++++++++
2823 3 files changed, 133 insertions(+)
2825 commit b369cb51dc24801dc6e1dd4db54691ff859db93f
2826 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2827 Date: Sat Aug 28 21:21:08 2010 +0100
2829 docs: Pass -DCOGL_ENABLE_EXPERIMENTAL_API when scanning
2831 doc/reference/cogl/Makefile.am | 2 +-
2832 1 file changed, 1 insertion(+), 1 deletion(-)
2834 commit be9dd6e7dac5711bd5cf0f225c0d4b151b851868
2835 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2836 Date: Sat Aug 28 21:18:12 2010 +0100
2838 docs: Split x11-texture-pixmap in its own section
2840 doc/reference/clutter/clutter-sections.txt | 10 +++++++---
2841 1 file changed, 7 insertions(+), 3 deletions(-)
2843 commit a0c700b8d074dc0581cb7889c98e63e77a98439f
2844 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2845 Date: Sat Aug 28 21:17:52 2010 +0100
2847 docs: Fix up the main index of the Clutter API reference
2849 doc/reference/clutter/clutter-docs.xml.in | 8 ++------
2850 1 file changed, 2 insertions(+), 6 deletions(-)
2852 commit ac6256ae604ad1da05e719f8623b4650402245fb
2853 Author: Emmanuele Bassi <ebassi@linux.intel.com>
2854 Date: Sat Aug 28 21:17:23 2010 +0100
2856 docs: Add @Title to the X11TexturePixmap gtk-doc section
2858 clutter/x11/clutter-x11-texture-pixmap.c | 1 +
2859 1 file changed, 1 insertion(+)
2861 commit 79a4dbb32908043223e0d5a085214850166124f5
2862 Author: Elliot Smith <elliot.smith@intel.com>
2863 Date: Fri Aug 27 15:29:09 2010 +0100
2865 cookbook: Use nicknames for enumeration values
2867 GEnum nicknames can be used to set properties in JSON
2868 definitions, so added a callout to the JSON example explaining
2869 this, and showing how to derive the nickname for an enumeration
2872 Modified the example code to use nicknames as well.
2874 doc/cookbook/examples/script-ui.json | 4 ++--
2875 doc/cookbook/script.xml | 27 +++++++++++++++++++++++++--
2876 2 files changed, 27 insertions(+), 4 deletions(-)
2878 commit 2c3ca20cdc3299e239388f75b583e2afb7437b47
2879 Author: Elliot Smith <elliot.smith@intel.com>
2880 Date: Fri Aug 27 15:13:28 2010 +0100
2882 cookbook: Don't use the default stage
2884 It's not necessary to use the default stage, so
2885 don't encourage this in the JSON example.
2887 doc/cookbook/examples/script-ui.json | 1 -
2888 doc/cookbook/script.xml | 6 ------
2889 2 files changed, 7 deletions(-)
2891 commit 6db795baf634df0d5b8becc746c6c57c2ed0131a
2892 Author: Elliot Smith <elliot.smith@intel.com>
2893 Date: Fri Aug 27 15:10:17 2010 +0100
2895 cookbook: Mention nick names as possible values for enums
2897 As JSON can make use of nicknames for GEnum properties,
2898 mentioned this in the table mapping C property values
2899 to their JSON equivalents (as the nick name is a much
2900 shorter and cleaner way of setting a property in JSON).
2902 doc/cookbook/script.xml | 7 +++++--
2903 1 file changed, 5 insertions(+), 2 deletions(-)
2905 commit b532f9591786f4b5381269718e7e0d479ad58c4d
2906 Author: Elliot Smith <elliot.smith@intel.com>
2907 Date: Fri Aug 27 11:20:29 2010 +0100
2909 cookbook: Added introduction to and recipe on ClutterScript
2911 Wrote an introduction to using ClutterScript with JSON. Focus
2912 is on explaining why you might want to use it, basic principles
2913 of operation (with annotated JSON sample), and how to map
2914 data types from C to JSON.
2916 Written simultaneously with a short recipe (uses the same sample
2917 code) showing how to load a JSON file and retrieve objects
2920 doc/cookbook/script.xml | 394 ++++++++++++++++++++++++++++++++++++-----------
2921 1 file changed, 303 insertions(+), 91 deletions(-)
2923 commit 7900ac4dc7fb204c9f8a957f20ec445ef19f655d
2924 Author: Elliot Smith <elliot.smith@intel.com>
2925 Date: Thu Aug 26 17:07:21 2010 +0100
2927 cookbook: Added comments to script example
2929 Commented the ClutterScript example so it can be used
2930 inline as part of the recipe, rather than as an
2931 example in the appendix (it's too simple to warrant
2932 a separate appendix).
2934 doc/cookbook/examples/script-ui.c | 2 ++
2935 1 file changed, 2 insertions(+)
2937 commit 0fc1c8503b073491ca301c5551c515408a499052
2938 Author: Elliot Smith <elliot.smith@intel.com>
2939 Date: Thu Aug 26 12:51:33 2010 +0100
2941 cookbook: Added first draft of script introduction
2943 New script chapter needs an introduction.
2945 While writing the introduction, also slightly changed the
2946 emphasis of the recipe (towards refactoring an existing
2947 application to use ClutterScript) and incorporated example
2948 code into documentation.
2950 doc/cookbook/script.xml | 205 ++++++++++++++++++++++++++++++++++++++++++++---
2951 1 file changed, 196 insertions(+), 9 deletions(-)
2953 commit ce3a3d4404830cc951dc14660aa5c846ec3f8727
2954 Author: Elliot Smith <elliot.smith@intel.com>
2955 Date: Thu Aug 26 12:49:59 2010 +0100
2957 cookbook: Use text for callouts in documentation
2959 Set a parameter on the XSLT transform so that callout elements
2960 are rendered as text rather than graphics (removes the need
2961 to add callout graphics to the build).
2963 doc/cookbook/Makefile.am | 1 +
2964 1 file changed, 1 insertion(+)
2966 commit fef53e1b287df0640e3395d082c7dcb84d8886b1
2967 Author: Elliot Smith <elliot.smith@intel.com>
2968 Date: Thu Aug 26 11:07:54 2010 +0100
2970 cookbook: Added skeleton for script chapter of cookbook
2972 doc/cookbook/Makefile.am | 1 +
2973 doc/cookbook/clutter-cookbook.xml.in | 1 +
2974 doc/cookbook/script.xml | 45 ++++++++++++++++++++++++++++++++++
2975 3 files changed, 47 insertions(+)
2977 commit 27d9825abe50d5fc38788c1c47f4a28b5225f098
2978 Author: Elliot Smith <elliot.smith@intel.com>
2979 Date: Thu Aug 26 10:52:12 2010 +0100
2981 cookbook: Simplified ClutterScript example
2983 There was too much in the example code to cover in a single
2984 recipe, so I trimmed it down to demonstrate simple
2985 UI building (no constraints, effects, animations, or signals).
2987 doc/cookbook/examples/script-ui.c | 35 --------------
2988 doc/cookbook/examples/script-ui.json | 85 ++++------------------------------
2989 2 files changed, 8 insertions(+), 112 deletions(-)
2991 commit 4cba0cf3e82617e4cad0b4ab3813d5c6e6a5b715
2992 Author: Elliot Smith <elliot.smith@intel.com>
2993 Date: Wed Aug 25 17:53:46 2010 +0100
2995 cookbook: Added ClutterScript example
2997 Added a simple script and program to load it, to support
2998 recipe on ClutterScript for UI definitions.
3000 Also amended the Makefile (following the pattern of
3001 the tests/interactive Makefile) to enable signal
3002 connection from ClutterScript by passing -export-dynamic
3005 doc/cookbook/examples/Makefile.am | 4 +-
3006 doc/cookbook/examples/script-ui.c | 69 ++++++++++++++++++++++
3007 doc/cookbook/examples/script-ui.json | 104 ++++++++++++++++++++++++++++++++++
3008 3 files changed, 176 insertions(+), 1 deletion(-)
3010 commit 88b026fa72eddcd1e9da817ddd50be3f0e037f6a
3011 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3012 Date: Thu Aug 26 17:31:32 2010 +0100
3014 test-actors: Name all the actors
3016 Makes it easier to debug events.
3018 tests/interactive/test-actors.c | 17 +++++++++++++----
3019 1 file changed, 13 insertions(+), 4 deletions(-)
3021 commit 36d45b660fc86619345bfe4f2837037f3a164d5d
3022 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3023 Date: Thu Aug 26 16:36:59 2010 +0100
3025 click-action: Add get_button()
3027 Allow retrieving the pointer button that caused the ::clicked signal to
3030 http://bugzilla.clutter-project.org/show_bug.cgi?id=2287
3032 clutter/clutter-click-action.c | 18 ++++++++++++++++++
3033 clutter/clutter-click-action.h | 6 ++++--
3034 doc/reference/clutter/clutter-sections.txt | 1 +
3035 3 files changed, 23 insertions(+), 2 deletions(-)
3037 commit 550d5ab621379f732958dda99da130a25ea6aa15
3038 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3039 Date: Thu Aug 26 16:36:06 2010 +0100
3041 click-action: Fix the release() method name
3043 Documented and declared as release(), it's implemented as
3046 http://bugzilla.clutter-project.org/show_bug.cgi?id=2286
3048 clutter/clutter-click-action.c | 2 +-
3049 1 file changed, 1 insertion(+), 1 deletion(-)
3051 commit 870e7ddfadaff366ca02e28cc464e704b77b3430
3052 Author: Bastian Winkler <buz@netbuz.org>
3053 Date: Tue Aug 24 12:13:30 2010 +0200
3055 test-script-parser: Add a second child to the container
3057 The script parser won't apply child and layout properties correctly with
3058 more than one children.
3060 http://bugzilla.clutter-project.org/show_bug.cgi?id=2285
3062 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3064 tests/conform/test-script-parser.c | 27 ++++++++++++++++++++++-----
3065 tests/data/test-script-layout-property.json | 7 ++++++-
3066 2 files changed, 28 insertions(+), 6 deletions(-)
3068 commit cb58f1f68cb3863a948f5e85db58d437d45ee091
3069 Author: Bastian Winkler <buz@netbuz.org>
3070 Date: Tue Aug 24 12:16:50 2010 +0200
3072 script-parser: Apply child and layout properties to the right actor
3074 http://bugzilla.clutter-project.org/show_bug.cgi?id=2285
3076 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3078 clutter/clutter-script-parser.c | 5 ++---
3079 1 file changed, 2 insertions(+), 3 deletions(-)
3081 commit 2e12768e3c84eb67948df1af1c89cb0011403d88
3082 Author: Neil Roberts <neil@linux.intel.com>
3083 Date: Tue Aug 24 20:00:04 2010 +0100
3085 win32: Fix the check for the 'IN_DESTRUCTION' flag
3087 Commit eae45619299 tried to clean how it checks for the private actor
3088 flags. However the check for the 'IN_DESTRUCTION' flag in the Win32
3089 backend got inverted so it would always clear the current
3090 context. This was causing _cogl_check_driver_valid to fail later and
3091 then the realize would get stuck in a infinite loop.
3093 clutter/win32/clutter-backend-win32.c | 2 +-
3094 1 file changed, 1 insertion(+), 1 deletion(-)
3096 commit 04d55107f380340ce22fbb56a3c87cf7576524db
3097 Author: Øyvind Kolås <pippin@linux.intel.com>
3098 Date: Tue Aug 17 13:22:08 2010 +0100
3100 state: clutter_state_remove_key_internal fix memory corruption
3102 When we free a state because there are no more keys with it as a target use a
3103 goto to re-initialize temporary variables that have become invalid.
3107 clutter/clutter-state.c | 21 ++++++++++++++-------
3108 1 file changed, 14 insertions(+), 7 deletions(-)
3110 commit 66018a7035ccdc2422f8eef9a9523339fd6309be
3111 Author: Neil Roberts <neil@linux.intel.com>
3112 Date: Mon Aug 23 11:36:33 2010 +0100
3114 Invert the check for whether to clip the pick
3116 In 965907deb3f9e the picking was changed to render the full stage
3117 instead of a single pixel whenever picking is performed more than once
3118 between paints. However the condition in the if-statement was
3119 backwards so it would end up always doing a full stage render.
3121 clutter/clutter-main.c | 2 +-
3122 1 file changed, 1 insertion(+), 1 deletion(-)
3124 commit ddd08ba72364d14c0ca291981a231f4add3d62a5
3125 Author: Neil Roberts <neil@linux.intel.com>
3126 Date: Mon Aug 23 11:33:22 2010 +0100
3128 Add some debugging notes for picking
3130 This adds a new CLUTTER_DEBUG option for picking. Currently this just
3131 reports the position for each pick and whether it is clipped or not.
3133 clutter/clutter-debug.h | 3 ++-
3134 clutter/clutter-main.c | 7 +++++++
3135 2 files changed, 9 insertions(+), 1 deletion(-)
3137 commit 12e58c78132766ff4eb3e4c471a32d9e8ef95585
3138 Author: Alexandros Frantzis <alexandros.frantzis@linaro.org>
3139 Date: Fri Aug 13 17:48:30 2010 +0300
3141 Hide internal glx and egl(x) backend symbols.
3143 The glx and egl(x) backends export some internal symbols. Hide these
3144 symbols (using '_' prefix) to reduce ABI differentiation between the
3145 glx and eglx flavours.
3147 http://bugzilla.clutter-project.org/show_bug.cgi?id=2267
3149 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3151 clutter/egl/clutter-backend-egl.c | 22 +++++++++++-----------
3152 clutter/egl/clutter-backend-egl.h | 4 ++--
3153 clutter/egl/clutter-stage-egl.c | 14 +++++++-------
3154 clutter/egl/clutter-stage-egl.h | 6 +++---
3155 clutter/glx/clutter-backend-glx.c | 24 ++++++++++++------------
3156 clutter/glx/clutter-backend-glx.h | 4 ++--
3157 clutter/glx/clutter-event-glx.c | 2 +-
3158 clutter/glx/clutter-event-glx.h | 2 +-
3159 clutter/glx/clutter-stage-glx.c | 10 +++++-----
3160 clutter/glx/clutter-stage-glx.h | 6 +++---
3161 10 files changed, 47 insertions(+), 47 deletions(-)
3163 commit cda5afb41981e5402bfc4816e71f12b99eb820fc
3164 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3165 Date: Fri Aug 20 17:03:06 2010 +0100
3167 box-layout: Use the correct name for the arguments
3169 Since we're getting the preferred height for a given width, the width
3170 argument should be named "for_width" and not "for_height".
3172 clutter/clutter-box-layout.c | 4 ++--
3173 1 file changed, 2 insertions(+), 2 deletions(-)
3175 commit 5f15a620a107847e0b26bab6cdd1c9d27cd3a243
3176 Merge: 81481cd 444d315
3177 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3178 Date: Fri Aug 20 15:24:42 2010 +0100
3180 Merge remote branch 'elliot/cookbook-textures-crossfade'
3182 * elliot/cookbook-textures-crossfade:
3183 cookbook: Use GdkPixbuf instead of getting data from a texture
3184 cookbook: Added a recipe for cross-fading between two images
3185 cookbook: Modified COGL example for consistency
3186 cookbook: Added video of two texture cross-fade
3187 cookbook: Removed unused constant
3188 cookbook: Renamed front/back to top/bottom in cross-fade example
3189 cookbook: Don't need to set keep-aspect-ratio for simple example
3190 cookbook: Modified ordering of statements in cross-fade example
3191 cookbook: Added a longer slideshow example
3192 cookbook: Made code examples more consistent
3193 cookbook: Added example code for texture cross-fading
3194 Post-release version bump to 1.3.13
3195 Release Clutter 1.3.12 (developers snapshot)
3198 doc/cookbook/examples/Makefile.am
3200 commit 81481cd80342614d0fe57ffa6d2bd46103602952
3201 Author: Elliot Smith <elliot.smith@intel.com>
3202 Date: Fri Aug 20 13:54:04 2010 +0100
3204 cookbook: Added recipe for handling pointer events on an actor
3206 Added a recipe about handling enter, leave, and motion events
3209 Gives some pointers to data available from motion events,
3210 explains a bit about stage-relative and actor-relative coords,
3211 and covers how overlapping actors and reactivity of actors
3212 can affect events occurring.
3214 Examples include a simple scribble app showing how to integrate
3215 pointer events into a more useful context.
3217 doc/cookbook/Makefile.am | 1 +
3218 doc/cookbook/events.xml | 323 ++++++++++++++++++++
3219 .../images/events-pointer-motion-stacking.png | Bin 0 -> 1063 bytes
3220 3 files changed, 324 insertions(+)
3222 commit c480e5ec00d52b176bdda1b26d1dfee8aea3384f
3223 Author: Elliot Smith <elliot.smith@intel.com>
3224 Date: Fri Aug 20 12:38:35 2010 +0100
3226 cookbook: Added example to show how stacking affects pointer events
3228 Added another example (used for a screenshot) to demonstrate
3229 how pointer events pass through non-reactive actors and how
3230 depth ordering affects whether an actor will emit a pointer
3233 doc/cookbook/examples/Makefile.am | 2 +
3234 .../examples/events-pointer-motion-stacked.c | 90 ++++++++++++++++++++
3235 2 files changed, 92 insertions(+)
3237 commit 526b438b3a4ebc446a1f986dcaeb759377462c18
3238 Author: Elliot Smith <elliot.smith@intel.com>
3239 Date: Fri Aug 20 11:25:40 2010 +0100
3241 cookbook: Use get_coords rather than struct members
3243 Use clutter_event_get_coords() to get x and y position,
3244 rather than casting to the right event type then directly
3245 accessing members of the event struct.
3247 doc/cookbook/examples/events-pointer-motion.c | 6 ++----
3248 1 file changed, 2 insertions(+), 4 deletions(-)
3250 commit a4db7746f24280b26fed0b8caae0068cfe8d57b0
3251 Author: Elliot Smith <elliot.smith@intel.com>
3252 Date: Thu Aug 19 17:50:25 2010 +0100
3254 cookbook: Made callback names more consistent
3256 Changed callback function names so they are more consistent
3257 within this recipe and with other callback names used
3260 .../examples/events-pointer-motion-crossing.c | 16 +++++------
3261 .../examples/events-pointer-motion-scribbler.c | 28 ++++++++++----------
3262 doc/cookbook/examples/events-pointer-motion.c | 8 +++---
3263 3 files changed, 26 insertions(+), 26 deletions(-)
3265 commit c1e2658104046d8895134df5b7519db26a491892
3266 Author: Elliot Smith <elliot.smith@intel.com>
3267 Date: Thu Aug 19 17:17:58 2010 +0100
3269 cookbook: Added simple pointer motion example
3271 Added a simple pointer motion example which just reports on
3272 the stage and actor-relative coordinates of the pointer
3275 doc/cookbook/examples/Makefile.am | 6 ++-
3276 doc/cookbook/examples/events-pointer-motion.c | 56 +++++++++++++++++++++++++
3277 2 files changed, 60 insertions(+), 2 deletions(-)
3279 commit 7c196d31b4707322fc45b55106ded0e0daaacd40
3280 Author: Elliot Smith <elliot.smith@intel.com>
3281 Date: Thu Aug 19 16:53:27 2010 +0100
3283 cookbook: Added scribble example for pointer motion recipe
3285 Simple scribbler application which demonstrates tracking
3286 mouse enter and motion events on a texture, drawing with
3287 COGL and ClutterPath as they occur.
3289 doc/cookbook/examples/Makefile.am | 2 +
3290 .../examples/events-pointer-motion-scribbler.c | 160 ++++++++++++++++++++
3291 2 files changed, 162 insertions(+)
3293 commit b648bff10c0e2c48f0707bfecd7ea7ae1acab2eb
3294 Author: Elliot Smith <elliot.smith@intel.com>
3295 Date: Thu Aug 19 16:48:59 2010 +0100
3297 cookbook: Renamed example for pointer crossing
3299 Decided might be better to cover crossing and motion under
3300 a broader "pointer motion" recipe, so renamed the example
3301 (which only shows pointer crossing event handling).
3303 doc/cookbook/examples/Makefile.am | 4 +-
3304 doc/cookbook/examples/events-pointer-cross.c | 113 --------------------
3305 .../examples/events-pointer-motion-crossing.c | 113 ++++++++++++++++++++
3306 3 files changed, 115 insertions(+), 115 deletions(-)
3308 commit 72ddd471f04f663ce52fdb36347688a595cfa940
3309 Author: Elliot Smith <elliot.smith@intel.com>
3310 Date: Thu Aug 19 10:32:28 2010 +0100
3312 cookbook: Added example for pointer cross recipe
3314 Code example demonstrates detecting pointers entering/leaving
3315 an actor by implementing a (very) simple button with hover
3318 doc/cookbook/examples/Makefile.am | 2 +
3319 doc/cookbook/examples/events-pointer-cross.c | 113 ++++++++++++++++++++++++++
3320 2 files changed, 115 insertions(+)
3322 commit 213bd1eab4e0dfbb0c033c5d8d56eb6343e35876
3323 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3324 Date: Thu Aug 19 13:57:10 2010 +0100
3326 debug: Add a macro for checking debug flags
3328 clutter/clutter-actor.c | 2 +-
3329 clutter/clutter-debug.h | 79 ++++++++++++++++++++++++-----------------------
3330 clutter/clutter-main.c | 2 +-
3331 3 files changed, 43 insertions(+), 40 deletions(-)
3333 commit 459a6bb24c880c21f71c37e99f04e801d117705d
3334 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3335 Date: Thu Aug 19 12:10:43 2010 +0100
3337 click-action: Add a method to force a release
3339 It can be useful to be able to forcibly break the grab set up by the
3340 ClickAction. The newly added release() method provides a mechanism to
3341 release the grab and unset the :held state of the ClickAction.
3343 clutter/clutter-click-action.c | 30 ++++++++++++++++++++++++++++
3344 clutter/clutter-click-action.h | 3 ++-
3345 doc/reference/clutter/clutter-sections.txt | 1 +
3346 3 files changed, 33 insertions(+), 1 deletion(-)
3348 commit db7d821ef6e435b02a7a99c6f7f02df9bd3565b5
3349 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3350 Date: Thu Aug 19 11:26:51 2010 +0100
3352 click-action: Add attribution
3354 The ClickAction semantics were inspired by the StClickable widget in the
3355 GNOME Shell Toolkit (St).
3357 clutter/clutter-click-action.h | 3 +++
3358 1 file changed, 3 insertions(+)
3360 commit 5ccaa61e4fcd527cfeeaded08a1e0311a5e6814e
3361 Author: Robert Bragg <robert@linux.intel.com>
3362 Date: Wed Aug 18 18:06:35 2010 +0100
3364 docs: Clarifies that queue_redraw also applies to picking
3366 This clarifies the documentation for clutter_actor_queue_redraw to
3367 explain that custom actors should call this whenever some private state
3368 changes that affects painting *or* picking.
3370 clutter/clutter-actor.c | 4 ++++
3371 1 file changed, 4 insertions(+)
3373 commit f8940e3c9a7d58df0a484d70d371983cc337bbec
3374 Author: Robert Bragg <robert@linux.intel.com>
3375 Date: Wed Aug 18 18:05:15 2010 +0100
3377 clutter-texture: queue redraw when changing pick_with_alpha
3379 The expectation is that actors should call clutter_actor_queue_redraw
3380 when ever some private state changes that affects painting *or* picking.
3381 ClutterTexture was not doing this for pick_with_alpha property changes.
3383 clutter/clutter-texture.c | 5 +++++
3384 1 file changed, 5 insertions(+)
3386 commit 965907deb3f9e69cb459dd28af4074364a7b72f9
3387 Author: Robert Bragg <robert@linux.intel.com>
3388 Date: Wed Aug 18 16:48:55 2010 +0100
3390 Cache a full pick render if we have a static stage
3392 The idea is that if we see multiple picks per frame then that implies
3393 the visible scene has become static. In this case we can promote the
3394 next pick render to be unclipped so we have valid pick values for the
3395 entire stage. Now we can continue to read from this cached buffer until
3396 the stage contents do visibly change.
3398 Thanks to Luca Bruno on #clutter for this idea!
3400 clutter/clutter-actor.c | 12 +++++++++
3401 clutter/clutter-main.c | 61 ++++++++++++++++++++++++++++++++++++++++++---
3402 clutter/clutter-private.h | 3 +++
3403 3 files changed, 72 insertions(+), 4 deletions(-)
3405 commit c646a366c62ab6a07b8ae53c170db31ad5b3d7d3
3406 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3407 Date: Wed Aug 18 18:20:16 2010 +0100
3409 actor: Ignore paint() on actors being destroyed
3411 OBVIOUS OPTIMIZATION IS OBVIOUS
3413 clutter/clutter-actor.c | 3 +++
3414 1 file changed, 3 insertions(+)
3416 commit 56097df60cae9b665c9c6033bf7ad54751874e92
3417 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3418 Date: Wed Aug 18 18:20:04 2010 +0100
3420 docs: Improve paint() documentation
3422 clutter/clutter-actor.c | 9 ++++++++-
3423 1 file changed, 8 insertions(+), 1 deletion(-)
3425 commit 444d315078f41295c722bdf30c4b3ff92c89cf53
3426 Author: Elliot Smith <elliot.smith@intel.com>
3427 Date: Wed Aug 18 16:02:51 2010 +0100
3429 cookbook: Use GdkPixbuf instead of getting data from a texture
3431 Rewrote example for single texture + COGL to use
3432 a GdkPixbuf to load images, rather than reading data
3433 out of another CoglTexture.
3435 The data is then loaded from the pixbuf to a region of
3436 the CoglTexture (as before).
3438 doc/cookbook/textures.xml | 165 +++++++++++++++++++++++----------------------
3439 1 file changed, 83 insertions(+), 82 deletions(-)
3441 commit c207820bef93bffede1733ef8c6586cda5095347
3442 Author: Elliot Smith <elliot.smith@intel.com>
3443 Date: Wed Aug 18 11:41:10 2010 +0100
3445 cookbook: Added a recipe for cross-fading between two images
3447 The recipe covers a two texture approach (using the Clutter API)
3448 and a single texture approach (using COGL).
3450 It also discusses issues with cross-fading between images of
3451 different sizes with the COGL API, and gives a longer
3452 example of cycling through multiple images in a slideshow
3455 doc/cookbook/textures.xml | 535 +++++++++++++++++++++++++++++++++++++++++++++
3456 1 file changed, 535 insertions(+)
3458 commit c492faecb2fda5619fa26b4eb84e6ced7a103833
3459 Author: Elliot Smith <elliot.smith@intel.com>
3460 Date: Tue Aug 17 15:47:59 2010 +0100
3462 cookbook: Modified COGL example for consistency
3464 Changed the stage size so the COGL API example for cross-fade
3465 has a stage the same size as the two texture example.
3467 doc/cookbook/examples/textures-crossfade-cogl.c | 2 +-
3468 1 file changed, 1 insertion(+), 1 deletion(-)
3470 commit e54d3e716b5f9a00d59a006e70926d5fe31fd4a3
3471 Author: Elliot Smith <elliot.smith@intel.com>
3472 Date: Tue Aug 17 15:46:48 2010 +0100
3474 cookbook: Added video of two texture cross-fade
3476 Added a video showing the two texture cross-fade.
3478 Modified the example code to animate on key press, so
3479 this video could be captured.
3481 Also altered the stage size to minimise the video size.
3483 doc/cookbook/Makefile.am | 1 +
3484 doc/cookbook/examples/textures-crossfade.c | 21 ++++++++++++++++----
3485 .../videos/textures-crossfade-two-textures.ogv | Bin 0 -> 81903 bytes
3486 3 files changed, 18 insertions(+), 4 deletions(-)
3488 commit 0486c56a41870ac1ebb3a0200060fb80282a1f25
3489 Author: Elliot Smith <elliot.smith@intel.com>
3490 Date: Tue Aug 17 14:54:32 2010 +0100
3492 cookbook: Removed unused constant
3494 doc/cookbook/examples/textures-crossfade.c | 2 --
3495 1 file changed, 2 deletions(-)
3497 commit 8c0c2924ae467d265aabf7b7c472eb0474c459e7
3498 Author: Elliot Smith <elliot.smith@intel.com>
3499 Date: Tue Aug 17 11:51:33 2010 +0100
3501 cookbook: Renamed front/back to top/bottom in cross-fade example
3503 Front/back seems like the wrong terminology when discussing
3504 actors arranged in layers. Top/bottom fits better with Clutter
3505 API function names and other recipes, so renamed variables.
3507 .../examples/textures-crossfade-slideshow.c | 44 ++++++++++----------
3508 doc/cookbook/examples/textures-crossfade.c | 38 ++++++++---------
3509 2 files changed, 41 insertions(+), 41 deletions(-)
3511 commit 1e4578d1dd6dc7d638ac2d4902e303d07504039f
3512 Author: Elliot Smith <elliot.smith@intel.com>
3513 Date: Tue Aug 17 11:20:20 2010 +0100
3515 cookbook: Don't need to set keep-aspect-ratio for simple example
3517 doc/cookbook/examples/textures-crossfade.c | 3 ---
3518 1 file changed, 3 deletions(-)
3520 commit 1b2606a850288b2f8f943ae2e433b14e34a944f7
3521 Author: Elliot Smith <elliot.smith@intel.com>
3522 Date: Tue Aug 17 10:56:06 2010 +0100
3524 cookbook: Modified ordering of statements in cross-fade example
3526 Changed the order of statements in the sample code to match
3527 the order they will be explained in the walk-through in the recipe.
3529 doc/cookbook/examples/textures-crossfade.c | 20 ++++++++++----------
3530 1 file changed, 10 insertions(+), 10 deletions(-)
3532 commit e332236b87871b09922ab3ada1a2a5726d06130a
3533 Author: Elliot Smith <elliot.smith@intel.com>
3534 Date: Mon Aug 16 16:39:13 2010 +0100
3536 cookbook: Added a longer slideshow example
3538 Cross-fading between two images is straightforward,
3539 but cycling between more than two is more efficient
3540 if done by copying COGL textures between the
3541 two textures, rather than trying to reposition the
3544 The example demonstrates how to reuse a pair of
3545 textures to cycle through multiple images.
3547 doc/cookbook/examples/Makefile.am | 2 +
3548 .../examples/textures-crossfade-slideshow.c | 182 ++++++++++++++++++++
3549 2 files changed, 184 insertions(+)
3551 commit c230fd8dfdb43c98faa3147d2f669e0b5e44702b
3552 Author: Elliot Smith <elliot.smith@intel.com>
3553 Date: Mon Aug 16 16:16:07 2010 +0100
3555 cookbook: Made code examples more consistent
3557 Modified the code example for the Clutter API version
3558 of the cross-fade to use the same command line
3559 as the COGL version.
3561 This also simplifies the explanation in the recipe.
3563 Also made the COGL code sample more consistent with
3564 the Clutter API code sample.
3566 doc/cookbook/examples/textures-crossfade-cogl.c | 17 +--
3567 doc/cookbook/examples/textures-crossfade.c | 184 +++++++++--------------
3568 2 files changed, 75 insertions(+), 126 deletions(-)
3570 commit 83a8d0b3bb2ad47db6afd32bd2aa503814486e07
3571 Author: Elliot Smith <elliot.smith@intel.com>
3572 Date: Thu Aug 12 17:39:59 2010 +0100
3574 cookbook: Added example code for texture cross-fading
3576 Added simple image viewer which loads image file names
3577 from a directory, displays the first one, then displays
3578 the next in the list with each key press. Uses the
3579 primitive fade front in/fade back out approach.
3581 Also adapted Emmanuele's example code which uses Cogl
3582 to produce a similar effect, but within a single texture.
3583 This code loads two images specified on the command
3584 line and cross-fades between them.
3586 doc/cookbook/examples/Makefile.am | 4 +
3587 doc/cookbook/examples/textures-crossfade-cogl.c | 174 +++++++++++++++++++++++
3588 doc/cookbook/examples/textures-crossfade.c | 174 +++++++++++++++++++++++
3589 3 files changed, 352 insertions(+)
3591 commit dc7d62a42a9b111d03626a8bc72c956869f4b7b8
3592 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3593 Date: Mon Aug 16 13:37:57 2010 +0100
3595 Post-release version bump to 1.3.13
3598 1 file changed, 1 insertion(+), 1 deletion(-)
3600 commit 6d751bf9514683a893668bc3b3822e433277a377
3601 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3602 Date: Mon Aug 16 13:23:43 2010 +0100
3604 Release Clutter 1.3.12 (developers snapshot)
3607 1 file changed, 1 insertion(+), 1 deletion(-)
3609 commit ad0c36e1a1a0df5c0ff1f4449c54918e775e965d
3610 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3611 Date: Tue Aug 17 14:54:20 2010 +0100
3613 docs: Fixes to avoid gtk-doc warnings
3615 clutter/clutter-actor.c | 57 +++++++++-------------------
3616 clutter/clutter-actor.h | 4 +-
3617 clutter/clutter-behaviour-path.c | 6 +--
3618 clutter/clutter-colorize-effect.c | 2 +-
3619 clutter/clutter-drag-action.c | 2 +-
3620 clutter/clutter-script.c | 2 +-
3621 doc/reference/clutter/clutter-docs.xml.in | 7 +++-
3622 doc/reference/clutter/clutter-overview.xml | 23 +++++++----
3623 8 files changed, 48 insertions(+), 55 deletions(-)
3625 commit 50f4bfd7f72eb10f05506b9932785b5cded42aa7
3626 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3627 Date: Tue Aug 17 11:34:35 2010 +0100
3629 build: Remove dolt remnants
3631 We don't use Dolt any more, since we depend on libtool 2.2.
3635 build/autotools/Makefile.am | 1 -
3636 build/autotools/dolt.m4 | 178 -------------------------------------------
3637 4 files changed, 1 insertion(+), 182 deletions(-)
3639 commit 06ecaa98f1f993239eebb7b74b3fa2ab5929a622
3640 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3641 Date: Mon Aug 16 16:33:32 2010 +0100
3643 docs: Add :keep-aspect-ratio behaviour to the notes
3646 1 file changed, 8 insertions(+)
3648 commit 92b1a33eb313abdb9d84f6731deb84a12d61d5d0
3649 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3650 Date: Mon Aug 16 15:56:49 2010 +0100
3652 texture: Default square textures to height-for-width
3654 Square textures should have a preferred geometry request set to
3655 height-for-width, as it is the default for Clutter itself.
3657 clutter/clutter-texture.c | 2 +-
3658 1 file changed, 1 insertion(+), 1 deletion(-)
3660 commit dc2aee43007bc4b154b5d819404071a35862c500
3661 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3662 Date: Mon Aug 16 13:37:57 2010 +0100
3664 Post-release version bump to 1.3.13
3667 1 file changed, 1 insertion(+), 1 deletion(-)
3669 commit e75e6e0c97f2f9878dc348775cfe75651872e927
3670 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3671 Date: Mon Aug 16 13:23:43 2010 +0100
3673 Release Clutter 1.3.12 (developers snapshot)
3675 NEWS | 40 ++++++++++++++++++++++++++++++++++++++++
3677 2 files changed, 41 insertions(+), 1 deletion(-)
3679 commit fd6d6a93f1550f6c423d1dfc2d228ae7b1c87707
3680 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3681 Date: Mon Aug 16 13:23:10 2010 +0100
3683 build: Fix distcheck errors
3685 tests/conform/Makefile.am | 4 +---
3686 tests/interactive/Makefile.am | 4 +---
3687 2 files changed, 2 insertions(+), 6 deletions(-)
3689 commit 3142b15a9f4c77b2e3012013f174091b810d13ce
3690 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3691 Date: Sun Aug 15 18:42:54 2010 +0100
3693 build: Use maintainer-clean for the ignore files removal
3695 Instead of distclean.
3697 build/autotools/Makefile.am.gitignore | 11 +++++++----
3698 doc/cookbook/examples/Makefile.am | 2 --
3699 tests/conform/Makefile.am | 2 ++
3700 tests/interactive/Makefile.am | 2 ++
3701 tests/micro-bench/Makefile.am | 2 --
3702 5 files changed, 11 insertions(+), 8 deletions(-)
3704 commit c4913bfce91be011618bca93e2177ebccef1e648
3705 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3706 Date: Sun Aug 15 18:33:10 2010 +0100
3708 Revert "build: Distclean generated ignore files"
3710 Git ignore files are not dist'ed, so it's pointless to remove them on
3713 This reverts commit f14587aadc428e5743d2b30e2a9f4bf51f1d1e05.
3715 tests/conform/Makefile.am | 2 +-
3716 tests/interactive/Makefile.am | 2 +-
3717 2 files changed, 2 insertions(+), 2 deletions(-)
3719 commit e43215a5c9331517de555e44ba1181ad42ed79bc
3720 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3721 Date: Sat Aug 14 08:53:18 2010 +0100
3723 build: Rule for quick publishing of the cookbook
3725 Just call `make publish`.
3727 doc/cookbook/Makefile.am | 9 +++++++++
3728 1 file changed, 9 insertions(+)
3730 commit 94c8635d0f4584ef81e565e7837bdeb0008e034e
3731 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3732 Date: Sat Aug 14 08:43:16 2010 +0100
3734 build: Autogenerate more ignore files
3736 The tests/accessibility, tests/micro-bench and the examples directory
3737 in the coobook create a lot of non-installed binaries. Since we know who
3738 they are, and we ignore them, we can auto-generate the ignore files as
3741 The rest of Clutter is covered by the main ignore file.
3743 build/autotools/Makefile.am | 1 +
3744 build/autotools/Makefile.am.gitignore | 21 +++++++++++++++++++++
3745 doc/cookbook/examples/.gitignore | 8 --------
3746 doc/cookbook/examples/Makefile.am | 4 ++++
3747 tests/accessibility/.gitignore | 5 -----
3748 tests/accessibility/Makefile.am | 4 ++++
3749 tests/micro-bench/.gitignore | 5 -----
3750 tests/micro-bench/Makefile.am | 3 +++
3751 8 files changed, 33 insertions(+), 18 deletions(-)
3753 commit f14587aadc428e5743d2b30e2a9f4bf51f1d1e05
3754 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3755 Date: Fri Aug 13 18:35:35 2010 +0100
3757 build: Distclean generated ignore files
3759 tests/conform/Makefile.am | 2 +-
3760 tests/interactive/Makefile.am | 2 +-
3761 2 files changed, 2 insertions(+), 2 deletions(-)
3763 commit a3bc2ebfa7cd4d62107ef56078b6973ff844e882
3764 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3765 Date: Fri Aug 13 18:32:10 2010 +0100
3767 build: Make test-conform depend on Makefile changes
3769 tests/conform/Makefile.am | 2 +-
3770 1 file changed, 1 insertion(+), 1 deletion(-)
3772 commit 1e0a83b88139a13a8488bfe7000e0c459ccbad66
3773 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3774 Date: Fri Aug 13 18:31:44 2010 +0100
3776 build: Autogenerate interactive/.gitignore
3778 Exactly like we did for conform/.gitignore
3780 tests/interactive/.gitignore | 73 -----------------------------------------
3781 tests/interactive/Makefile.am | 8 ++++-
3782 2 files changed, 7 insertions(+), 74 deletions(-)
3784 commit 7c412464c27e712654ca7aa9e16ebcdba8bc0e7f
3785 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3786 Date: Fri Aug 13 18:22:12 2010 +0100
3788 build: Generate the conformance/.gitignore file
3790 Since we are generating a lot of files that we should ignore, we should
3791 generate the Git ignore file as well.
3793 tests/conform/.gitignore | 123 ---------------------------------------------
3794 tests/conform/Makefile.am | 7 +++
3795 2 files changed, 7 insertions(+), 123 deletions(-)
3797 commit e888da21804809f7700b0932d0eb16727cf15d09
3798 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3799 Date: Fri Aug 13 18:15:01 2010 +0100
3801 build: Split up the test-conformance SOURCES
3803 Having different sections should make it easier to add new test units to
3806 tests/conform/Makefile.am | 115 +++++++++++++++++++++++++++------------------
3807 1 file changed, 68 insertions(+), 47 deletions(-)
3809 commit ff9a5a01b4bef60496cb27e645ac23c790267f98
3810 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3811 Date: Fri Aug 13 18:14:10 2010 +0100
3813 clutter.modules: Remove deps on gir-repository
3815 Keep it in the moduleset, but don't let Clutter depend on it.
3817 build/clutter.modules | 4 ----
3818 1 file changed, 4 deletions(-)
3820 commit a25cf14e978dd51034baf2d0cd4c1743c93a7774
3821 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3822 Date: Fri Aug 13 18:12:43 2010 +0100
3824 Revert "clutter.modules: Remove deps on gir-repository"
3826 This reverts commit 0ce9cf730b2a8c3b3ac4786afee0579a3795fd9e.
3828 The commit contained unrelated changes
3830 build/clutter.modules | 4 ++
3831 tests/conform/Makefile.am | 115 ++++++++++++++++++---------------------------
3832 2 files changed, 51 insertions(+), 68 deletions(-)
3834 commit 0ce9cf730b2a8c3b3ac4786afee0579a3795fd9e
3835 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3836 Date: Fri Aug 13 18:09:28 2010 +0100
3838 clutter.modules: Remove deps on gir-repository
3840 Keep it in the moduleset, but don't let Clutter depend on it.
3842 build/clutter.modules | 4 --
3843 tests/conform/Makefile.am | 115 +++++++++++++++++++++++++++------------------
3844 2 files changed, 68 insertions(+), 51 deletions(-)
3846 commit 175b16a5c81faf12e204274e87c013e2c65a4030
3847 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3848 Date: Fri Aug 13 18:00:23 2010 +0100
3850 clutter.modules: Add a gtk2 module for gtk+ 2.x
3852 Mx (and others) depend on gtk+ 2.x, and not on gtk+ 3.x.
3854 build/clutter.modules | 17 +++++++++++++++--
3855 1 file changed, 15 insertions(+), 2 deletions(-)
3857 commit 271e0d960486acea896389b05ba521d569c7c83a
3858 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3859 Date: Fri Aug 13 16:32:27 2010 +0100
3861 animator: Plug some leaks
3863 clutter/clutter-animator.c | 20 +++++++-------------
3864 1 file changed, 7 insertions(+), 13 deletions(-)
3866 commit 12031ca2c5a52c574ba7c16a86b84e049b0cfb38
3867 Author: Robert Bragg <robert@linux.intel.com>
3868 Date: Mon Aug 9 16:01:17 2010 +0100
3870 material: Implements weak materials
3872 Weak materials are ones that don't take a reference on their parent and
3873 they are associated with a callback that notifies when the material is
3874 destroyed, because its parent was freed or modified.
3876 More details can be found at:
3877 http://wiki.clutter-project.org/wiki/CoglDesign/CoglMaterial
3879 For now the concept is internal only but the plan is to make this public
3880 at some point once we have tested the design internally.
3882 clutter/cogl/cogl/cogl-material-private.h | 142 +++++++++++++++++++++
3883 clutter/cogl/cogl/cogl-material.c | 191 +++++++++++++++++++++++------
3884 2 files changed, 297 insertions(+), 36 deletions(-)
3886 commit 50c5ecfe87b3074d997799eb864fbd9c999cd6c7
3887 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3888 Date: Fri Aug 13 12:12:59 2010 +0100
3890 state: Plug some memory leakage
3892 Thanks to Valgrind, test-state-base now reports 0 bytes definitely lost.
3894 clutter/clutter-state.c | 26 +++++++++++++++++---------
3895 tests/conform/test-state.c | 3 ---
3896 2 files changed, 17 insertions(+), 12 deletions(-)
3898 commit 6c6e93d27a0381ff07ecb9c37f1b0840682f359f
3899 Merge: 12f2481 1ed5d5c
3900 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3901 Date: Thu Aug 12 18:29:08 2010 +0100
3903 Merge remote branch 'elliot/cookbook-events-mouse-scroll'
3905 * elliot/cookbook-events-mouse-scroll:
3906 cookbook: Cleaning up grammar and wording in mouse scroll recipe
3907 cookbook: Added more explanation about setting y coord on scrollable
3908 cookbook: Mentioned the animation in the sample code
3909 cookbook: Included video of the scroll example running
3910 cookbook: Made stage slightly smaller for scroll event example
3911 cookbook: Added video showing scrollable actor
3912 cookbook: Added walk through of code example for mouse scroll
3913 cookbook: Fixed link to example in mouse scroll recipe
3914 cookbook: Simplified full scroll example
3915 cookbook: Improved wording and formatting in mouse scroll intro.
3916 cookbook: Handle all possible mouse scroll directions
3917 cookbook: Build mouse scroll example with cookbook
3918 cookbook: Cleaned up redundant comments in code example
3919 cookbook: Added xmlns for XInclude to events docbook file
3920 cookbook: Added basic mouse scroll recipe
3922 commit 12f2481462df9d99114323dcf210a5219648cbee
3923 Author: Neil Roberts <neil@linux.intel.com>
3924 Date: Thu Aug 12 17:03:16 2010 +0100
3926 docs: Update the build instructions in the reference
3928 This removes all references to SDL in the build instructions as the
3929 backend is no longer available. The OpenGL version required is only
3930 1.2 not 1.4. The Windows build instructions were out of date and have
3931 been replaced with a link to the wiki instead.
3933 doc/reference/clutter/building-clutter.xml | 44 +++++++---------------------
3934 1 file changed, 11 insertions(+), 33 deletions(-)
3936 commit daf6e739364282b77a66d7bf8abb4e90ada8c865
3937 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3938 Date: Thu Aug 12 17:06:29 2010 +0100
3940 Remove last uses of cogl_program_uniform*
3942 Following the commits:
3944 c03544da - clutter-shader: use cogl_program_set_uniform_xyz API
3945 a26119b5 - tests: Remove use of cogl_program_use
3947 Remove the users of cogl_program_uniform_* and cogl_program_use() in the
3948 shader-based effects.
3950 clutter/clutter-blur-effect.c | 14 +++++++-------
3951 clutter/clutter-colorize-effect.c | 10 ++++------
3952 clutter/clutter-desaturate-effect.c | 10 ++++------
3953 clutter/clutter-shader-effect.c | 31 +++++++++++++++++++------------
3954 4 files changed, 34 insertions(+), 31 deletions(-)
3956 commit e016a62ab03e2d1683cc4d100ac6079fe7863788
3957 Author: Neil Roberts <neil@linux.intel.com>
3958 Date: Thu Aug 12 16:56:28 2010 +0100
3960 build/mingw/README: Replace with a link to the wiki
3962 The build instructions for MinGW have been moved to the wiki.
3964 build/mingw/README | 138 ++--------------------------------------------------
3965 1 file changed, 3 insertions(+), 135 deletions(-)
3967 commit 01a72725997db93cbe0ef6a47c304d456ce96205
3968 Author: Robert Bragg <robert@linux.intel.com>
3969 Date: Thu Aug 12 10:43:22 2010 +0100
3971 cogl-shader: get_info_log should always use strdup
3973 In the case where there is no error log for arbfp we were returning a
3974 "" string literal. The other paths were using g_strdup to return a
3975 string that could be freed with g_free. This makes the arbfp path return
3976 g_strdup ("") instead.
3978 clutter/cogl/cogl/cogl-shader.c | 4 +++-
3979 1 file changed, 3 insertions(+), 1 deletion(-)
3981 commit b50bdd791986d85a29c40c763b329b1347060769
3982 Author: Robert Bragg <robert@linux.intel.com>
3983 Date: Thu Aug 12 10:40:39 2010 +0100
3985 cogl-shader: correctly #ifdef guard an if else block
3987 There are quite a few if {} else {} blocks for dealing with arbfp else
3988 glsl and the first block is guarded with #ifdef HAVE_COGL_GL. In this
3989 case though the #endif was before the else so it wouldn't compile for
3992 clutter/cogl/cogl/cogl-shader.c | 2 +-
3993 1 file changed, 1 insertion(+), 1 deletion(-)
3995 commit 94692370d2a95b55cccee4c08887e2b4298e418c
3996 Author: Robert Bragg <robert@linux.intel.com>
3997 Date: Thu Aug 12 10:37:55 2010 +0100
3999 material-glsl: #include "cogl-shader-private.h"
4001 We need to include cogl-shader-private.h to have the
4002 COGL_SHADER_TYPE_GLSL define. When building for opengl this wasn't
4003 noticed probably because some other header indirectly includes this
4004 file. It was a problem when building for gles2 though.
4006 clutter/cogl/cogl/cogl-material-glsl.c | 1 +
4007 1 file changed, 1 insertion(+)
4009 commit a26119b5514655df5accd2f65cb0ee3ed242b4ea
4010 Author: Robert Bragg <robert@linux.intel.com>
4011 Date: Wed Aug 11 19:39:41 2010 +0100
4013 tests: Remove use of cogl_program_use
4015 The removes the use of cogl_program_use which has been deprecated and
4016 instead of using the cogl_program_uniform functions we now use the
4017 cogl_program_set_uniform methods.
4019 tests/interactive/test-cogl-shader-arbfp.c | 5 +----
4020 tests/interactive/test-cogl-shader-glsl.c | 17 ++++++-----------
4021 2 files changed, 7 insertions(+), 15 deletions(-)
4023 commit c03544daa6778bb52c292b4333e62084b508f58d
4024 Author: Robert Bragg <robert@linux.intel.com>
4025 Date: Wed Aug 11 19:32:09 2010 +0100
4027 clutter-shader: use cogl_program_set_uniform_xyz API
4029 Instead of using the deprecated cogl_program_uniform_xyz functions we
4030 now use the cogl_program_set_uniform methods. It looks like this should
4031 also fix a problem with clutter-shader too in that previously we weren't
4032 calling cogl_program_use before cogl_program_uniform_xyz so setting
4033 uniforms would only work while the shader is enabled.
4035 clutter/clutter-shader.c | 15 ++++++++++-----
4036 1 file changed, 10 insertions(+), 5 deletions(-)
4038 commit f03037d580e79d491fa965006cc379ad9f5c7ff6
4039 Author: Robert Bragg <robert@linux.intel.com>
4040 Date: Wed Aug 11 19:18:14 2010 +0100
4042 cogl-program: Adds use_uniform_xyz methods
4044 Instead of exposing an API that provides an OpenGL state machine style
4045 where you first have to bind the program to the context using
4046 cogl_program_use() followed by updating uniforms using
4047 cogl_program_uniform_xyz we now have uniform setter methods that take an
4048 explicit CoglHandle for the program.
4050 This deprecates cogl_program_use and all the cogl_program_uniform
4051 variants and provides the following replacements:
4052 cogl_program_set_uniform_1i
4053 cogl_program_set_uniform_1f
4054 cogl_program_set_uniform_int
4055 cogl_program_set_uniform_float
4056 cogl_program_set_uniform_matrix
4058 clutter/cogl/cogl/cogl-shader.h | 119 ++++++++++++++++++-
4059 clutter/cogl/cogl/driver/gl/cogl-program.c | 157 +++++++++++++++++---------
4060 clutter/cogl/cogl/driver/gles/cogl-program.c | 127 +++++++++++++++------
4061 doc/reference/cogl/cogl-sections.txt | 5 +
4062 4 files changed, 316 insertions(+), 92 deletions(-)
4064 commit 2f54f8f0ea5dd53dca495d44468beb3660e335b2
4065 Author: Damien Lespiau <damien.lespiau@gmail.com>
4066 Date: Thu Aug 12 10:36:04 2010 -0400
4068 introspection: Use the --quiet flag conditionally
4070 --quiet has been added to g-ir-scanner in the 0.9.1 cycle. We really
4071 want to be able to compile clutter with 0.6.14 to be able to reuse
4072 gir files that are distributed in current distributions.
4074 Use the INTROSPECTION_SCANNER_ARGS (previously unused) variable to
4075 convey --quiet when necessary.
4077 Fixes: http://bugzilla.clutter-project.org/show_bug.cgi?id=2265
4079 clutter/Makefile.am | 2 --
4080 clutter/cogl/cogl/Makefile.am | 1 -
4081 clutter/json/Makefile.am | 1 -
4082 configure.ac | 7 +++++++
4083 4 files changed, 7 insertions(+), 4 deletions(-)
4085 commit 1f01fd0a4c1937dfc6371f9f8de2b07d0e9b4bd2
4086 Author: Neil Roberts <neil@linux.intel.com>
4087 Date: Thu Aug 12 14:59:03 2010 +0100
4089 clutter.modules: cluttersmith depends on gjs and clutter-gtk
4091 This adds dependencies on gjs and clutter-gtk to cluttersmith. There
4092 was no module listed for gjs so this is added from the jhbuild gnome
4095 build/clutter.modules | 14 ++++++++++++++
4096 1 file changed, 14 insertions(+)
4098 commit c129c563f52a271e2ade2b2f7cd2424f9011164a
4099 Author: Neil Roberts <neil@linux.intel.com>
4100 Date: Thu Aug 12 14:37:27 2010 +0100
4102 Remove test-random-text from the interactive .gitignore
4104 tests/interactive/.gitignore | 1 -
4105 1 file changed, 1 deletion(-)
4107 commit 1a8df6788b6f23d75a99d4d9695e1983cd0910db
4108 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4109 Date: Thu Aug 12 13:48:35 2010 +0100
4111 Update the micro-bench Git ignore file
4113 tests/micro-bench/.gitignore | 3 ++-
4114 1 file changed, 2 insertions(+), 1 deletion(-)
4116 commit 053a1a9c512d00ccdbf3f81e5869b4fccbc8ff2b
4117 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4118 Date: Thu Aug 12 13:46:58 2010 +0100
4120 build: Add simple scripts for setting up jhbuild
4122 Use the same script also used by gnome-shell to set up the system
4123 dependencies for building Clutter (and its dependencies) using jhbuild.
4125 build/clutter-build-setup.sh | 174 ++++++++++++++++++++++++++++++++++++++++
4126 build/jhbuildrc-clutter | 73 +++++++++++++++++
4127 build/jhbuildrc-custom-example | 19 +++++
4128 3 files changed, 266 insertions(+)
4130 commit 1ed5d5cab0af5617b566465b943615d3c7f1058c
4131 Author: Elliot Smith <elliot.smith@intel.com>
4132 Date: Thu Aug 12 10:16:56 2010 +0100
4134 cookbook: Cleaning up grammar and wording in mouse scroll recipe
4136 doc/cookbook/events.xml | 86 +++++++++++++++++++++++++----------------------
4137 1 file changed, 45 insertions(+), 41 deletions(-)
4139 commit db0c15aee8466b675af8b388d21a40bb3371db77
4140 Author: Neil Roberts <neil@linux.intel.com>
4141 Date: Thu Aug 12 09:59:58 2010 +0100
4143 cogl-atlas: Verify that the chosen initial size is supported
4145 CoglAtlas chooses a fairly large default initial size of either
4146 512x512 or 1024x1024 depending on the texture format. There is a
4147 chance that this size will not be supported on some platforms which
4148 would be catastrophic for the glyph cache because it would mean that
4149 it would always fail to put any glyphs in the cache so text wouldn't
4150 work. To fix this the atlas code now checks whether the chosen initial
4151 size is supported by the texture driver and if not it will get halved
4152 until it is supported.
4154 clutter/cogl/cogl/cogl-atlas.c | 56 ++++++++++++++++++++++++++++------------
4155 1 file changed, 39 insertions(+), 17 deletions(-)
4157 commit b9f9ea3a9c59a7d4282ecf7e0b1ae7e300ec6232
4158 Author: Neil Roberts <neil@linux.intel.com>
4159 Date: Thu Aug 12 09:08:30 2010 +0100
4161 cogl-atlas: Use _cogl_texture_driver_size_supported
4163 Previously when creating a new rectangle map it would try increasingly
4164 larger texture sizes until GL_MAX_TEXTURE_SIZE is reached. This is bad
4165 because it queries state which should really be owned by the texture
4166 driver. Also GL_MAX_TEXTURE_SIZE is often a conservative estimate so
4167 larger texture sizes can be used if the proxy texture is queried
4170 clutter/cogl/cogl/cogl-atlas.c | 25 +++++++++++++++----------
4171 1 file changed, 15 insertions(+), 10 deletions(-)
4173 commit 72029e14db0c0b0f82c20cf6760ab96a81c76e46
4174 Author: Neil Roberts <neil@linux.intel.com>
4175 Date: Wed Aug 11 15:08:00 2010 +0100
4177 cogl-rectangle-map: Record largest gap rather than the remaining space
4179 Previously each node in the rectangle map tree would store the total
4180 remaining space in all of its children to use as an optimization when
4181 adding nodes. With this it could skip an entire branch of the tree if
4182 it knew there could never be enough space for the new node in the
4183 branch. This modifies that slightly to instead store the largest
4184 single gap. This allows it to skip a branch earlier because often
4185 there would be a lot of small gaps which would add up to enough a
4186 space for the new rectangle, but the space can't be used unless it is
4189 The rectangle map still needs to keep track of the total remaining
4190 space for the whole map for the debugging output so this has been
4191 added back in to the CoglRectangleMap struct. There is a separate
4192 debugging function to verify this value.
4194 clutter/cogl/cogl/cogl-rectangle-map.c | 94 +++++++++++++++++++++++---------
4195 1 file changed, 68 insertions(+), 26 deletions(-)
4197 commit 2b5bb06bed2b272ba408d53a471f78c705bf0467
4198 Author: Neil Roberts <neil@linux.intel.com>
4199 Date: Fri Aug 6 18:42:43 2010 +0100
4201 cogl-atlas: Try the next size when there would be less than 6% waste
4203 Previously when the atlas needs to be migrated it would start by
4204 trying with the same size as the existing atlas if there is enough
4205 space for the new texture. However even if the atlas is completely
4206 sorted there will always be some amount of waste so when the atlas
4207 needs to grow it would usually end up redundantly trying the same size
4208 when it is very unlikely to fit. This patch changes it so that there
4209 must be at least 6% waste available after the new texture is added
4210 otherwise it will start with the next atlas size.
4212 clutter/cogl/cogl/cogl-atlas.c | 12 +++++++-----
4213 1 file changed, 7 insertions(+), 5 deletions(-)
4215 commit f98be241a89cf4a9f23555631f2a7f722745f39b
4216 Author: Neil Roberts <neil@linux.intel.com>
4217 Date: Fri Aug 6 18:42:01 2010 +0100
4219 cogl-atlas: Add some more debugging notes
4221 This adds some debugging notes which report when the atlas is trying
4224 clutter/cogl/cogl/cogl-atlas.c | 7 +++++++
4225 1 file changed, 7 insertions(+)
4227 commit e080e824eedecf70d48e3ffc0b65b6a3dd3765c7
4228 Author: Neil Roberts <neil@linux.intel.com>
4229 Date: Fri Aug 6 17:40:52 2010 +0100
4231 cogl-rectangle-map: Use a GArray for the stack
4233 When iterating over the rectangle map a stack is used to implement a
4234 recursive algorithm. Previously this was slice allocating a linked
4235 list. Now it uses a GArray which is retained with the rectangle map to
4236 avoid frequent allocations which is a little bit faster.
4238 clutter/cogl/cogl/cogl-rectangle-map.c | 120 ++++++++++++++++++--------------
4239 1 file changed, 67 insertions(+), 53 deletions(-)
4241 commit 0e2d18d70075621c7ea8f7b721c6b0cbd013af1e
4242 Author: Neil Roberts <neil@linux.intel.com>
4243 Date: Fri Aug 6 16:13:20 2010 +0100
4245 cogl-rectangle-map: Store the remaining space per node
4247 Previously the remaining space was managed as part of the
4248 CoglRectangleMap struct. Now it is stored per node so that at any
4249 point in the hierarchy we can quickly determine how much space is
4250 remaining in all of the node's children. That way when adding a
4251 rectangle we can miss out entire branches more quickly if we know that
4252 there is no way the new rectangle would fit in that branch.
4254 This also adds a function to recursively verify the cached state in
4255 the nodes such as the remaining space and the number of
4256 rectangles. This function is only called when the dump-atlas-image
4257 debug flag is set because it is potentially quite slow.
4259 clutter/cogl/cogl/cogl-rectangle-map.c | 108 ++++++++++++++++++++++++++++----
4260 1 file changed, 96 insertions(+), 12 deletions(-)
4262 commit e609a658a4355c479ec75748e72844f55c1047aa
4263 Author: Neil Roberts <neil@linux.intel.com>
4264 Date: Fri Aug 6 11:44:39 2010 +0100
4266 cogl-atlas: Increase the default minimum texture size
4268 When initially creating a texture it would start with a minimum size
4269 of 256x256. This increases the size so that it would try to match 1MB
4272 clutter/cogl/cogl/cogl-atlas.c | 18 +++++++++++++++---
4273 1 file changed, 15 insertions(+), 3 deletions(-)
4275 commit d03fbf9f64da5448c6ab625049489474d0b78c71
4276 Author: Neil Roberts <neil@linux.intel.com>
4277 Date: Wed Aug 4 18:05:21 2010 +0100
4279 cogl-pango: Use a CoglAtlas to maintain the glyph cache
4281 The glyph cache is now stored in a CoglAtlas structure instead of the
4282 custom atlasing code. This has the advantage that it can share code
4283 with the main texture atlas and that it supports reorganizing the
4284 atlas when it becomes full. Unlike the texture atlas, the glyph cache
4285 can use multiple atlases which would be neccessary if the maximum
4286 texture size is reached and we need to create a second
4287 texture. Whenever a display list is created it now has to register a
4288 callback with the glyph cache so that the display list can be
4289 recreated whenever any of the atlases are reorganized. This is needed
4290 because the display list directly stores texture coordinates within
4291 the atlas texture and they would become invalid when the texture is
4294 The ensure_glyphs_for_layout now works in two steps. First it reserves
4295 space in the atlas for all of the glyphs. The atlas is created with
4296 the DISABLE_MIGRATION flag so that it won't actually copy any textures
4297 if any rearranging is needed. Whenever the position is updated for a
4298 glyph then it is marked as dirty. After space for all of the glyphs
4299 has been reserved it will iterate over all dirty glyphs and redraw
4300 them using Cairo. The rendered glyph is then stored in the texture
4301 with a sub texture update.
4303 The glyphs need to all be set at the right location before starting to
4304 create the display list because the display list stores the texture
4305 coordinates of the glyph. If any of the glyphs were moved around then
4306 the parts of the display list that was created already would become
4307 invalid. To make this work, ensure_glyphs_for_layout is now always
4308 called before rendering a layout or a layout line.
4310 clutter/cogl/pango/cogl-pango-glyph-cache.c | 371 ++++++++++++---------------
4311 clutter/cogl/pango/cogl-pango-glyph-cache.h | 46 ++--
4312 clutter/cogl/pango/cogl-pango-render.c | 226 ++++++++++------
4313 3 files changed, 343 insertions(+), 300 deletions(-)
4315 commit 047227fbd7a6a6c7de3f2c523fda75f0c3a36373
4316 Author: Neil Roberts <neil@linux.intel.com>
4317 Date: Thu Aug 5 13:24:02 2010 +0100
4319 cogl-atlas: Support multiple formats and clearing the texture
4321 _cogl_atlas_new now has two extra parameters to specify the format of
4322 the textures it creates as well as a set of flags to modify the
4323 behavious of the atlas. One of the flags causes the new textures to be
4324 cleared and the other causes migration to avoid actually copying the
4325 textures. This is needed to use CoglAtlas from the pango glyph cache
4326 because it needs to use COGL_PIXEL_A_8 and to clear the textures as it
4327 does not fill in the gaps between glyphs. It needs to avoid copying
4328 the textures so that it can work on GL implementations without FBO
4331 clutter/cogl/cogl/cogl-atlas-texture.c | 4 +-
4332 clutter/cogl/cogl/cogl-atlas.c | 96 ++++++++++++++++++++++++--------
4333 clutter/cogl/cogl/cogl-atlas.h | 12 +++-
4334 3 files changed, 86 insertions(+), 26 deletions(-)
4336 commit 9b2f8179f00708f26400648e21d6ee77cc13aa35
4337 Author: Neil Roberts <neil@linux.intel.com>
4338 Date: Mon Aug 2 16:29:10 2010 +0100
4340 cogl-atlas-texture: Split out the atlas data structure
4342 Instead of storing a pointer to the CoglRectangleMap and a handle to
4343 the atlas texture in the context, there is a now a separate data
4344 structure called a CoglAtlas to manage these two. The context just
4345 contains a pointer to this. The code to reorganise the atlas has been
4346 moved from cogl-atlas-texture.c to cogl-atlas.c
4348 clutter/cogl/cogl/Makefile.am | 2 +
4349 clutter/cogl/cogl/cogl-atlas-texture-private.h | 4 +
4350 clutter/cogl/cogl/cogl-atlas-texture.c | 585 ++++-------------------
4351 clutter/cogl/cogl/cogl-atlas.c | 596 ++++++++++++++++++++++++
4352 clutter/cogl/cogl/cogl-atlas.h | 86 ++++
4353 clutter/cogl/cogl/cogl-context.c | 10 +-
4354 clutter/cogl/cogl/cogl-context.h | 5 +-
4355 7 files changed, 774 insertions(+), 514 deletions(-)
4357 commit 0c8582aad838bf0110cceeb2bedad4ae09645ce6
4358 Author: Neil Roberts <neil@linux.intel.com>
4359 Date: Wed Aug 4 17:59:06 2010 +0100
4361 cogl: Add an internal utility to maintain a list of callback functions
4363 This adds an internal CoglCallbackList type which is just a GSList of
4364 of function pointers along with a data pointer to form a
4365 closure. There are functions to add and remove items and to invoke the
4366 list of functions. This could be used in a number of places in Cogl.
4368 clutter/cogl/cogl/Makefile.am | 2 +
4369 clutter/cogl/cogl/cogl-callback-list.c | 107 ++++++++++++++++++++++++++++++++
4370 clutter/cogl/cogl/cogl-callback-list.h | 58 +++++++++++++++++
4371 3 files changed, 167 insertions(+)
4373 commit 4989000f55f1f5a88d397c29a7973ebecf6e4b3e
4374 Author: Neil Roberts <neil@linux.intel.com>
4375 Date: Mon Aug 2 15:24:03 2010 +0100
4377 cogl-atlas: Rename to CoglRectangleMap
4379 This simply renames CoglAtlas to CoglRectangleMap without making any
4380 functional changes. The old 'CoglAtlas' is just a data structure for
4381 managing unused areas of a rectangle and it doesn't neccessarily have
4382 to be used for an atlas so it wasn't a very good name.
4384 clutter/cogl/cogl/Makefile.am | 4 +-
4385 clutter/cogl/cogl/cogl-atlas-texture-private.h | 12 +-
4386 clutter/cogl/cogl/cogl-atlas-texture.c | 169 +++----
4387 clutter/cogl/cogl/cogl-atlas.c | 598 -----------------------
4388 clutter/cogl/cogl/cogl-atlas.h | 78 ---
4389 clutter/cogl/cogl/cogl-context.c | 7 +-
4390 clutter/cogl/cogl/cogl-context.h | 4 +-
4391 clutter/cogl/cogl/cogl-rectangle-map.c | 612 ++++++++++++++++++++++++
4392 clutter/cogl/cogl/cogl-rectangle-map.h | 78 +++
4393 9 files changed, 792 insertions(+), 770 deletions(-)
4395 commit 1e45428483f82b240bc45f20556cf767c49da902
4396 Author: Neil Roberts <neil@linux.intel.com>
4397 Date: Thu Aug 5 17:54:18 2010 +0100
4399 test-random-text: Convert to a micro-benchmark
4401 test-random-text is moved to the micro-bench directory. It now prints
4402 out the time taken to draw every 10 frames.
4404 tests/interactive/Makefile.am | 1 -
4405 tests/interactive/test-random-text.c | 86 -----------------------------
4406 tests/micro-bench/Makefile.am | 4 +-
4407 tests/micro-bench/test-random-text.c | 101 ++++++++++++++++++++++++++++++++++
4408 4 files changed, 104 insertions(+), 88 deletions(-)
4410 commit 65f449bdb0625c866781c56f025d20d20772dc8d
4411 Author: Neil Roberts <neil@linux.intel.com>
4412 Date: Thu Aug 5 17:27:23 2010 +0100
4414 test-text-perf: Add a wider range of characters
4416 Instead of just using the latin alphabet, this adds digits and some
4417 other alphabets to increase the range of glyphs used.
4419 tests/micro-bench/test-text-perf.c | 36 +++++++++++++++++++++++++++++++++++-
4420 1 file changed, 35 insertions(+), 1 deletion(-)
4422 commit c26d2c5ef90c49e3854d6630c2ade6d7069865d8
4423 Author: Neil Roberts <neil@linux.intel.com>
4424 Date: Thu Aug 5 17:06:45 2010 +0100
4426 test-text-perf: Scale the text if the settings will not fit
4428 If the font size or the number of characters causes the label not to
4429 fit on the stage, instead of aborting it will now scale the labels so
4430 that it fits within one of the dimensions. This makes it easier to
4431 test with large glyph sizes.
4433 tests/micro-bench/test-text-perf.c | 37 +++++++++++++++++++++++++++++-------
4434 1 file changed, 30 insertions(+), 7 deletions(-)
4436 commit 89c535f50d4affe761c7ea0ca2cb90066a2c1639
4437 Author: Neil Roberts <neil@linux.intel.com>
4438 Date: Thu Aug 12 09:11:28 2010 +0100
4440 cogl-material: Compare whether textures are equal by their GL handle
4442 Textures within a layer were compared for equality by comparing their
4443 texture handle. However this means that sub textures and atlas
4444 textures which may be internally using the same GL handle would not be
4445 batched together. Instead it now tries to determine the underlying GL
4446 handle using either the slice override or _cogl_texture_get_gl_texture
4447 and then compares those.
4449 clutter/cogl/cogl/cogl-material.c | 35 ++++++++++++++++++++++++++---------
4450 1 file changed, 26 insertions(+), 9 deletions(-)
4452 commit 8db96675d4332bc81edb1f5f4dfe237ab81a4d9e
4453 Author: Elliot Smith <elliot.smith@intel.com>
4454 Date: Thu Aug 12 10:05:27 2010 +0100
4456 cookbook: Added more explanation about setting y coord on scrollable
4458 Added some extra explanation, referencing the sample code, to
4459 try to make the scrollable actor example easier to follow. Basically
4460 demonstrates the principles described in the paragraph about
4461 setting the y coordinate for the scrollable actor, but using actual
4464 doc/cookbook/events.xml | 11 +++++++++++
4465 1 file changed, 11 insertions(+)
4467 commit 8538bdbdeae74433ed5f50b1e6ee0db3d9a81a3e
4468 Author: Neil Roberts <neil@linux.intel.com>
4469 Date: Wed May 5 16:45:21 2010 +0100
4471 cogl-atlas-texture: Accept formats with different component orders
4473 When filtering on allowed formats for atlas textures, it now masks out
4474 the BGR and AFIRST bits in addition to the premult bit. That way it
4475 will accept RGB and RGBA formats in any component order.
4477 In theory it could also accept luminance and alpha-only textures but I
4478 haven't added this because presumably if the application has requested
4479 these formats then it has some reason not to use a full RGB or RGBA
4480 texture and we should respect that.
4482 clutter/cogl/cogl/cogl-atlas-texture.c | 19 ++++++++++++++++---
4483 1 file changed, 16 insertions(+), 3 deletions(-)
4485 commit 2bf01dd9592854073b241ae562867732c7b45b2a
4486 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4487 Date: Thu Aug 12 09:03:58 2010 +0100
4489 build: Make the introspection generation quiet (again)
4491 build/autotools/Makefile.am.silent | 20 ++++++++++++++------
4492 clutter/Makefile.am | 12 ++++++++----
4493 clutter/cogl/cogl/Makefile.am | 4 +++-
4494 clutter/json/Makefile.am | 4 +++-
4495 4 files changed, 28 insertions(+), 12 deletions(-)
4497 commit 9b736cfeba8f4f3b57c8657b4d41aa554d03fec0
4498 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4499 Date: Thu Aug 12 08:53:06 2010 +0100
4501 drag-action: Capture ENTER when dragging
4503 This completes commit 9ab83cebf.
4505 clutter/clutter-drag-action.c | 1 +
4506 1 file changed, 1 insertion(+)
4508 commit a74d585fc522d010d4c8cbcffc566afc9ce495ca
4509 Author: Elliot Smith <elliot.smith@intel.com>
4510 Date: Wed Aug 11 17:14:09 2010 +0100
4512 cookbook: Mentioned the animation in the sample code
4514 Put in comments to make it clear where the animation
4515 for the mouse scroll is coming from in the sample code.
4517 doc/cookbook/events.xml | 1 +
4518 doc/cookbook/examples/events-mouse-scroll.c | 1 +
4519 2 files changed, 2 insertions(+)
4521 commit a421f0ae429bcf666dbfa1d44b15bfdbb06f898f
4522 Author: Elliot Smith <elliot.smith@intel.com>
4523 Date: Wed Aug 11 17:12:42 2010 +0100
4525 cookbook: Included video of the scroll example running
4527 Inlined the video of the mouse scroll example code running
4528 to the docbook file for events.
4530 doc/cookbook/events.xml | 11 +++++++++++
4531 1 file changed, 11 insertions(+)
4533 commit 1cfa87853a3fe1edf569a91c60528ee2d85679f7
4534 Author: Elliot Smith <elliot.smith@intel.com>
4535 Date: Wed Aug 11 17:11:29 2010 +0100
4537 cookbook: Made stage slightly smaller for scroll event example
4539 Reduced the size of the stage to make for a smaller video.
4541 doc/cookbook/examples/events-mouse-scroll.c | 2 +-
4542 1 file changed, 1 insertion(+), 1 deletion(-)
4544 commit f5db4943de58cf3ac9eb4aecf2278e298deaa052
4545 Author: Elliot Smith <elliot.smith@intel.com>
4546 Date: Wed Aug 11 17:10:45 2010 +0100
4548 cookbook: Added video showing scrollable actor
4550 doc/cookbook/Makefile.am | 1 +
4551 doc/cookbook/videos/events-mouse-scroll.ogv | Bin 0 -> 49532 bytes
4552 2 files changed, 1 insertion(+)
4554 commit f568a68ee16ce7f59596bd1336f37eee1667b7a1
4555 Author: Elliot Smith <elliot.smith@intel.com>
4556 Date: Wed Aug 11 16:54:28 2010 +0100
4558 cookbook: Added walk through of code example for mouse scroll
4560 Modified the mouse scroll example to fit better with the tutorial
4563 Added a stepped walkthrough of the scrollable actor code
4566 doc/cookbook/events.xml | 224 ++++++++++++++++++++++++++-
4567 doc/cookbook/examples/events-mouse-scroll.c | 33 +++-
4568 2 files changed, 243 insertions(+), 14 deletions(-)
4570 commit 57ba89c8de1e85d52f3e6d73dade472c0da7f22e
4571 Author: Elliot Smith <elliot.smith@intel.com>
4572 Date: Wed Aug 11 14:41:42 2010 +0100
4574 cookbook: Fixed link to example in mouse scroll recipe
4576 doc/cookbook/events.xml | 5 +++--
4577 1 file changed, 3 insertions(+), 2 deletions(-)
4579 commit 5e0bc919c305e1825bba75277df883c231f65837
4580 Author: Elliot Smith <elliot.smith@intel.com>
4581 Date: Wed Aug 11 14:39:22 2010 +0100
4583 cookbook: Simplified full scroll example
4585 Removed the layout and box to simplify the scrollable
4588 doc/cookbook/examples/events-mouse-scroll.c | 69 ++++++++++++++-------------
4589 1 file changed, 35 insertions(+), 34 deletions(-)
4591 commit e216771a86d985631c2ee1182f1ae7c240e5c28d
4592 Author: Elliot Smith <elliot.smith@intel.com>
4593 Date: Wed Aug 11 11:14:54 2010 +0100
4595 cookbook: Improved wording and formatting in mouse scroll intro.
4597 doc/cookbook/events.xml | 4 ++--
4598 1 file changed, 2 insertions(+), 2 deletions(-)
4600 commit 0f919fcbe3b8c5afed58e082c2dd7e14756b207c
4601 Author: Elliot Smith <elliot.smith@intel.com>
4602 Date: Wed Aug 11 11:10:53 2010 +0100
4604 cookbook: Handle all possible mouse scroll directions
4606 Added empty cases for MOUSE_SCROLL_LEFT and MOUSE_SCROLL_RIGHT
4607 to the scroll-event signal handler in the example code.
4609 doc/cookbook/examples/events-mouse-scroll.c | 3 +++
4610 1 file changed, 3 insertions(+)
4612 commit f1312e118d21c293625754248c07fa1168a1732c
4613 Author: Elliot Smith <elliot.smith@intel.com>
4614 Date: Wed Aug 11 11:09:04 2010 +0100
4616 cookbook: Build mouse scroll example with cookbook
4618 doc/cookbook/examples/.gitignore | 1 +
4619 doc/cookbook/examples/Makefile.am | 2 ++
4620 2 files changed, 3 insertions(+)
4622 commit 241ceab73cbc1fa0a1f7c19ad95fdd54b1c26864
4623 Author: Elliot Smith <elliot.smith@intel.com>
4624 Date: Wed Aug 11 11:03:37 2010 +0100
4626 cookbook: Cleaned up redundant comments in code example
4628 Removed comments which are only relevant in my local build
4631 doc/cookbook/examples/events-mouse-scroll.c | 6 ------
4632 1 file changed, 6 deletions(-)
4634 commit 5e268e0bbb0e2dcbf6edfbf3e1725a3e61e8dbd0
4635 Author: Elliot Smith <elliot.smith@intel.com>
4636 Date: Wed Aug 11 11:03:02 2010 +0100
4638 cookbook: Added xmlns for XInclude to events docbook file
4640 doc/cookbook/events.xml | 2 +-
4641 1 file changed, 1 insertion(+), 1 deletion(-)
4643 commit ec7186627726885acc4487f5f44177281c0f3fc6
4644 Author: Elliot Smith <elliot.smith@intel.com>
4645 Date: Wed Aug 11 10:34:49 2010 +0100
4647 cookbook: Added basic mouse scroll recipe
4649 Added a recipe explaining the basics of mouse scroll events.
4651 doc/cookbook/events.xml | 115 +++++++++++++++++++++++++++
4652 doc/cookbook/examples/events-mouse-scroll.c | 108 +++++++++++++++++++++++++
4653 2 files changed, 223 insertions(+)
4655 commit ed39948ccf776b50fba9c3c7934ddb727091db11
4656 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4657 Date: Wed Aug 11 17:43:15 2010 +0100
4659 colorize-effect: Do not inherit from ShaderEffect
4663 7daeb217 blur-effect: Do not inherit from ShaderEffect
4664 1ec57743 desaturate-effect: Do not inherit from ShaderEffect
4666 We might avoid using shaders at all in the future for simple effects.
4668 clutter/clutter-colorize-effect.c | 156 ++++++++++++++++++++++++++++++-------
4669 1 file changed, 126 insertions(+), 30 deletions(-)
4671 commit d10ebe9fcaf28b85d707ea41f5856632f9c8a934
4672 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4673 Date: Wed Aug 11 17:25:17 2010 +0100
4675 effects: Check before using the cogl_shader_* API
4677 Since BlurEffect and DesaturateEffect are using the shader API
4678 implicitly and not using ClutterShaderEffect, we need to check if the
4679 underlying GL implementation supports the GLSL shading language and warn
4682 clutter/clutter-blur-effect.c | 12 ++++++++++++
4683 clutter/clutter-desaturate-effect.c | 12 ++++++++++++
4684 2 files changed, 24 insertions(+)
4686 commit 9ab83cebfdd4808db7ebe09193b218f62f157049
4687 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4688 Date: Wed Aug 11 14:42:56 2010 +0100
4690 drag-action: Capture stage leave
4692 If we are dragging, we don't want the drag handle to emit a
4693 ::leave-event even if the pointer left the stage.
4695 clutter/clutter-drag-action.c | 5 +++++
4696 1 file changed, 5 insertions(+)
4698 commit 1ec577438e2f710970276dc3872bf4c8bb360ddf
4699 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4700 Date: Wed Aug 11 14:19:48 2010 +0100
4702 desaturate-effect: Do not inherit from ShaderEffect
4704 Hide the fact that we're using a fragment shader, in case we're able in
4705 the future to use a material layer combine function when painting the
4706 offscreen target texture.
4708 clutter/clutter-desaturate-effect.c | 128 ++++++++++++++++++++++++++++-------
4709 1 file changed, 104 insertions(+), 24 deletions(-)
4711 commit 7daeb217bd9f1e0e38ac6201f722bdc7fd2c45b6
4712 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4713 Date: Wed Aug 11 13:05:42 2010 +0100
4715 blur-effect: Do not inherit from ShaderEffect
4717 We might want to switch the BlurEffect from a box-blur to a
4718 super-sampling of the texture target, in order to make it cheap(er).
4719 If we inherit from ShaderEffect, though, we're setting in stone the
4720 fact that we are going to use a fragment shader for blurring.
4722 Since there is not parametrization of the blur, the code necessary
4723 to implement effect is pretty small, and we can use the Cogl API
4726 clutter/clutter-blur-effect.c | 157 +++++++++++++++++++++++++++--------------
4727 1 file changed, 103 insertions(+), 54 deletions(-)
4729 commit eb4dee46b70a73d0926e8e36bb75abc52604256e
4730 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4731 Date: Wed Aug 11 13:58:29 2010 +0100
4733 shader-effect: Attach the program to the target material
4735 Instead of calling cogl_program_use() around the paint_target()
4736 chain-up, we can use the newly added API in CoglMaterial to attach
4737 user-defined shaders to the offscreen target material.
4739 clutter/clutter-shader-effect.c | 39 ++++++++++++++++++++++++---------------
4740 1 file changed, 24 insertions(+), 15 deletions(-)
4742 commit 304e7dd077f1e7f9e7eab8b3b15bf6f22bf354f0
4743 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4744 Date: Wed Aug 11 13:53:02 2010 +0100
4746 test-drag: Fix the page curl angle
4748 tests/interactive/test-drag.c | 2 +-
4749 1 file changed, 1 insertion(+), 1 deletion(-)
4751 commit c87bfef1eb7f59975513bed9da70a45ce50f7dd3
4752 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4753 Date: Wed Aug 11 12:40:22 2010 +0100
4755 stage: Fix the user-resizable property enumeration id
4757 clutter/clutter-stage.c | 8 ++++----
4758 1 file changed, 4 insertions(+), 4 deletions(-)
4760 commit 59a9786942c7cfae9b6ba138cf76ba658709fedb
4761 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4762 Date: Wed Aug 11 11:39:24 2010 +0100
4764 actor: Use box origin instead of direct access
4766 clutter/clutter-actor.c | 4 ++--
4767 1 file changed, 2 insertions(+), 2 deletions(-)
4769 commit 5e1d40c07b66bcb4c2c0a4fd203bfdfeeaf3f17e
4770 Merge: 8d51617 d14e294
4771 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4772 Date: Wed Aug 11 11:32:44 2010 +0100
4774 Merge branch 'wip/table-layout'
4777 Add ClutterTableLayout, a layout showing children in rows and columns
4778 box-layout: Use allocate_align_fill()
4779 bin-layout: Migrate to allocate_align_fill()
4780 actor: Add allocate_align_fill()
4781 test-flow-layout: Use BindConstraints
4783 commit d14e294d86d35e9128d04ebf9a43367b5babac40
4784 Author: José Dapena Paz <jdapena@igalia.com>
4785 Date: Thu Mar 18 17:02:31 2010 +0100
4787 Add ClutterTableLayout, a layout showing children in rows and columns
4789 A TableLayout is a layout manager that allocates its children in rows
4790 and columns. Each child is assigned to a cell (or more if a cell span
4793 The supported child properties are:
4795 • x-expand and y-expand: if this cell with try to allocate the
4796 available extra space for the table.
4797 • x-fill and y-fill: if the child will get all the space available in
4799 • x-align and y-align: if the child does not fill the cell, then
4800 where the child will be aligned inside the cell.
4801 • row-span and col-span: number of cells the child will allocate for
4804 Also, the TableLayout has row-spacing and col-spacing for specifying
4805 the space in pixels between rows and between columns.
4807 We also include a simple test of the layout manager, and the
4808 documentation updates.
4810 The TableLayout was implemented starting from MxTable and
4813 http://bugzilla.clutter-project.org/show_bug.cgi?id=2038
4815 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4817 clutter/Makefile.am | 2 +
4818 clutter/clutter-table-layout.c | 2642 ++++++++++++++++++++++++++++
4819 clutter/clutter-table-layout.h | 163 ++
4820 clutter/clutter.h | 1 +
4821 doc/reference/clutter/clutter-docs.xml.in | 1 +
4822 doc/reference/clutter/clutter-sections.txt | 47 +
4823 doc/reference/clutter/clutter.types | 1 +
4824 tests/interactive/.gitignore | 1 +
4825 tests/interactive/Makefile.am | 3 +-
4826 tests/interactive/test-table-layout.c | 275 +++
4827 10 files changed, 3135 insertions(+), 1 deletion(-)
4829 commit 1043e77a00b1f5965b9a5ff52db6d0f0bd93e88c
4830 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4831 Date: Tue Aug 10 22:20:38 2010 +0100
4833 box-layout: Use allocate_align_fill()
4835 Remove duplicated code, and use the newly added actor method to compute
4836 the child allocation based on alignment and fill.
4838 clutter/clutter-box-layout.c | 116 ++++++++----------------------------------
4839 1 file changed, 21 insertions(+), 95 deletions(-)
4841 commit 6ad4126e1783d1e9a04eaf88accce6d0950064d6
4842 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4843 Date: Tue Aug 10 17:43:26 2010 +0100
4845 bin-layout: Migrate to allocate_align_fill()
4847 Now that we have the code in ClutterActor itself.
4849 clutter/clutter-bin-layout.c | 100 +++++++-----------------------------------
4850 1 file changed, 17 insertions(+), 83 deletions(-)
4852 commit 07b01888baed28e5fb3f0831a2441218b469f846
4853 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4854 Date: Tue Aug 10 17:40:01 2010 +0100
4856 actor: Add allocate_align_fill()
4858 Layout managers are using the same code to allocate a child while taking
4861 • horizontal and vertical alignment
4862 • horizontal and vertical fill
4863 • the preferred minimum and natural size, depending
4864 on the :request-mode property
4865 • the text direction for the horizontal alignment
4866 • an offset given by the fixed position properties
4868 Given the amount of code involved, and the amount of details that can go
4869 horribly wrong while copy and pasting such code in various classes - let
4870 alone various projects - Clutter should provide an allocate() variant
4871 that does the right thing in the right way. This way, we have a single
4874 clutter/clutter-actor.c | 139 ++++++++++++++++++++++++++++
4875 clutter/clutter-actor.h | 7 ++
4876 doc/reference/clutter/clutter-sections.txt | 1 +
4877 3 files changed, 147 insertions(+)
4879 commit 02b7bf3635ce9a3a67016847e99128bd0a9f67d9
4880 Author: Emmanuele Bassi <ebassi@linux.intel.com>
4881 Date: Tue Aug 10 17:43:56 2010 +0100
4883 test-flow-layout: Use BindConstraints
4885 If we want to fit the FlowLayout to the Stage size we should use the
4886 BindConstraint API instead of a watcher on ::allocation-changed.
4888 tests/interactive/test-flow-layout.c | 28 +++++++---------------------
4889 1 file changed, 7 insertions(+), 21 deletions(-)
4891 commit 8d5161797974f8f9eb25da844f64fc27bceb28f4
4892 Author: Neil Roberts <neil@linux.intel.com>
4893 Date: Mon Jun 21 10:20:32 2010 +0100
4895 Conditionally use g_object_notify_by_pspec
4897 This adds a wrapper macro to clutter-private that will use
4898 g_object_notify_by_pspec if it's compiled against a version of GLib
4899 that is sufficiently new. Otherwise it will notify by the property
4900 name as before by extracting the name from the pspec. The objects can
4901 then store a static array of GParamSpecs and notify using those as
4902 suggested in the documentation for g_object_notify_by_pspec.
4904 Note that the name of the variable used for storing the array of
4905 GParamSpecs is obj_props instead of properties as used in the
4906 documentation because some places in Clutter uses 'properties' as the
4907 name of a local variable.
4909 Mose of the classes in Clutter have been converted using the script in
4910 the bug report. Some classes have not been modified even though the
4911 script picked them up as described here:
4915 We probably don't want to modify the internal copy of JSON
4922 These aren't using the separate GParamSpec* variable style.
4925 win32/device-manager:
4927 Don't actually define any properties even though it has the enum.
4932 Have some per-child properties that don't work automatically with
4937 The script gets confused with ClutterModelIter
4941 Script gets confused because PROP_USER_RESIZE doesn't match
4946 Don't really want to modify the tests
4948 http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
4950 clutter/clutter-actor-meta.c | 13 +-
4951 clutter/clutter-actor.c | 208 +++++++++++++++++++-----------
4952 clutter/clutter-align-constraint.c | 15 ++-
4953 clutter/clutter-alpha.c | 19 ++-
4954 clutter/clutter-animation.c | 40 +++---
4955 clutter/clutter-animator.c | 8 +-
4956 clutter/clutter-behaviour-ellipse.c | 37 ++++--
4957 clutter/clutter-behaviour-opacity.c | 12 +-
4958 clutter/clutter-behaviour-path.c | 9 +-
4959 clutter/clutter-behaviour-rotate.c | 27 ++--
4960 clutter/clutter-behaviour-scale.c | 16 ++-
4961 clutter/clutter-behaviour.c | 9 +-
4962 clutter/clutter-bin-layout.c | 18 ++-
4963 clutter/clutter-bind-constraint.c | 15 ++-
4964 clutter/clutter-binding-pool.c | 7 +-
4965 clutter/clutter-box.c | 15 ++-
4966 clutter/clutter-cairo-texture.c | 12 +-
4967 clutter/clutter-child-meta.c | 8 +-
4968 clutter/clutter-click-action.c | 10 +-
4969 clutter/clutter-clone.c | 9 +-
4970 clutter/clutter-colorize-effect.c | 9 +-
4971 clutter/clutter-deform-effect.c | 13 +-
4972 clutter/clutter-desaturate-effect.c | 9 +-
4973 clutter/clutter-device-manager.c | 7 +-
4974 clutter/clutter-drag-action.c | 15 ++-
4975 clutter/clutter-input-device.c | 9 +-
4976 clutter/clutter-interval.c | 7 +-
4977 clutter/clutter-layout-meta.c | 7 +-
4978 clutter/clutter-page-turn-effect.c | 15 ++-
4979 clutter/clutter-path.c | 8 +-
4980 clutter/clutter-private.h | 12 ++
4981 clutter/clutter-script.c | 8 +-
4982 clutter/clutter-settings.c | 15 ++-
4983 clutter/clutter-shader-effect.c | 7 +-
4984 clutter/clutter-shader.c | 20 ++-
4985 clutter/clutter-state.c | 10 +-
4986 clutter/clutter-text.c | 91 ++++++++-----
4987 clutter/clutter-texture.c | 42 ++++--
4988 clutter/clutter-timeline.c | 18 ++-
4989 clutter/x11/clutter-device-manager-x11.c | 7 +-
4990 clutter/x11/clutter-input-device-x11.c | 7 +-
4991 clutter/x11/clutter-keymap-x11.c | 7 +-
4992 42 files changed, 608 insertions(+), 242 deletions(-)
4994 commit bfa10f629f6400ff31471922ad57c27c71e76697
4995 Author: Elliot Smith <elliot.smith@intel.com>
4996 Date: Tue Aug 10 11:02:17 2010 +0100
4998 cookbook: Added recipe for non-rectangular actor
5000 Added a new recipe for creating a non-rectangular
5001 actor using ClutterPath (aka "shaped pick") and
5002 the Cogl primitives API.
5004 Also cleaned up XML alignment in the actors.xml
5007 doc/cookbook/actors.xml | 691 +++++++++++++++++++++++++++++++++++------------
5008 1 file changed, 523 insertions(+), 168 deletions(-)
5010 commit de8276105f34b480dee0b2044debe001c25710ac
5011 Author: Owen W. Taylor <otaylor@fishsoup.net>
5012 Date: Mon Aug 9 15:06:35 2010 -0400
5014 Always bind a new texture to unit 1 when necessary
5016 The special handling for texture unit 1 caught the case where unit
5017 1 was changed for transient purposes, but didn't properly handle
5018 the case where the actual non-transient texture was different between
5019 two materials with no transient binding in between.
5021 If the actual texture has changed when flushing, mark unit 1 as dirty
5022 and needing a rebind.
5024 http://bugzilla.clutter-project.org/show_bug.cgi?id=2261
5026 clutter/cogl/cogl/cogl-material-opengl.c | 4 +++-
5027 1 file changed, 3 insertions(+), 1 deletion(-)
5029 commit b646f0cfa9277ca9fd7bc7da035942a72924d6e0
5030 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5031 Date: Mon Aug 9 19:56:00 2010 +0100
5033 clutter.modules: Add Cluttersmith
5035 build/clutter.modules | 10 ++++++++++
5036 1 file changed, 10 insertions(+)
5038 commit 966cbd51278421d99360454a525e3789a04b1f5d
5039 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5040 Date: Mon Aug 9 19:55:42 2010 +0100
5042 clutter.modules: Mx moved to clutter-project.org
5044 build/clutter.modules | 2 +-
5045 1 file changed, 1 insertion(+), 1 deletion(-)
5047 commit ecc086e9eb86829646d72ca99f618fa7ba4ad95d
5048 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5049 Date: Mon Aug 9 19:38:23 2010 +0100
5051 Silence a compiler warning
5053 clutter/cogl/cogl/cogl-shader.c | 3 +++
5054 1 file changed, 3 insertions(+)
5056 commit 1c2e41e1b388fdf82867ac4071734316e5731870
5057 Merge: 985a4db eaed9c2
5058 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5059 Date: Mon Aug 9 17:44:42 2010 +0100
5061 Merge remote branch 'elliot/cookbook-layouts-introduction'
5063 * elliot/cookbook-layouts-introduction:
5064 cookbook: Added layout introduction and "stacking actors" recipe
5065 cookbook: Added layouts.xml to the list of XML files
5066 cookbook: Added layouts section and introduction
5068 commit 985a4db94799ae9279ecde166ff46c5de2f369bf
5069 Author: Damien Lespiau <damien.lespiau@intel.com>
5070 Date: Thu Aug 5 15:55:12 2010 +0100
5072 gitignore: Ignore test-cogl-shader-{arbfp,glsl}
5074 Fear the out of tree builds!
5076 tests/interactive/.gitignore | 2 ++
5077 1 file changed, 2 insertions(+)
5079 commit a4339842f938312da4a51b8592e38e207b15bdc3
5080 Author: Robert Bragg <robert@linux.intel.com>
5081 Date: Thu Aug 5 15:18:39 2010 +0100
5083 tests-interactive: Adds a test-cogl-shader-glsl.c
5085 This is based on test-shader.c but is solely implemented with the
5086 cogl_program/shader APIs instead of the clutter shader APIs.
5088 tests/interactive/Makefile.am | 1 +
5089 tests/interactive/test-cogl-shader-glsl.c | 382 +++++++++++++++++++++++++++++
5090 2 files changed, 383 insertions(+)
5092 commit f6a1f56031ed0bb404b902db83629732fc788b32
5093 Author: Robert Bragg <robert@linux.intel.com>
5094 Date: Thu Aug 5 15:20:49 2010 +0100
5096 tests/interactive: Adds a test-cogl-shader-arbfp.c
5098 This tests the ARBfp support for cogl_program and cogl_shader using the
5099 shaders Chris Lord adapted from test-shader when he was experimenting
5100 with adding ARBfp support to clutter back in 2008 (See:
5101 http://bugzilla.clutter-project.org/show_bug.cgi?id=1049)
5103 tests/interactive/Makefile.am | 1 +
5104 tests/interactive/test-cogl-shader-arbfp.c | 404 ++++++++++++++++++++++++++++
5105 2 files changed, 405 insertions(+)
5107 commit 09e664c349d6132801683c2b4cc5852d57e5f3a6
5108 Author: Robert Bragg <robert@linux.intel.com>
5109 Date: Wed Aug 4 17:53:51 2010 +0100
5111 cogl: Allow setting ARBfp source on a CoglShader
5113 This makes CoglProgram/Shader automatically detect when the user has
5114 given an ARBfp program by checking for "!!ARBfp1.0" at the beginning of
5117 ARBfp local parameters can be set with cogl_program_uniform_float
5118 assuming you pass a @size of 4 (all ARBfp program.local parameters
5119 are vectors of 4 floats).
5121 This doesn't expose ARBfp environment parameters or double precision
5124 clutter/cogl/cogl/cogl-material-arbfp.c | 72 +++++++--
5125 clutter/cogl/cogl/cogl-material-glsl.c | 24 +--
5126 clutter/cogl/cogl/cogl-shader-private.h | 13 ++
5127 clutter/cogl/cogl/cogl-shader.c | 116 ++++++++++++---
5128 clutter/cogl/cogl/cogl.c | 6 +-
5129 clutter/cogl/cogl/driver/gl/cogl-program.c | 204 ++++++++++++++++++++++----
5130 clutter/cogl/cogl/driver/gl/cogl-program.h | 11 +-
5131 clutter/cogl/cogl/driver/gles/cogl-program.c | 7 +
5132 8 files changed, 371 insertions(+), 82 deletions(-)
5134 commit 5741e28cdcba3619f0eadff0e8de0d7b0d9c5c60
5135 Author: Robert Bragg <robert@linux.intel.com>
5136 Date: Thu Aug 5 10:59:03 2010 +0100
5138 cogl: Adds a COGL_FEATURE_SHADERS_ARBFP feature flag
5140 This adds a public feature flag for ARBfp so developers can determine if
5141 the cogl API supports ARBfp or not.
5143 clutter/cogl/cogl/cogl-internal.h | 2 +-
5144 clutter/cogl/cogl/cogl-material-arbfp.c | 2 +-
5145 clutter/cogl/cogl/cogl-types.h | 4 +++-
5146 clutter/cogl/cogl/cogl.c | 2 +-
5147 clutter/cogl/cogl/driver/gl/cogl-feature-functions.h | 4 ++--
5148 5 files changed, 8 insertions(+), 6 deletions(-)
5150 commit f781bcec7e92c4387a2b755510681502290f8e75
5151 Author: Robert Bragg <robert@linux.intel.com>
5152 Date: Thu Aug 5 10:46:54 2010 +0100
5154 material: Add cogl_material_{get,set}_user_program
5156 Previously we had an internal only _cogl_material_set_user_program to
5157 redirect legacy usage of cogl_program_use() through CoglMaterial. This
5158 instead makes the API public because until we implement our planned
5159 "snippet" framework we need a stop-gap solution for using shaders in
5162 The plan is to also support ARBfp with the cogl_program/shader API so
5163 this API will also allow clutter-gst to stop using direct OpenGL calls
5164 that conflict with Cogl's state tracking.
5166 clutter/cogl/cogl/cogl-material-private.h | 4 --
5167 clutter/cogl/cogl/cogl-material.c | 24 +++++++++--
5168 clutter/cogl/cogl/cogl-material.h | 64 +++++++++++++++++++++++++++++
5169 3 files changed, 84 insertions(+), 8 deletions(-)
5171 commit 1314d0b1a7567efd89f0aeca94a1d3e4c6b392bb
5172 Author: Robert Bragg <robert@linux.intel.com>
5173 Date: Sun Aug 8 13:54:07 2010 +0100
5175 material: chain up in layer_pre_change_notify
5177 A change to a layer is also going to be a change to its owning material
5178 so we have to chain up in _cogl_material_layer_pre_change_notify and
5179 call _cogl_material_pre_change_notify. Previously we were only
5180 considering if the owning material was referenced in the journal but
5181 that ignores that it might also have dependants. We no longer need to
5182 flush the journal directly in layer_pre_change_notify.
5184 clutter/cogl/cogl/cogl-material.c | 16 ++++++++++++----
5185 1 file changed, 12 insertions(+), 4 deletions(-)
5187 commit 855661754653ed1b5b1e0f1bf491f7e360ca5ed0
5188 Author: Robert Bragg <robert@linux.intel.com>
5189 Date: Sun Aug 8 14:26:45 2010 +0100
5191 material: unlink old layer from owner when replacing
5193 In _cogl_material_layer_pre_change_notify when we see that a layer has
5194 dependants and it can't be modified directly then we allocate a new
5195 layer. In this case we also have to link the new layer to its required
5196 owner. If the immutable layer we copied had the same owner though we
5197 weren't unlinking that old layer.
5199 clutter/cogl/cogl/cogl-material.c | 2 ++
5200 1 file changed, 2 insertions(+)
5202 commit eeac7c5f431cf9c6df66ddbe8a9c862e9143884c
5203 Author: Robert Bragg <robert@linux.intel.com>
5204 Date: Sun Aug 8 13:41:15 2010 +0100
5206 material: fix initialization of sparse properties
5208 In _cogl_material_pre_change_notify we need to identify if it's a sparse
5209 property being changed and if so initialize the state group if the given
5210 material isn't currently the authority for it.
5212 Previously we were unconditionally calling
5213 _cogl_material_initialize_state which would e.g. NULL the layer
5214 differences list of a material each time a layer change was notified.
5216 It would also call _cogl_material_initialize_state for non-sparse
5217 properties which should always be valid at this point so the function
5218 has been renamed to _cogl_material_initialize_sparse_state to make this
5219 clearer with a corresponding g_return_if_fail check.
5221 clutter/cogl/cogl/cogl-material.c | 25 ++++++++++++++-----------
5222 1 file changed, 14 insertions(+), 11 deletions(-)
5224 commit d489832688ab28e7a2a889cf793bef6ab8fab334
5225 Author: Robert Bragg <robert@linux.intel.com>
5226 Date: Sun Aug 8 13:09:27 2010 +0100
5228 material: fix copying of material layer differences
5230 This fixes how we copy layer differences in
5231 _cogl_material_copy_layer_differences.
5233 We were making a redundant g_list_copy of the src differences and then
5234 iterating the src list calling _cogl_material_add_layer_difference for
5235 each entry which would double the list length, but the initial copy
5236 directly referenced the original layers which wasn't correct.
5238 Also we were initializing dest->n_layers before copying the layer
5239 differences but the act of copying the differences will re-initialize
5240 n_layers to 0 when adding the first layer_difference since it will
5241 trigger a layer_pre_change_notify and since the dest material isn't yet
5242 a STATE_LAYERS authority the state group is initialized before allowing
5245 clutter/cogl/cogl/cogl-material.c | 8 +++++---
5246 1 file changed, 5 insertions(+), 3 deletions(-)
5248 commit 0e2880b067e96ff93deec6c3a6ffb7aa0cd4cee4
5249 Author: Robert Bragg <robert@linux.intel.com>
5250 Date: Sun Aug 8 13:05:40 2010 +0100
5252 material: don't dereference layer->texture directly
5254 In _cogl_material_texture_storage_change_notify we were potentially
5255 dereferencing layer->texture without checking first that it is the
5256 authority of texture state. We now use
5257 _cogl_material_layer_get_texture() instead.
5259 clutter/cogl/cogl/cogl-material-opengl.c | 4 ++--
5260 1 file changed, 2 insertions(+), 2 deletions(-)
5262 commit 9c46cb7f21fba3a8871128866c74325a598f49f2
5263 Author: Robert Bragg <robert@linux.intel.com>
5264 Date: Sun Aug 8 14:09:26 2010 +0100
5266 material: Improve the dot file debugging code
5268 This improve the dot file output available when calling
5269 _cogl_debug_dump_materials_dot_file. The material graph now directly
5270 points into the layer graph and the layers now show the texture unit
5273 clutter/cogl/cogl/cogl-material.c | 30 ++++++++++++++++--------------
5274 1 file changed, 16 insertions(+), 14 deletions(-)
5276 commit eaed9c22da03caa1a0ce43656f2afdfc00ac5115
5277 Author: Elliot Smith <elliot.smith@intel.com>
5278 Date: Thu Aug 5 16:46:36 2010 +0100
5280 cookbook: Added layout introduction and "stacking actors" recipe
5282 Expanded the layout introduction and added a recipe about
5283 stacking actors using ClutterBinLayout, with two examples.
5285 doc/cookbook/Makefile.am | 1 +
5286 doc/cookbook/examples/.gitignore | 2 +
5287 doc/cookbook/examples/Makefile.am | 14 +-
5288 .../examples/layouts-stacking-diff-sized-actors.c | 78 +++++
5289 doc/cookbook/examples/layouts-stacking.c | 80 +++++
5290 .../images/layouts-stacking-diff-actor-sizes.png | Bin 0 -> 1579 bytes
5291 doc/cookbook/layouts.xml | 325 +++++++++++++++++++-
5292 7 files changed, 487 insertions(+), 13 deletions(-)
5294 commit 309dd1f50e73cf6bf6e5308abca3b77135dd4686
5295 Author: Elliot Smith <elliot.smith@intel.com>
5296 Date: Thu Aug 5 13:43:23 2010 +0100
5298 cookbook: Added layouts.xml to the list of XML files
5300 Make sure layouts.xml is included for make dist.
5302 doc/cookbook/Makefile.am | 1 +
5303 1 file changed, 1 insertion(+)
5305 commit 1a44b56b7a5b42ff26abde46c5fdea2f8e3858ff
5306 Author: Elliot Smith <elliot.smith@intel.com>
5307 Date: Tue Aug 3 11:00:19 2010 +0100
5309 cookbook: Added layouts section and introduction
5311 doc/cookbook/clutter-cookbook.xml.in | 1 +
5312 doc/cookbook/layouts.xml | 281 ++++++++++++++++++++++++++++++++++
5313 2 files changed, 282 insertions(+)
5315 commit 1943b8e544a985e08cd4fbe2ae79320fed2f2548
5316 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5317 Date: Mon Aug 9 11:29:03 2010 +0100
5319 glx: Depend on libdrm
5321 DRM is available on more platforms than Linux (e.g. kFreeBSD), but
5322 Clutter currently FTBFS there because of not being an alternative to
5323 the __linux__ code (where it should be HAVE_DRM).
5325 Instead of copying the DRM data structures, we should use libdrm when
5326 falling back to directly requesting to wait for the vblank.
5328 http://bugzilla.clutter-project.org/show_bug.cgi?id=2225
5330 Based on a patch by: Emilio Pozuelo Monfort <pochu27@gmail.com>
5331 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
5333 clutter/glx/clutter-stage-glx.c | 43 ++++++++++-----------------------------
5334 configure.ac | 8 ++++++++
5335 2 files changed, 19 insertions(+), 32 deletions(-)
5337 commit 28378f1bb4f74c4ba97618f404386b26a28f5224
5338 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5339 Date: Mon Aug 9 11:06:44 2010 +0100
5341 layout-manager: Do not emit layout-changed on thaw
5343 When thawing a LayoutManager, do not emit the ::layout-changed signal
5344 since it might still be in the middle of a relayout.
5346 http://bugzilla.clutter-project.org/show_bug.cgi?id=2255
5348 clutter/clutter-layout-manager.c | 17 +++++++++++++----
5349 1 file changed, 13 insertions(+), 4 deletions(-)
5351 commit 306385c2eb6ea3e0df406edc34227ca8c2622b7d
5352 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5353 Date: Mon Aug 9 08:50:18 2010 +0100
5355 animator: Remove redundant parenthesis
5357 clutter/clutter-animator.c | 2 +-
5358 1 file changed, 1 insertion(+), 1 deletion(-)
5360 commit 74301da8e7bbce31395871927fe8afd6e08bbfd9
5361 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5362 Date: Sun Aug 8 19:18:46 2010 +0100
5364 animator: Improve the key value copy
5366 Use the same code used elsewhere in Clutter when dealing with values
5367 that can be copied or transformed.
5369 clutter/clutter-animator.c | 41 ++++++++++++++++++++++++++++-------------
5370 1 file changed, 28 insertions(+), 13 deletions(-)
5372 commit 1ca0c2a6d1ce7477b4c31c507603c870f298c79d
5373 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5374 Date: Sun Aug 8 19:17:14 2010 +0100
5376 state: Return a boolean when getting the key value
5378 Since the copy might fail, we should return a boolean value and not just
5379 warn on the console - similarly to what ClutterAnimator does.
5381 clutter/clutter-state.c | 26 ++++++++++++++++++--------
5382 clutter/clutter-state.h | 2 +-
5383 2 files changed, 19 insertions(+), 9 deletions(-)
5385 commit 786285a245096950015f55adc6f43db23371dc90
5386 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5387 Date: Sun Aug 8 13:48:51 2010 +0100
5389 clutter.modules: Fix UProf id
5391 build/clutter.modules | 2 +-
5392 1 file changed, 1 insertion(+), 1 deletion(-)
5394 commit fa8ee94c597fa34000d471c1e959a74ebe114076
5395 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5396 Date: Fri Aug 6 19:33:21 2010 +0100
5398 clutter.modules: Fix the uprof repository
5402 build/clutter.modules | 6 ++++--
5403 1 file changed, 4 insertions(+), 2 deletions(-)
5405 commit d07a525eccc4b9504980ee01531dc5ee6b8db6e4
5406 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5407 Date: Fri Aug 6 17:04:37 2010 +0100
5409 text: Do not set the markup unconditionally
5411 When setting :use-markup we always pass the contents of the Text actor
5412 to clutter_text_set_markup_internal(); if string contains any markup,
5413 this ends up being parsed and used - even when :use-markup is set to
5416 http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
5418 clutter/clutter-text.c | 66 ++++++++++++++++++++++++++++++++++++++++--------
5419 1 file changed, 55 insertions(+), 11 deletions(-)
5421 commit fcbfd4ec34ba53953935954cf90f09e5675fb8cc
5422 Author: Neil Roberts <neil@linux.intel.com>
5423 Date: Fri Aug 6 16:41:41 2010 +0100
5425 cogl-material: Unref the texture when reverting authority
5427 When the texture is set on a layer so that it is back to the parent's
5428 texture it would clear the texture change flag but it wouldn't unref
5429 the texture. The free function for a material layer does not unref the
5430 texture if the change flag is cleared so the texture would end up
5431 leaking. This happens for ClutterTexture because it disposes the
5432 texture by setting layer 0 of the material to COGL_INVALID_HANDLE
5433 which ends up the same as the default material.
5435 clutter/cogl/cogl/cogl-material.c | 3 +++
5436 1 file changed, 3 insertions(+)
5438 commit 7032e249501080a699e19a731be2bc7d7ecc325f
5439 Author: Damien Lespiau <damien.lespiau@intel.com>
5440 Date: Fri Aug 6 15:39:01 2010 +0100
5442 cookbook: Make the table of content have a depth of 2
5444 Instead of showing Problem/Solution/Discussion for each recipe, let's
5445 just show the title of those recipes.
5447 doc/common/cookbook.xsl | 3 +++
5448 1 file changed, 3 insertions(+)
5450 commit 86c3be550efa724d512b6b1c699e05f7f4257bea
5451 Author: Damien Lespiau <damien.lespiau@intel.com>
5452 Date: Fri Aug 6 12:30:06 2010 +0100
5454 cookbook: Remove the note about indenting <xi:include>
5456 It's not necessary now to special case the indentation of includes as
5457 the XSLT for the cookbook strips leading and trailing space automaticaly
5460 doc/cookbook/clutter-cookbook.xml.in | 13 +++----------
5461 1 file changed, 3 insertions(+), 10 deletions(-)
5463 commit 4f5ab7d01049ab3b9ceed5a8cbe6b01e8a928a4e
5464 Author: Damien Lespiau <damien.lespiau@intel.com>
5465 Date: Thu Aug 5 13:21:52 2010 +0100
5467 cookbook: Close a tag, making xsltproc happier
5469 A </function> tag was not closed.
5471 doc/cookbook/text.xml | 2 +-
5472 1 file changed, 1 insertion(+), 1 deletion(-)
5474 commit cbd6e047dd61ac7ceb47996346ded26d52e6d6d0
5475 Author: Damien Lespiau <damien.lespiau@intel.com>
5476 Date: Thu Aug 5 10:58:42 2010 +0100
5478 cookbook: Add a recipe on how to create sub-textures
5480 Fiddle with Cogl textures to create a new ClutterTexture that only
5481 displays a rectangular region of a bigger ClutterTexture.
5483 doc/cookbook/Makefile.am | 2 +
5484 doc/cookbook/examples/.gitignore | 4 +-
5485 doc/cookbook/examples/Makefile.am | 16 ++-
5486 doc/cookbook/examples/smiley.png | Bin 0 -> 2856 bytes
5487 doc/cookbook/examples/textures-split-go.c | 184 ++++++++++++++++++++++++++
5488 doc/cookbook/examples/textures-sub-texture.c | 60 +++++++++
5489 doc/cookbook/images/textures-sub-texture.png | Bin 0 -> 4664 bytes
5490 doc/cookbook/textures.xml | 136 +++++++++++++++++++
5491 doc/cookbook/videos/textures-split-go.ogv | Bin 0 -> 89625 bytes
5492 9 files changed, 394 insertions(+), 8 deletions(-)
5494 commit ad1f1cb741203f64d97d093981f1e58907ee8e96
5495 Author: Damien Lespiau <damien.lespiau@intel.com>
5496 Date: Thu Aug 5 19:50:29 2010 +0100
5498 cookbook: Strip leading and trailing space inside programlisting
5500 It's a XSL FAQ to be able to chomp text nodes and we just have to copy
5501 and paste a XSLT 1.0 solution from:
5502 http://dpawson.co.uk/xsl/sect2/N8321.html#d11325e833
5504 Let's then empower our cookbook customization layer to chomp text nodes,
5505 children of programlisting.
5507 doc/common/cookbook.xsl | 79 +++++++++++++++++++++++++++++++++++++++++++++++
5508 1 file changed, 79 insertions(+)
5510 commit c0c9ddab65a47404c0e6c5aa3a94c8a235c6d0ff
5511 Author: Damien Lespiau <damien.lespiau@intel.com>
5512 Date: Tue Aug 3 22:26:14 2010 +0100
5514 cookbook: Add text.xml to the list of XML files
5516 text.xml was feeling lonely and forgotten, that's fixed now.
5518 doc/cookbook/Makefile.am | 1 +
5519 1 file changed, 1 insertion(+)
5521 commit b4f4942e07cd2d7f5ad6e235fadb8ed2cf45f48d
5522 Author: Damien Lespiau <damien.lespiau@intel.com>
5523 Date: Tue Aug 3 21:02:23 2010 +0100
5525 cookbook: Add the source XML files as dependencies in the Makefile rules
5527 The generated cookbook files (either HTML or PDF) do not only depend on
5528 clutter-cookbok.xml but also on all the chapters that compose the
5529 cookbook. Add this dependency to the Makefile rules to have make rebuild
5530 the book when a chapter changes.
5532 Since XML_FILES is now the list of source files, move recipe-template.xml
5535 doc/cookbook/Makefile.am | 6 +++---
5536 1 file changed, 3 insertions(+), 3 deletions(-)
5538 commit 8ac3cb29ea6a04f434887c4e7a441ae4a4e67729
5539 Author: Robert Bragg <robert@linux.intel.com>
5540 Date: Fri Aug 6 14:12:22 2010 +0100
5542 material: only deference layer->texture for authority
5544 In _cogl_material_layer_pre_paint we were mistakenly dereferencing the
5545 layer->texture member for the passed layer instead of dereferencing the
5546 texture state authority which was causing crashes in some cases.
5548 clutter/cogl/cogl/cogl-material.c | 2 +-
5549 1 file changed, 1 insertion(+), 1 deletion(-)
5551 commit 069266f3ed911dd8de69066c5d50a4befca468a8
5552 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5553 Date: Thu Aug 5 18:10:22 2010 +0100
5555 layout-manager: Freeze ::layout-changed when creating LayoutMeta
5557 LayoutMeta instances are created lazily. If an actor is added to a
5558 container with a layout manager then the first time the layout manager
5559 might be creating the LayoutMeta instance could be during the allocation
5560 cycle caused by calling clutter_actor_show(). When a LayoutMeta is
5561 instantiated for the first time, a list of properties can be set - and
5562 this might lead to the emission of the ::layout-changed signal. The
5563 signal is, most typically, going to cause a relayout to be queued, and a
5564 warning will be printed on the terminal.
5566 We should freeze the emission of the ::layout-changed signal during the
5567 creation of the LayoutMeta instances, and thaw it after that.
5569 clutter/clutter-layout-manager.c | 62 ++++++++++++++++++++++++++++++++++++--
5570 1 file changed, 59 insertions(+), 3 deletions(-)
5572 commit e7381c47fdaae7d52f9e1e7a1c48d7ecadeae503
5573 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5574 Date: Thu Aug 5 17:22:50 2010 +0100
5576 bin-layout: Add a text to the test
5578 We have a rectangle, a cairo texture and a texture. Let's go add a text
5581 tests/interactive/test-bin-layout.c | 10 +++++++++-
5582 1 file changed, 9 insertions(+), 1 deletion(-)
5584 commit 315965290b23900e01840a2e6ef1cff17d222969
5585 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5586 Date: Thu Aug 5 16:19:51 2010 +0100
5588 texture: Update the request mode depending on the size
5590 If a Texture has been set to:
5592 • keep its size synchronized with the image data
5593 • maintain the aspect ratio of the image data
5595 then it should also change its request mode depending on the orientation
5596 of the image data, so that layout managers have a fighting chance of
5597 sizing it correctly.
5599 clutter/clutter-texture.c | 25 ++++++++++++++++++++++++-
5600 1 file changed, 24 insertions(+), 1 deletion(-)
5602 commit 2d4125a053b73acc1c037f02bbf1c52bcb6b0a41
5603 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5604 Date: Thu Aug 5 15:29:54 2010 +0100
5606 texture: Make the :filename property readable
5608 UI builders and other tools are be interested in the file used to load
5612 clutter/clutter-texture.c | 44 ++++++++++++++++++++++++++++++++++++--------
5613 2 files changed, 42 insertions(+), 9 deletions(-)
5615 commit 70303d6f0cbaaddc06be43ce3f3b0b2b79eaa604
5616 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5617 Date: Thu Aug 5 13:06:38 2010 +0100
5619 Post-release version bump to 1.3.11
5622 1 file changed, 1 insertion(+), 1 deletion(-)
5624 commit 177d8e52d3823cd0af8fd0b7ab9bb4a7d67c27a8
5625 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5626 Date: Wed Aug 4 12:38:53 2010 +0100
5630 NEWS | 46 ++++++++++++++++++++++++++++++++++++++++++++++
5632 2 files changed, 47 insertions(+), 1 deletion(-)
5634 commit 8668a019a0bde8a078f999cd5b960a1f63f700ec
5635 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5636 Date: Thu Aug 5 11:41:25 2010 +0100
5638 cookbook: Fix the text-shadow recipe
5640 Fill out the recipe and add more comments to the example code.
5642 doc/cookbook/examples/text-shadow.c | 10 +++--
5643 doc/cookbook/text.xml | 71 +++++++++++++++++++++++++++++++++++
5644 2 files changed, 78 insertions(+), 3 deletions(-)
5646 commit ea3af7bf334aa2949e9320d54f1a329e599fa587
5647 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5648 Date: Wed Aug 4 12:47:16 2010 +0100
5650 po: Remove the requirement for LINGUAS and ChangeLog
5652 We don't use ChangeLogs and the LINGUAS file is replaced by the
5653 AS_ALL_LINGUAS m4 macro.
5655 po/Makefile.in.in | 2 +-
5656 1 file changed, 1 insertion(+), 1 deletion(-)
5658 commit 8326ea26f82dcb756e4717f5ed6b80ea8582b9f1
5659 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5660 Date: Tue Aug 3 21:12:12 2010 +0700
5662 osx: Fixed stage resize policy
5664 Added initialization of minimum window size property on Cocoa
5665 side. This property works when user change window size by mouse
5666 dragging. But when size is changed by clutter_actor_set_size this
5667 property will not help and was added another check in
5668 clutter_stage_osx_resize. Also osx_get_geometry was refactoried
5669 because it returns incorrect values in many cases but now size is
5670 saved in [Window reshape] in requisition_width/height and this value
5671 will be returned in any case to frontend.
5673 clutter/osx/clutter-stage-osx.c | 71 ++++++++++++++++++++-------------------
5674 1 file changed, 36 insertions(+), 35 deletions(-)
5676 commit c1f0b59911fdc6096f070108d100ff14c2e25b29
5677 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5678 Date: Wed Aug 4 12:08:50 2010 +0700
5680 test: Fixed test-rotate for osx platfom
5682 There was a bug in clutter-shader-effect. We have to set to zero new object
5683 of type GValue before we can use it in g_value_init.
5685 clutter/clutter-shader-effect.c | 1 +
5686 1 file changed, 1 insertion(+)
5688 commit 52b6a3cd49c4fd654bde0a03b8e57156e731076f
5689 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5690 Date: Thu Jul 29 21:59:46 2010 +0700
5692 osx: added resolution initialization in backend
5694 It's important step of initialization because all features calls from
5695 font rendering libs based on this parameter. By default it equals to
5696 -1 and test-text-cache test crashes in this case.
5698 clutter/osx/clutter-backend-osx.c | 14 +++++++++++++-
5699 1 file changed, 13 insertions(+), 1 deletion(-)
5701 commit dc23b88de25d24b5b8efaf6ae7e84f3237c175eb
5702 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5703 Date: Sat Jul 24 11:54:19 2010 +0700
5705 osx: Fixed warnings in osx event implementation
5707 clutter/osx/clutter-event-osx.c | 14 +++++++-------
5708 1 file changed, 7 insertions(+), 7 deletions(-)
5710 commit af8308295c95c8bef3538af85d308e7807a8ab22
5711 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5712 Date: Fri Jul 23 12:16:23 2010 +0700
5714 Added willResize delegate for osx stage.
5716 By default a clutter stage is not user resizable and this delegate
5717 controls this option while resizing the stage.
5719 clutter/osx/clutter-stage-osx.c | 8 ++++++++
5720 1 file changed, 8 insertions(+)
5722 commit 49b2b623118ab961c6ce15d7f26972391b9075e1
5723 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5724 Date: Fri Jul 23 11:25:40 2010 +0700
5726 Fixed lack of reaction for keyboard events after showing stage on osx.
5728 Trick with hiding view while showing the stage affects on responder
5729 chain. The main view ceases to be first responder and we should
5730 manually set first responder.
5732 clutter/osx/clutter-stage-osx.c | 8 +++++---
5733 1 file changed, 5 insertions(+), 3 deletions(-)
5735 commit e4c4ef679254b6407133333f9572442444709845
5736 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5737 Date: Thu Jul 22 13:51:37 2010 +0700
5739 Fixed incorrect size return in osx stage if stage resizable by user.
5741 For some reasons width&height was equal to 1 if flag user-resizable
5744 clutter/osx/clutter-stage-osx.c | 10 ----------
5745 1 file changed, 10 deletions(-)
5747 commit 411b5a09bb11d2b8831d676298d4632ab47ecd21
5748 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5749 Date: Wed Jul 21 23:22:57 2010 +0700
5751 osx: Added size initialization for stage
5753 After stage creation it's size can be changed by user and it should be
5754 taken into account in clutter_stage_osx_realize.
5756 clutter/osx/clutter-stage-osx.c | 12 +++++++++++-
5757 1 file changed, 11 insertions(+), 1 deletion(-)
5759 commit 5218da748f7d5c95d3aeff18c51f54361398748f
5760 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5761 Date: Mon Jul 19 22:53:49 2010 +0700
5763 test: fixed uninitialized variable in test-cogl-point-sprites
5765 tests/interactive/test-cogl-point-sprites.c | 2 +-
5766 1 file changed, 1 insertion(+), 1 deletion(-)
5768 commit 8e2b45648f14debe0039cfd32dddcf262b7f15ce
5769 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5770 Date: Mon Jul 19 20:46:55 2010 +0700
5772 osx: Fixed problem with freezing application while checking behaviour.
5774 Problem was in incorrect application initialization.
5775 [NSApplication sharedApplication] should be call in backend init(not
5776 in init stage). It doesn't require any data and only makes a
5777 connection to window server.
5779 clutter/osx/clutter-backend-osx.c | 13 +++++++++++++
5780 clutter/osx/clutter-stage-osx.c | 13 -------------
5781 2 files changed, 13 insertions(+), 13 deletions(-)
5783 commit 8c69a639cbe39c3b006555c816f325b0cdb4b874
5784 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5785 Date: Fri Jul 16 19:46:17 2010 +0700
5787 osx: Fixed bug with creating context twice.
5789 We should assign context and pixel_format vars to null to avoid
5790 multiple context creation.
5792 clutter/osx/clutter-backend-osx.c | 51 ++++++++++++++++++++-----------------
5793 1 file changed, 27 insertions(+), 24 deletions(-)
5795 commit 50793eac51d541648e023455f9d0cc94e8519423
5796 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5797 Date: Fri Jul 16 19:19:13 2010 +0700
5799 osx: added create_context function in backend
5801 Cleanup clutter_backend_osx_post_parse function and move context
5802 initialization to clutter_backend_osx_create_context. The OpenGL pixel
5803 format attributes were taken as is. Also move bringing application to
5804 foreground in clutter_stage_osx_realize, it seems there is best place
5807 clutter/osx/clutter-backend-osx.c | 92 +++++++++++++++----------------------
5808 clutter/osx/clutter-stage-osx.c | 13 ++++++
5809 2 files changed, 50 insertions(+), 55 deletions(-)
5811 commit 904f619419b414e5de86b4bca5cd0f811ef02c87
5812 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5813 Date: Thu Jul 15 19:04:28 2010 +0700
5815 osx: Implemented hide cursor backend implementation
5817 Add implementation for hide cursor in stage. Also added using this
5818 feature in test-animator.
5820 clutter/osx/clutter-stage-osx.c | 5 ++++-
5821 tests/interactive/test-animator.c | 2 +-
5822 2 files changed, 5 insertions(+), 2 deletions(-)
5824 commit f22b6a442cb901439d4b590b4f7a6bca4577b116
5825 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5826 Date: Thu Jul 15 16:32:59 2010 +0700
5828 Added .DS_Store and test logs messages to git ignore
5831 1 file changed, 2 insertions(+)
5833 commit 12e50114883c21a2f9a0db48e53020532dffa936
5834 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5835 Date: Thu Jul 15 16:27:16 2010 +0700
5837 osx: Added missed function declaration for stage
5839 Added empty functions for cursor and window resize functional with
5840 notes FIXME and also they are added to iface.
5842 clutter/osx/clutter-stage-osx.c | 15 +++++++++++++++
5843 1 file changed, 15 insertions(+)
5845 commit 01c9570d168bced1e9055f66016a875bcd86b81d
5846 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5847 Date: Thu Jul 15 16:00:29 2010 +0700
5849 osx: Remove drawing call while showing stage and add viewport init
5851 Viewport didn't initialized before OGL drawing and it causes crash on
5852 assert so added viewport initalization to
5853 clutter_stage_osx_realize. Also showing the stage causes drawing
5854 function but other part of the system(in particular conformance tests)
5855 don't expect it and aren't ready at this moment.
5857 clutter/osx/clutter-stage-osx.c | 13 ++++++++++++-
5858 1 file changed, 12 insertions(+), 1 deletion(-)
5860 commit e3295050f59bcc026b8f0648e2ad2935d9911aed
5861 Author: Roman Kudiyarov <rkudiyarov@crystalnix.com>
5862 Date: Thu Jul 15 15:46:04 2010 +0700
5864 osx: Fixed crash while features initialization
5866 Clearing current context couses incorrect work of glGetString function
5867 and all next GL functions that use it work incorrectly.
5869 clutter/osx/clutter-backend-osx.c | 1 -
5870 1 file changed, 1 deletion(-)
5872 commit 24d1142ecf03cdeefb4b07cb4ac372d2f2b6b1bf
5873 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5874 Date: Tue Aug 3 17:53:58 2010 +0100
5876 glx: Add more debugging notes
5878 Should help debug the GLX visual selection.
5880 clutter/glx/clutter-backend-glx.c | 10 ++++++----
5881 1 file changed, 6 insertions(+), 4 deletions(-)
5883 commit fa54b7c60d52aaf75b1691586c9171b77280ae15
5884 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5885 Date: Tue Aug 3 16:48:53 2010 +0100
5887 docs: Further clarifications
5889 Mention the XFixes extension for compositors using input regions to let
5890 events "pass through" the stage.
5892 Thanks to: Robert Bragg <robert@linux.intel.com>
5894 clutter/x11/clutter-backend-x11.c | 6 ++++--
5895 1 file changed, 4 insertions(+), 2 deletions(-)
5897 commit da6b2660ba423924b5fd164fff3a5e05ca206971
5898 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5899 Date: Tue Aug 3 16:30:04 2010 +0100
5901 docs: Clarify the event retrieval disable behaviour
5903 When we disable the event retrieval, we now just disable the X11 event
5904 source, not the event selection. We need to make that clear to
5905 applications, especially compositors, which might expect complete
5906 control over the selection.
5908 clutter/x11/clutter-backend-x11.c | 14 +++++++++++---
5909 1 file changed, 11 insertions(+), 3 deletions(-)
5911 commit 609560b1cb44f4d209de810cc9b94d8d49ba2db5
5912 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5913 Date: Tue Aug 3 16:11:52 2010 +0100
5915 glx: Unconditionally select X11/GLX events
5917 Currently, we select input events and GLX events conditionally,
5918 depending on whether the user has disabled event retrieval.
5920 We should, instead, unconditionally select input events even with event
5921 retrieval disabled because we need to guarantee that the Clutter
5922 internal state is maintained when calling clutter_x11_handle_event()
5923 without requiring applications or embedding toolkits to select events
5924 themselves. If we did that, we'd have to document the events to be
5925 selected, and also update applications and embedding toolkits each time
5926 we added a new mask, or a new class of events - something that's clearly
5931 http://bugzilla.clutter-project.org/show_bug.cgi?id=998
5933 for the rationale of why we did conditional selection. It is now clear
5934 that a compositor should clear out the input region, since it cannot
5935 assume a perfectly clean slate coming from us.
5939 http://bugzilla.clutter-project.org/show_bug.cgi?id=2228
5941 for an example of things that break if we do conditional event
5942 selection on GLX events. In that specific case, the X11 server ≤ 1.8
5943 always pushed GLX events on the queue, even without selecting them; this
5944 has been fixed in the X11 server ≥ 1.9, which means that applications
5945 like Mutter or toolkit integration libraries like Clutter-GTK would stop
5946 working on recent Intel drivers providing the GLX_INTEL_swap_event
5949 This change has been tested with Mutter and Clutter-GTK.
5951 clutter/glx/clutter-stage-glx.c | 84 ++++++++++++++++++++++++---------------
5952 1 file changed, 52 insertions(+), 32 deletions(-)
5954 commit 142f288986dba5cdeef2fa2e24fd019ce61fa5b0
5955 Merge: 10c5cb1 7ed3517
5956 Author: Emmanuele Bassi <ebassi@linux.intel.com>
5957 Date: Tue Aug 3 15:44:46 2010 +0100
5959 Merge remote branch 'elliot/cookbook-animations-rotating'
5961 * elliot/cookbook-animations-rotating:
5962 cookbook: Added recipe for animated rotation of an actor
5963 cookbook: Add explanation about including code samples
5964 cookbook: Make filename used in video example consistent
5965 cookbook: Add example code for animated rotation
5967 commit 10c5cb1800da3bdaf116197a096bf6396efa465f
5968 Author: Robert Bragg <robert@linux.intel.com>
5969 Date: Fri Jul 23 10:12:39 2010 +0100
5971 cogl-program: gles2: bind programs lazily as for GL
5973 This makes the gles2 cogl_program_use consistent with the GL version by
5974 not binding the program immediately and instead leaving it to
5975 cogl-material.c to bind the program when actually drawing something.
5977 clutter/cogl/cogl/cogl-material-glsl.c | 3 --
5978 clutter/cogl/cogl/cogl-material-opengl-private.h | 2 +-
5979 clutter/cogl/cogl/cogl-material-opengl.c | 34 +++++++++++++---------
5980 clutter/cogl/cogl/driver/gl/cogl-program.c | 10 +++----
5981 clutter/cogl/cogl/driver/gles/cogl-program.c | 3 --
5982 5 files changed, 26 insertions(+), 26 deletions(-)
5984 commit 4a9321b60cd443bec065bbc8a1c96bb38f8dab1e
5985 Author: Robert Bragg <robert@linux.intel.com>
5986 Date: Tue Jun 8 23:06:50 2010 +0100
5988 gles2: Have CoglProgram track uniforms per program
5990 Previously custom uniforms were tracked in _CoglGles2Wrapper but as part
5991 of a process to consolidate the gl/gles2 shader code it seems to make
5992 sense for this state to be tracked in the CoglProgram object instead.
5994 http://bugzilla.o-hand.com/show_bug.cgi?id=2179
5996 clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 41 ++++++++++----------
5997 clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h | 11 +++---
5998 clutter/cogl/cogl/driver/gles/cogl-program.c | 38 +++++++++++-------
5999 clutter/cogl/cogl/driver/gles/cogl-program.h | 11 +++++-
6000 4 files changed, 61 insertions(+), 40 deletions(-)
6002 commit c26f4ffa228d40e8ef73c075d6e6003d9fcfde5b
6003 Author: Robert Bragg <robert@linux.intel.com>
6004 Date: Mon Aug 2 21:40:55 2010 +0100
6006 cogl-shader: unifies the driver/{gl,gles} shader files
6008 The per driver implementations of cogl-shader.c had become almost
6009 identical we now have a single cogl/cogl-shader.c instead.
6011 clutter/cogl/cogl/Makefile.am | 2 +
6012 clutter/cogl/cogl/cogl-shader-private.h | 40 ++++
6013 clutter/cogl/cogl/cogl-shader.c | 235 ++++++++++++++++++++
6014 clutter/cogl/cogl/driver/gl/Makefile.am | 2 -
6015 clutter/cogl/cogl/driver/gl/cogl-shader-private.h | 40 ----
6016 clutter/cogl/cogl/driver/gl/cogl-shader.c | 169 --------------
6017 clutter/cogl/cogl/driver/gles/Makefile.am | 2 -
6018 .../cogl/cogl/driver/gles/cogl-shader-private.h | 40 ----
6019 clutter/cogl/cogl/driver/gles/cogl-shader.c | 214 ------------------
6020 9 files changed, 277 insertions(+), 467 deletions(-)
6022 commit 8021d3e2ebeced1921a973b325275c3e000655a2
6023 Author: Robert Bragg <robert@linux.intel.com>
6024 Date: Fri Jul 23 17:44:53 2010 +0100
6026 cogl-shader: Store the CoglShaderType in CoglShader
6028 Instead of having to query GL and translate the GL enum into a
6029 CoglShaderType each time cogl_shader_get_type is called we now keep
6030 track of the type in CoglShader.
6032 clutter/cogl/cogl/driver/gl/cogl-shader-private.h | 1 +
6033 clutter/cogl/cogl/driver/gl/cogl-shader.c | 14 ++------------
6034 clutter/cogl/cogl/driver/gles/cogl-shader.c | 13 +------------
6035 3 files changed, 4 insertions(+), 24 deletions(-)
6037 commit 467c33a3e37904cb29ea596caff6c70ae5eb503a
6038 Author: Robert Bragg <robert@linux.intel.com>
6039 Date: Sun Jul 25 21:36:41 2010 +0100
6041 cogl: don't include cogl-debug.h in cogl.h or install
6043 cogl-debug.h is an internal header so it shouldn't have been included by
6044 cogl.h and the header shouldn't be installed either.
6046 clutter/cogl/cogl/Makefile.am | 2 +-
6047 clutter/cogl/cogl/cogl-atlas-texture.c | 1 +
6048 clutter/cogl/cogl/cogl-bitmap.c | 1 +
6049 clutter/cogl/cogl/cogl-framebuffer.c | 1 +
6050 clutter/cogl/cogl/cogl-journal.c | 1 +
6051 clutter/cogl/cogl/cogl-material-arbfp.c | 1 +
6052 clutter/cogl/cogl/cogl-material-opengl.c | 1 +
6053 clutter/cogl/cogl/cogl-material.c | 1 +
6054 clutter/cogl/cogl/cogl-matrix.c | 1 +
6055 clutter/cogl/cogl/cogl-primitives.c | 1 +
6056 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 1 +
6057 clutter/cogl/cogl/cogl.h | 1 -
6058 clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 1 +
6059 clutter/cogl/pango/cogl-pango-render.c | 1 +
6060 14 files changed, 13 insertions(+), 2 deletions(-)
6062 commit 8b914dfa307ef2e0b84ff7dc1632cb6ae29e7c3e
6063 Author: Robert Bragg <robert@linux.intel.com>
6064 Date: Fri Jul 23 21:37:22 2010 +0100
6066 configure.ac: when checking for gl2ext.h include gl2.h
6068 This makes sure we include gl2.h when looking for gl2ext.h since
6069 gl2ext.h can't always be used standalone.
6071 configure.ac | 4 +++-
6072 1 file changed, 3 insertions(+), 1 deletion(-)
6074 commit c23b28396866cfcffa64e16d3d55075be04e0d4e
6075 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6076 Date: Sat Jul 31 10:40:21 2010 +0100
6078 animatable: Allow passing a NULL animation
6080 The Animatable interface was created specifically for the Animation
6081 class. It turns out that it might be fairly useful to others - such as
6082 ClutterAnimator and ClutterState.
6084 The newly-added API in this cycle for querying and accessing custom
6085 properties should not require that we pass a ClutterAnimation to the
6086 implementations: the Animatable itself should be enough.
6088 This is necessary to allow language bindings to wrap
6089 clutter_actor_animate() correctly and do type validation and
6090 demarshalling between native values and GValues; an Animation instance
6091 is not available until the animate() call returns, and validation must
6092 be performed before that happens.
6094 There is nothing we can do about the animate_property() virtual
6095 function - but in that case we might want to be able to access the
6096 animation from an Animatable implementation to get the Interval for
6097 the property, just like ClutterActor does in order to animate
6098 ClutterActorMeta objects.
6100 clutter/clutter-actor.c | 3 ---
6101 clutter/clutter-animatable.c | 15 +++------------
6102 clutter/clutter-animatable.h | 6 ------
6103 clutter/clutter-animation.c | 24 +++++-------------------
6104 4 files changed, 8 insertions(+), 40 deletions(-)
6106 commit c65c0f08d8ea6532f873b09d45033a7e546e05be
6107 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6108 Date: Sat Jul 31 10:39:53 2010 +0100
6110 docs: Fix the BindConstraint example
6112 A constraint was created but not added to the actor.
6114 clutter/clutter-bind-constraint.c | 1 +
6115 1 file changed, 1 insertion(+)
6117 commit 00eb71b89a09efe4ccb44e55bdff7d2e4da4d26b
6118 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6119 Date: Fri Jul 30 19:39:35 2010 +0100
6121 conform: Move the Score test to the conformance suite
6123 The interactive test for ClutterScore is really meant to be run as part
6124 of the conformance test suite, so we should move it there.
6126 tests/conform/.gitignore | 1 +
6127 tests/conform/Makefile.am | 1 +
6128 tests/conform/test-conform-main.c | 2 +
6129 tests/conform/test-score.c | 119 ++++++++++++++++++++++++++++++++++
6130 tests/interactive/.gitignore | 1 -
6131 tests/interactive/Makefile.am | 1 -
6132 tests/interactive/test-score.c | 127 -------------------------------------
6133 7 files changed, 123 insertions(+), 129 deletions(-)
6135 commit a20a509584c8f8982b6f2f5daf92d882f99e6d02
6136 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6137 Date: Thu Jul 29 17:18:25 2010 +0100
6139 x11: Split out conditions and warnings
6141 XGetGeometry is a great piece of API, since it gets a lot of stuff that
6142 are moderately *not* geometry related - the root window, and the depth
6145 Since we have multiple conditions depending on the result of that call
6146 we should split them up depending on the actual error - and each of them
6147 should have a separate error message. This makes debugging simpler.
6149 clutter/x11/clutter-stage-x11.c | 24 +++++++++++++++++++-----
6150 1 file changed, 19 insertions(+), 5 deletions(-)
6152 commit 0736cb73230c6f2e39b7186770f7405f4dda228e
6153 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6154 Date: Thu Jul 29 17:00:24 2010 +0100
6156 actor: Make set_flags() safe from unrefs
6158 It's possible - though not recommended - that user code causes the
6159 destruction of an actor in one of the notification handlers for
6160 flag-based properties. We should protect the multiple notification
6161 emission with g_object_ref/unref.
6163 clutter/clutter-actor.c | 2 ++
6164 1 file changed, 2 insertions(+)
6166 commit 6f737a5f5a107cc728a9be59d79e9213dfffd026
6167 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6168 Date: Thu Jul 29 16:58:37 2010 +0100
6172 The 0.6.14 is the last 0.6 release, before the format changes; we build
6173 with both 0.6 and 0.9, so we should depend to the former and not the
6177 1 file changed, 1 insertion(+), 1 deletion(-)
6179 commit 7ed3517504754216304607136450ef8b718597f7
6180 Author: Elliot Smith <elliot.smith@intel.com>
6181 Date: Wed Jul 21 14:50:32 2010 +0100
6183 cookbook: Added recipe for animated rotation of an actor
6185 New recipe covering how to animate rotation of
6186 an actor (in all axes).
6188 Covers various factors affecting rotation animation
6189 (like orientation of axes, parent rotation/orientation),
6190 as well as trying to make rotations easier to visualise
6191 (e.g. describing how rotation direction is affected by
6192 those factors, how a rotation can be expected to look
6193 when animated). Uses implicit animations for code examples.
6195 Also refers to a full code example which uses ClutterState.
6197 doc/cookbook/Makefile.am | 9 +
6198 doc/cookbook/animations.xml | 510 +++++++++++++++++++-
6199 ...tions-rotating-container-reverses-direction.ogv | Bin 0 -> 204262 bytes
6200 .../videos/animations-rotating-x-centered.ogv | Bin 0 -> 154165 bytes
6201 ...ations-rotating-x-minus-180-with-y-minus-96.ogv | Bin 0 -> 39584 bytes
6202 ...ations-rotating-x-minus-180-with-z-minus-96.ogv | Bin 0 -> 31171 bytes
6203 .../videos/animations-rotating-x-minus-45.ogv | Bin 0 -> 30059 bytes
6204 doc/cookbook/videos/animations-rotating-y-45.ogv | Bin 0 -> 34009 bytes
6205 .../videos/animations-rotating-y-centered.ogv | Bin 0 -> 150864 bytes
6206 doc/cookbook/videos/animations-rotating-z-90.ogv | Bin 0 -> 53592 bytes
6207 .../videos/animations-rotating-z-centered.ogv | Bin 0 -> 200166 bytes
6208 11 files changed, 517 insertions(+), 2 deletions(-)
6210 commit 94fcbafe18b2e7079c79dde393de4b25fad02456
6211 Author: Elliot Smith <elliot.smith@intel.com>
6212 Date: Wed Jul 21 15:44:16 2010 +0100
6214 cookbook: Add explanation about including code samples
6216 Updated the "Contributing" section to explain how to include
6217 a full code sample at the end of a recipe.
6219 doc/cookbook/clutter-cookbook.xml.in | 95 ++++++++++++++++++++++++++++++++++
6220 1 file changed, 95 insertions(+)
6222 commit 9e29aac49a64adc3d1edcf54a473bbe2b074b98a
6223 Author: Elliot Smith <elliot.smith@intel.com>
6224 Date: Wed Jul 21 14:42:31 2010 +0100
6226 cookbook: Make filename used in video example consistent
6228 Fixed video filename in sample markup to match the
6229 guidelines given in the "Contributing" section.
6231 doc/cookbook/clutter-cookbook.xml.in | 2 +-
6232 1 file changed, 1 insertion(+), 1 deletion(-)
6234 commit 12ffe70a86440e04752d8dd18a1b8bc984a4e02b
6235 Author: Elliot Smith <elliot.smith@intel.com>
6236 Date: Wed Jul 21 12:51:47 2010 +0100
6238 cookbook: Add example code for animated rotation
6240 Add example code demonstrating how to rotate in the x,y,z
6241 axes using ClutterState. Integrated with build.
6243 doc/cookbook/examples/.gitignore | 1 +
6244 doc/cookbook/examples/Makefile.am | 3 +
6245 doc/cookbook/examples/animations-rotating.c | 136 +++++++++++++++++++++++++++
6246 3 files changed, 140 insertions(+)
6248 commit 385ac8e1811c1ca485ed129d96b8368d48955748
6249 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6250 Date: Fri Jul 23 12:42:55 2010 +0100
6252 modules: Bump cairo to 1.9.12
6256 build/clutter.modules | 25 ++++++++++++++++++++++---
6257 1 file changed, 22 insertions(+), 3 deletions(-)
6259 commit 3d806f498f1c4a02b2a166bdd5e124e7e11239cd
6260 Author: Øyvind Kolås <pippin@linux.intel.com>
6261 Date: Fri Jul 23 12:16:37 2010 +0100
6263 effect: fix conversion from degrees to radians
6265 clutter/clutter-page-turn-effect.c | 2 +-
6266 1 file changed, 1 insertion(+), 1 deletion(-)
6268 commit ec26466cdce5b701af7c82bce4588cb6f2e3180c
6269 Author: Neil Roberts <neil@linux.intel.com>
6270 Date: Wed Jul 14 19:39:24 2010 +0100
6272 gles/cogl-shader.c: Store the shader type in CoglShader
6274 Nothing was storing the shader type when a shader was created so it
6275 would get confused about whether it was a custom vertex or fragment
6278 Also the 'type' member of CoglShader was a GLenum but the only place
6279 that read it was treating it as if it was CoglShaderType. This changes
6280 it be CoglShaderType.
6282 clutter/cogl/cogl/driver/gles/cogl-shader-private.h | 2 +-
6283 clutter/cogl/cogl/driver/gles/cogl-shader.c | 1 +
6284 2 files changed, 2 insertions(+), 1 deletion(-)
6286 commit 616eccdad63ce35d5ce59094cf026970b799cf09
6287 Author: Neil Roberts <neil@linux.intel.com>
6288 Date: Thu Jul 22 17:27:04 2010 +0100
6290 test-shader: Unref the ClutterShader after setting it on an actor
6292 Otherwise the test leaks the shader object and the underlying GLSL
6295 tests/interactive/test-shader.c | 4 ++++
6296 1 file changed, 4 insertions(+)
6298 commit a639ed6593fa64c83bc4c462d9c3eac9bf543485
6299 Author: Neil Roberts <neil@linux.intel.com>
6300 Date: Thu Jul 22 16:58:23 2010 +0100
6302 Plug the leaking CoglProgram and CoglShader
6304 _cogl_program_free and _cogl_shader_free never freed the struct their
6305 structs so it would end up leaking a little bit.
6307 clutter/cogl/cogl/driver/gl/cogl-program.c | 2 ++
6308 clutter/cogl/cogl/driver/gl/cogl-shader.c | 2 ++
6309 clutter/cogl/cogl/driver/gles/cogl-program.c | 2 ++
6310 clutter/cogl/cogl/driver/gles/cogl-shader.c | 2 ++
6311 4 files changed, 8 insertions(+)
6313 commit f17717717ab3266676053bc020f45b6bacdcee0f
6314 Author: Neil Roberts <neil@linux.intel.com>
6315 Date: Thu Jul 22 16:14:59 2010 +0100
6317 configure.ac: Fix the missing COGL_HAS_GLES[12] defines
6319 In 7fae8ac051 the two cogl-defines.h files from GLES and GL were
6320 unified. However this missed out the COGL_HAS_GLES[12] defines from
6321 GLES. The configure.ac still made an AC_SUBST for the right version
6322 but the replacement was never put in any headers. This fixes it so
6323 that instead of directly calling AC_SUBST the value is now put into a
6324 variable which later gets added to COGL_DEFINES so that it will end up
6327 configure.ac | 12 ++++++++----
6328 1 file changed, 8 insertions(+), 4 deletions(-)
6330 commit d87b34f98283797a13e983f37ef9dd9f43407602
6331 Author: Neil Roberts <neil@linux.intel.com>
6332 Date: Thu Jul 22 16:12:46 2010 +0100
6334 Fix a small typo in configure.ac for the COGL_DEFINES variable
6336 There was an initializer for the COGL_DEFINES variable which sets it
6337 to the empty value before it is filled in. The name of the variable
6338 wasn't spelt right so it wouldn't work properly. This doesn't really
6339 matter because it would default to empty anyway.
6342 1 file changed, 1 insertion(+), 1 deletion(-)
6344 commit a1c74209795c341dc89dbe2f6c3a91242a8c813c
6345 Author: Neil Roberts <neil@linux.intel.com>
6346 Date: Thu Jul 15 17:10:31 2010 +0100
6348 test-shader: The tex_coord varying is now an array under GLES2
6350 Since the GLES2 wrapper grew support for multi-texturing, the
6351 tex_coord varying variable defined in the vertex shader is actually an
6352 array of texture coordinates so it ought to match in the fragment
6353 shader in test-shader. This seemed to work anyway under Mesa/Intel but
6354 under NVidia it does not so I don't think it's safe to assume that
6355 linking a non-array varying with an array will work.
6357 tests/interactive/test-shader.c | 4 ++--
6358 1 file changed, 2 insertions(+), 2 deletions(-)
6360 commit 488e376b7e356614494bee62ed0437ea721c2447
6361 Author: Neil Roberts <neil@linux.intel.com>
6362 Date: Thu Jul 22 19:58:47 2010 +0100
6364 cogl-bitmap-pixbuf: Avoid copying the buffer in more circumstances
6366 When loading an RGB image GdkPixbuf will pad the rowstride so that the
6367 beginning of each row is aligned to 4 bytes. This was causing us to
6368 fallback to the code that copies the buffer. It is probably safe to
6369 avoid copying the buffer if we can detect that the rowstride is simply
6370 an alignment of the packed rowstride.
6372 This also changes the copying fallback code so that it uses the
6373 aligned rowstride. However it is now extremely unlikely that the
6374 fallback code would ever be used.
6376 clutter/cogl/cogl/cogl-bitmap-pixbuf.c | 33 +++++++++++++++++++++++---------
6377 1 file changed, 24 insertions(+), 9 deletions(-)
6379 commit b9295bf0e5e103c2acd4b1c14d402780e824c69a
6380 Author: Neil Roberts <neil@linux.intel.com>
6381 Date: Thu Jul 22 19:15:44 2010 +0100
6383 cogl-bitmap-pixbuf: Fix the rowstride used when copying a GdkPixbuf
6385 In commit b780413e5ae4b the GdkPixbuf loading code was changed so that
6386 if it needs to copy the pixbuf then it would tightly pack it. However
6387 it was still using the rowstride from the pixbuf so the image would
6388 end up skewed. This fixes it to use the real rowstride.
6390 http://bugzilla.clutter-project.org/show_bug.cgi?id=2235
6392 clutter/cogl/cogl/cogl-bitmap-pixbuf.c | 2 +-
6393 1 file changed, 1 insertion(+), 1 deletion(-)
6395 commit bb1b1b151e28b87071cdc064af648f8c7d26b1e9
6396 Author: Neil Roberts <neil@linux.intel.com>
6397 Date: Tue Jul 20 17:34:04 2010 +0100
6399 cogl-material: Don't map the shininess value to [0,1]
6401 In OpenGL the 'shininess' lighting parameter is floating point value
6402 limited to the range 0.0→128.0. This number is used to affect the size
6403 of the specular highlight. Cogl materials used to only accept a number
6404 between 0.0 and 1.0 which then gets multiplied by 128.0 before sending
6405 to GL. I think the assumption was that this is just a weird GL quirk
6406 so we don't expose it. However the value is used as an exponent to
6407 raise the attenuation to a power so there is no conceptual limit to
6410 This removes the mapping and changes some of the documentation.
6412 http://bugzilla.clutter-project.org/show_bug.cgi?id=2222
6414 clutter/cogl/cogl/cogl-material-opengl.c | 6 ++----
6415 clutter/cogl/cogl/cogl-material.c | 4 +++-
6416 clutter/cogl/cogl/cogl-material.h | 9 +++++----
6417 3 files changed, 10 insertions(+), 9 deletions(-)
6419 commit d76d82c88ffe8c1bdebef983716d8be77907e124
6420 Author: Neil Roberts <neil@linux.intel.com>
6421 Date: Wed Jul 21 23:22:07 2010 +0100
6423 cogl-material: Always reset the GLSL program to zero when flushing
6425 When flushing a fixed-function or arbfp material it would always call
6426 disable_glsl to try to get rid of the previous GLSL shader. This is
6427 needed even if current_use_program_type is not GLSL because if an
6428 application calls cogl_program_uniform then Cogl will have to bind the
6429 program to set the uniform. If this happens then it won't update
6430 current_use_program_type presumably because the enabled state of arbfp
6433 The problem was that disable_glsl would only select program zero when
6434 the current_use_program_type is set to GLSL which wouldn't be the case
6435 if cogl_program_uniform was called. This patch changes it to just
6436 directly call _cogl_gl_use_program_wrapper(0) instead of having a
6437 separate disable_glsl function. The current program is cached in the
6438 cogl context anyway so it shouldn't cause any extra unnecessary GL
6441 http://bugzilla.clutter-project.org/show_bug.cgi?id=2232
6443 clutter/cogl/cogl/cogl-material-opengl.c | 15 ++-------------
6444 1 file changed, 2 insertions(+), 13 deletions(-)
6446 commit ea255154f503112ee238b5c2c2b2ba1d3f77203f
6447 Author: Chris Leick <c.leick@vollbio.de>
6448 Date: Thu Jul 22 11:40:57 2010 +0100
6452 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
6454 po/de.po | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
6455 1 file changed, 104 insertions(+)
6457 commit 24b9748f0a988110dfeda660d2f20df6e14cde3d
6458 Author: Chris Kühl <chrisk@openismus.com>
6459 Date: Thu Jul 22 11:21:21 2010 +0200
6461 Fixed more set using *_get_* typos.
6463 http://bugzilla.clutter-project.org/show_bug.cgi?id=2233
6465 clutter/clutter-texture.c | 4 ++--
6466 1 file changed, 2 insertions(+), 2 deletions(-)
6468 commit 99d7d31318b44eacf8d8a64ee1bb92fc511ab8ce
6469 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6470 Date: Thu Jul 22 10:48:21 2010 +0100
6472 docs: Improve the text of X11 event-related functions
6474 We need to make sure that people disabling event handling in Clutter
6475 call clutter_x11_handle_event() to update Clutter's internal state.
6477 clutter/x11/clutter-backend-x11.c | 15 ++++++++++-----
6478 clutter/x11/clutter-event-x11.c | 8 ++++++--
6479 2 files changed, 16 insertions(+), 7 deletions(-)
6481 commit 1dee65770a7eba85c899890e652d4cf32744c71a
6482 Author: Neil Roberts <neil@linux.intel.com>
6483 Date: Thu Jul 22 10:04:06 2010 +0100
6485 Minor fix to the documentation for clutter_texture_get_sync_size
6487 The documentation was recursively referring to itself causing a stack
6488 overflow in the reader's brain.
6490 http://bugzilla.clutter-project.org/show_bug.cgi?id=2233
6492 clutter/clutter-texture.c | 2 +-
6493 1 file changed, 1 insertion(+), 1 deletion(-)
6495 commit 706f42645a3436089ad33d9d07844cc4ae202b12
6496 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6497 Date: Wed Jul 21 17:25:15 2010 +0100
6499 build: Depend on g-i 0.9.0
6501 The introspection format changed, so we should depend on the new one.
6504 1 file changed, 1 insertion(+), 1 deletion(-)
6506 commit eae4561929938057c398498267b7500796fa9d92
6507 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6508 Date: Wed Jul 21 16:10:46 2010 +0100
6510 Clean up the private flags for ClutterActor
6512 Provide macros to quickly query a flag, and remove all namespacing
6513 except the initial 'CLUTTER'.
6515 clutter/clutter-actor.c | 109 +++++++++++++++------------------
6516 clutter/clutter-backend.c | 2 +-
6517 clutter/clutter-cairo-texture.c | 2 +-
6518 clutter/clutter-main.c | 12 ++--
6519 clutter/clutter-private.h | 34 ++++++----
6520 clutter/clutter-stage.c | 16 ++---
6521 clutter/egl/clutter-backend-egl.c | 2 +-
6522 clutter/glx/clutter-backend-glx.c | 2 +-
6523 clutter/osx/clutter-stage-osx.c | 6 +-
6524 clutter/win32/clutter-backend-win32.c | 2 +-
6525 clutter/win32/clutter-stage-win32.c | 6 +-
6526 clutter/x11/clutter-event-x11.c | 2 +-
6527 clutter/x11/clutter-stage-x11.c | 8 +--
6528 13 files changed, 97 insertions(+), 106 deletions(-)
6530 commit 0dfbf010b8d4a7ca877061134e3b02c362517cc3
6531 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6532 Date: Wed Jul 21 15:21:08 2010 +0100
6534 x11: Add more checks to set_stage_foreign()
6536 Check all the pre-requisites to avoid segfaults later on.
6538 clutter/x11/clutter-stage-x11.c | 8 +++++---
6539 1 file changed, 5 insertions(+), 3 deletions(-)
6541 commit 8538e1bf586464f841f8321aa313be4a372c8159
6542 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6543 Date: Wed Jul 21 15:14:36 2010 +0100
6545 x11: Clean up TexturePixmap header and private data structure
6547 Align the header file and use bitfields instead of booleans.
6549 clutter/x11/clutter-x11-texture-pixmap.c | 22 ++++----
6550 clutter/x11/clutter-x11-texture-pixmap.h | 84 +++++++++++++++---------------
6551 2 files changed, 52 insertions(+), 54 deletions(-)
6553 commit 0e80747a684339d116e7860b26a7049320525284
6554 Author: Neil Roberts <neil@linux.intel.com>
6555 Date: Sat Jul 17 14:08:28 2010 +0100
6557 cogl-material: Consider the shader when deciding if materials equate
6559 _cogl_material_equal was ignoring the user shader state so rectangles
6560 with different shaders would get batched together.
6562 http://bugzilla.clutter-project.org/show_bug.cgi?id=2220
6564 clutter/cogl/cogl/cogl-material.c | 14 ++++++++++++++
6565 1 file changed, 14 insertions(+)
6567 commit f2d0f0ab5f120c514b82d75478aea1e17ad51ba7
6568 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6569 Date: Tue Jul 20 14:39:43 2010 +0100
6571 stage: Ignore redraws on destroyed stages
6573 We might get requests to redraw even during destruction; we should
6574 ignore them and do some NULL checks instead of blindly invoking
6577 clutter/clutter-stage.c | 7 +++++++
6578 1 file changed, 7 insertions(+)
6580 commit 7b6b2ea55b758486f7d0dbe6eb8fe0bd89610de8
6581 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6582 Date: Tue Jul 20 14:39:01 2010 +0100
6584 stage-window: Add argument guards
6586 Validate the arguments passed to StageWindow's methods.
6588 clutter/clutter-stage-window.c | 35 ++++++++++++++++++++++++++---------
6589 1 file changed, 26 insertions(+), 9 deletions(-)
6591 commit a7adfd874524bd0e4b1d61c0e1714d0037ffa70f
6592 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6593 Date: Mon Jul 19 16:03:35 2010 +0100
6595 po: Re-sync Makefile.in.in
6597 Use the one that ships with gtk+.
6599 po/Makefile.in.in | 47 +++++++++++++++--------------------------------
6600 1 file changed, 15 insertions(+), 32 deletions(-)
6602 commit e45b8be71b6f5a0e95db2b6f1d4d92fbe59d2cdc
6603 Author: Elliot Smith <elliot.smith@intel.com>
6604 Date: Mon Jul 19 12:52:00 2010 +0100
6606 cookbook: Fix key press to examine modifers correctly
6608 The simple key press example in the cookbook used a brittle
6609 and incorrect switch statement to test modifier values. Instead,
6610 use logical "&" of the state with the modifiers we're interested
6611 in to check which keys were pressed.
6613 http://bugzilla.clutter-project.org/show_bug.cgi?id=2223
6615 doc/cookbook/events.xml | 32 ++++++++++++++------------------
6616 1 file changed, 14 insertions(+), 18 deletions(-)
6618 commit 5865d2a4b393a86180a36505419f2502433ccc00
6619 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6620 Date: Sun Jul 18 22:53:56 2010 +0100
6622 cookbook: Use TESTS_DATA_DIR
6624 We need the correct location for redhand.png if we want to load it
6625 in textures-reflection.
6627 doc/cookbook/examples/textures-reflection.c | 2 +-
6628 1 file changed, 1 insertion(+), 1 deletion(-)
6630 commit dc19e26073c52fd7810a3a7f2fd98be67d2bab3e
6631 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6632 Date: Sun Jul 18 11:20:44 2010 +0100
6634 cookbook: Add image and example for text-shadow
6636 doc/cookbook/text.xml | 28 +++++++++++++++++++++++++++-
6637 1 file changed, 27 insertions(+), 1 deletion(-)
6639 commit 0dac5e0557a637099bba873abba6068f4c45cefa
6640 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6641 Date: Sun Jul 18 11:15:25 2010 +0100
6643 cookbook: Include the textures-reflection example code
6645 Add a section at the end of the recipe containing the full code of the
6648 doc/cookbook/textures.xml | 44 ++++++++++++++++++++++----------------------
6649 1 file changed, 22 insertions(+), 22 deletions(-)
6651 commit 76d8119a7fcdbd64566d8ef16f73e50b0ae28c7f
6652 Author: Neil Roberts <neil@linux.intel.com>
6653 Date: Sat Jul 17 12:40:19 2010 +0100
6655 cogl-material-arbfp: Use separate buffers when calling g_ascii_dtostr
6657 g_ascii_dtostr was being used in four separate arguments to
6658 g_string_append_printf but all invocations of it were using the same
6659 buffer. This would end up with all of the arguments having the same
6660 value which would depend on whichever order the compiler evaluates
6661 them in. This patches changes it to use a multi-dimensional array and
6662 a loop to fill in the separate buffers.
6664 http://bugzilla.clutter-project.org/show_bug.cgi?id=2219
6666 clutter/cogl/cogl/cogl-material-arbfp.c | 19 ++++++++++---------
6667 1 file changed, 10 insertions(+), 9 deletions(-)
6669 commit 90b74458d2ac8fcedea8f9dc3e28a3e9d9455bc7
6670 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6671 Date: Sun Jul 18 10:56:35 2010 +0100
6673 cookbook: Add an empty recipe for shadows under text
6675 Currently, it's just an example and an image, but it should be easy to
6676 flesh it out properly for the "Text" chapter.
6678 doc/cookbook/Makefile.am | 1 +
6679 doc/cookbook/clutter-cookbook.xml.in | 1 +
6680 doc/cookbook/examples/.gitignore | 1 +
6681 doc/cookbook/examples/Makefile.am | 3 ++
6682 doc/cookbook/examples/text-shadow.c | 59 ++++++++++++++++++++++++++++++++++
6683 doc/cookbook/images/text-shadow.png | Bin 0 -> 17618 bytes
6684 doc/cookbook/text.xml | 40 +++++++++++++++++++++++
6685 7 files changed, 105 insertions(+)
6687 commit bb3dc013bffe387dd1532df4c0469a88ef54808a
6688 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6689 Date: Sun Jul 18 10:53:06 2010 +0100
6691 cookbook: Add example code
6693 The cookbook should also include fully functional code examples. We can
6694 even XInclude them into the docbook XML itself.
6696 The examples should be built with the coobook, so that we can always
6697 make sure they are up to date.
6700 doc/cookbook/Makefile.am | 4 +
6701 doc/cookbook/examples/.gitignore | 1 +
6702 doc/cookbook/examples/Makefile.am | 28 +++++++
6703 doc/cookbook/examples/textures-reflection.c | 110 +++++++++++++++++++++++++++
6704 5 files changed, 144 insertions(+)
6706 commit 5f4f2fa3c7e95d13664e40d3e238594170df1486
6707 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6708 Date: Sat Jul 17 10:23:57 2010 +0100
6710 Add gmo files to the Git ignore list
6713 1 file changed, 1 insertion(+)
6715 commit 6983429e4a937d6c64beb427b137290e16db4527
6716 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6717 Date: Fri Jul 16 23:37:59 2010 +0100
6719 material-arbfp: Use locale-independent double to string conversion
6721 The ARBfp programs are created with a printf() wrapper, which usually
6722 fails in non-en locales as soon as you start throwing things like
6723 floating point values in the mix.
6725 We should use the g_ascii_dtostr() function which places a double into a
6726 string buffer in a locale-independent way.
6728 http://bugzilla.clutter-project.org/show_bug.cgi?id=2219
6730 clutter/cogl/cogl/cogl-material-arbfp.c | 16 +++++++++++-----
6731 1 file changed, 11 insertions(+), 5 deletions(-)
6733 commit 6f220399ae862f49f3f2aa54ec6681e159f0a934
6734 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6735 Date: Fri Jul 16 17:31:27 2010 +0100
6737 cookbook: Use the right tag for the screenshot
6739 Screenshots should be using the <screenshot> tag, not the <figure> one.
6741 doc/cookbook/textures.xml | 15 +++++++++++----
6742 1 file changed, 11 insertions(+), 4 deletions(-)
6744 commit 71dfdf92d74603d4e8fc48eeb9da4a6a051d45f3
6745 Merge: af6f023 7be6ed3
6746 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6747 Date: Fri Jul 16 17:23:36 2010 +0100
6749 Merge remote branch 'elliot/cookbook-actor-opacity'
6752 doc/cookbook/Makefile.am
6754 commit af6f023a80dd02c39f02bd0876714129809377ec
6755 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6756 Date: Fri Jul 16 17:20:38 2010 +0100
6758 cookbook: Add a missing image to the list
6760 doc/cookbook/Makefile.am | 5 ++++-
6761 1 file changed, 4 insertions(+), 1 deletion(-)
6763 commit e92c8d72cc32a7403735138e723f18ae6ecee19c
6764 Merge: ad1613a 489799b
6765 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6766 Date: Fri Jul 16 17:13:12 2010 +0100
6768 Merge remote branch 'elliot/cookbook-include-videos'
6770 * elliot/cookbook-include-videos:
6771 cookbook: Tweak so that videos sit inside a paragraph for better spacing
6772 docs: Note the P_() macro in the HACKING file
6773 cookbook: Added support for inline video
6776 doc/cookbook/Makefile.am
6778 commit ad1613a93670fcdf1ca2e44d1435cf0655776c25
6779 Merge: 4170eac da22150
6780 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6781 Date: Fri Jul 16 17:12:37 2010 +0100
6783 Merge remote branch 'elliot/cookbook-animation-fading'
6785 * elliot/cookbook-animation-fading:
6786 cookbook: Minor modification to wording to improve clarity
6787 cookbook: Added recipe for fading actors in/out
6789 commit 4170eacd94e73de1e25a648b9f0d94868af743a0
6790 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6791 Date: Fri Jul 16 17:04:31 2010 +0100
6793 cookbook: Add a recipe for texture reflection
6795 A common request: how to create a clone of a texture that looks like a
6798 doc/cookbook/images/textures-reflection.png | Bin 0 -> 23953 bytes
6799 doc/cookbook/textures.xml | 198 +++++++++++++++++++++++++++
6800 2 files changed, 198 insertions(+)
6802 commit 7be6ed3334a55b7ba89d116905a603c625866c41
6803 Author: Elliot Smith <elliot.smith@intel.com>
6804 Date: Thu Jul 15 19:47:53 2010 +0100
6806 cookbook: Added a recipe about making an actor transparent
6808 Explains how to make an actor transparent so that other actors
6809 are visible through it.
6811 Also explains a bit more generally about opacity and how
6812 it's computed from the actor, container, and color; and how actor
6813 visibility is affected by depth (fog) and depth order.
6815 doc/cookbook/Makefile.am | 5 +-
6816 doc/cookbook/actors.xml | 229 ++++++++++++++++++++
6817 .../actors-opacity-container-affects-opacity.png | Bin 0 -> 5150 bytes
6818 doc/cookbook/images/actors-opacity.png | Bin 0 -> 5029 bytes
6819 4 files changed, 233 insertions(+), 1 deletion(-)
6821 commit da2215049852e43e6ae42d4097d8a59825e31dab
6822 Author: Elliot Smith <elliot.smith@intel.com>
6823 Date: Fri Jul 16 12:48:56 2010 +0100
6825 cookbook: Minor modification to wording to improve clarity
6827 Text referred to three animation methods, but only provides
6828 examples for two of them; and in future there may be more/fewer
6829 than 3. So I reworded it.
6831 doc/cookbook/animations.xml | 2 +-
6832 1 file changed, 1 insertion(+), 1 deletion(-)
6834 commit 962b3c68857813967c3f3fc62ca87e7e3bc9cf6d
6835 Author: Elliot Smith <elliot.smith@intel.com>
6836 Date: Fri Jul 16 12:34:44 2010 +0100
6838 cookbook: Added recipe for fading actors in/out
6840 Added a recipe showing how to fade actors in/out by
6841 animating their opacity property, using both implicit
6842 animations and ClutterState.
6844 doc/cookbook/Makefile.am | 4 +
6845 doc/cookbook/animations.xml | 128 +++++++++++++++++++-
6846 .../videos/animations-fading-in-then-out.ogv | Bin 0 -> 92403 bytes
6847 doc/cookbook/videos/animations-fading-out.ogv | Bin 0 -> 64464 bytes
6848 4 files changed, 131 insertions(+), 1 deletion(-)
6850 commit 3aa3893a1100ec24f713f6ca8f4272e95b00e518
6851 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6852 Date: Fri Jul 16 12:01:42 2010 +0100
6854 docbook: Add an introduction to the texture section
6856 doc/cookbook/textures.xml | 17 ++++++++++++++---
6857 1 file changed, 14 insertions(+), 3 deletions(-)
6859 commit e3de96c2043826f50380c7b10f7f8cbf9b1f55d1
6860 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6861 Date: Fri Jul 16 11:29:28 2010 +0100
6863 po: Fix the LTR string translation
6866 1 file changed, 1 insertion(+), 1 deletion(-)
6868 commit a8595435b8b3e85b410abc46885402b8d34575b3
6869 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6870 Date: Fri Jul 16 11:23:01 2010 +0100
6872 po: Remove unused LINGUAS file
6874 The ALL_LINGUAS variable is generated from the list of po files.
6877 1 file changed, 1 deletion(-)
6879 commit ec81e8d7388c3aa8ac6d5fcbff7f72deae0abe87
6880 Author: raven <piotrdrag@gmail.com>
6881 Date: Fri Jul 16 11:18:02 2010 +0100
6885 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
6887 po/pl.po | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
6888 1 file changed, 117 insertions(+)
6890 commit 9b7579d9161d0bd120bf5154a8c281ca068e97c2
6891 Author: happyaron <happyaron.xu@gmail.com>
6892 Date: Fri Jul 16 11:17:30 2010 +0100
6894 Add zn_CN translations
6896 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
6898 po/zh_CN.po | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
6899 1 file changed, 112 insertions(+)
6901 commit 489799bb4d956c74c1a89d7ba5d82ce3a25e56f2
6902 Author: Elliot Smith <elliot.smith@intel.com>
6903 Date: Thu Jul 15 17:24:50 2010 +0100
6905 cookbook: Tweak so that videos sit inside a paragraph for better spacing
6907 doc/common/cookbook.xsl | 22 ++++++++++++----------
6908 1 file changed, 12 insertions(+), 10 deletions(-)
6910 commit ec7b0b438962a60a5b269bd712724cc3e59b7795
6911 Author: Emmanuele Bassi <ebassi@linux.intel.com>
6912 Date: Thu Jul 15 14:26:16 2010 +0100
6914 docs: Note the P_() macro in the HACKING file
6916 doc/HACKING | 4 ++++
6917 1 file changed, 4 insertions(+)
6919 commit 1d9c64ff16cc3070405cd6a67221712cf0893b7e
6920 Author: Elliot Smith <elliot.smith@intel.com>
6921 Date: Thu Jul 15 13:27:02 2010 +0100
6923 cookbook: Added support for inline video
6925 Amended Makefile to copy content of videos directory into
6926 installation directories. Also copies videos and images
6927 into the html/ directory during the build, so that the
6928 built cookbook can be viewed locally (for testing without
6931 Added an XSLT template to transform Docbook <inlinemediaobject>
6932 elements into HTML 5 <video> elements, with a fallback to
6933 link to the video displayed for browsers without HTML 5 support.
6935 Added note to "Contributing" appendix explaining how to put
6936 video into a recipe.
6938 doc/common/cookbook.xsl | 18 ++++++++++
6939 doc/cookbook/Makefile.am | 32 +++++++++++++++--
6940 doc/cookbook/clutter-cookbook.xml.in | 66 +++++++++++++++++++++++++++++++++-
6941 doc/cookbook/videos/README | 1 +
6942 4 files changed, 113 insertions(+), 4 deletions(-)
6944 commit 6ea2fbc7297a1f6e3d78d705fdaef8307cf59d97
6945 Author: Neil Roberts <neil@linux.intel.com>
6946 Date: Thu Jul 15 13:05:55 2010 +0100
6948 Add an internal _cogl_bitmap_new_from_buffer
6950 This function creates a CoglBitmap which internally references a
6951 CoglBuffer. The map and unmap functions will divert to mapping the
6952 buffer. There are also now bind and unbind functions which should be
6953 used instead of map and unmap whenever the data doesn't need to be
6954 read from the CPU but will instead be passed to GL for packing or
6955 unpacking. For bitmaps created from buffers this just binds the
6958 cogl_texture_new_from_buffer now just uses this function to wrap the
6959 buffer in a bitmap rather than trying to bind the buffer
6960 immediately. This means that the buffer will be bound only at the
6961 point right before the texture data is uploaded.
6963 This approach means that using a pixel array will take the fastest
6964 upload route if possible, but can still fallback to copying the data
6965 by mapping the buffer if some conversion is needed. Previously it
6966 would just crash in this case because the texture functions were all
6967 passed a NULL pointer.
6969 http://bugzilla.clutter-project.org/show_bug.cgi?id=2112
6971 clutter/cogl/cogl/cogl-bitmap-private.h | 25 ++++
6972 clutter/cogl/cogl/cogl-bitmap.c | 139 +++++++++++++++++++-
6973 clutter/cogl/cogl/cogl-texture.c | 37 ++----
6974 clutter/cogl/cogl/driver/gl/cogl-texture-driver.c | 114 ++++++++--------
6975 .../cogl/cogl/driver/gles/cogl-texture-driver.c | 81 ++++++------
6976 5 files changed, 261 insertions(+), 135 deletions(-)
6978 commit 7eb0d01f9f4bda17307d1506974201570473106c
6979 Author: Neil Roberts <neil@linux.intel.com>
6980 Date: Thu Jul 15 13:02:23 2010 +0100
6982 Add a Cogl debug flag for BITMAP
6984 CoglBitmap will soon want to report notes as it gets more complicated
6985 so this adds a debug flag for it.
6987 clutter/cogl/cogl/cogl-debug.c | 3 ++-
6988 clutter/cogl/cogl/cogl-debug.h | 3 ++-
6989 2 files changed, 4 insertions(+), 2 deletions(-)
6991 commit b780413e5ae4b4fea2130b85d7590d397aea8cac
6992 Author: Neil Roberts <neil@linux.intel.com>
6993 Date: Thu Jul 15 11:32:08 2010 +0100
6995 Try to avoid copying the GdkPixbuf when it is tightly packed
6997 The docs for GdkPixbuf say that the last row of the image won't
6998 necessarily be allocated to the size of the full rowstride. The rest
6999 of Cogl and possibly GL assumes that we can copy the bitmap with
7000 memcpy(height*rowstride) so we previously would copy the pixbuf data
7001 to ensure this. However if the rowstride is the same as bpp*width then
7002 there is no way for the last row to be under-allocated so in this case
7003 we can just directly upload from the gdk pixbuf. Now that CoglBitmap
7004 can be created with a destroy function we can make it keep a reference
7005 to the pixbuf and unref it during its destroy callback. GdkPixbuf
7006 seems to always pack the image with no padding between rows even if it
7007 is RGB so this should end up always avoiding the memcpy.
7009 The fallback code for when we do have to copy the pixbuf is now
7010 simplified so that it copies all of the rows in a single loop. We only
7011 copy the useful region of each row so this should be safe. The
7012 rowstride of the CoglBitmap is now always allocated to bpp*width
7013 regardless of the rowstride of the pixbuf.
7015 clutter/cogl/cogl/cogl-bitmap-pixbuf.c | 41 +++++++++++++++++++-------------
7016 1 file changed, 24 insertions(+), 17 deletions(-)
7018 commit fc12c42a83084b9d3acd1ed5a1b3dd34057f54d8
7019 Author: Neil Roberts <neil@linux.intel.com>
7020 Date: Wed Jul 7 18:44:16 2010 +0100
7022 cogl-bitmap: Encapsulate the CoglBitmap even internally
7024 The CoglBitmap struct is now only defined within cogl-bitmap.c so that
7025 all of its members can now only be accessed with accessor
7026 functions. To get to the data pointer for the bitmap image you must
7027 first call _cogl_bitmap_map and later call _cogl_bitmap_unmap. The map
7028 function takes the same arguments as cogl_pixel_array_map so that
7029 eventually we can make a bitmap optionally internally divert to a
7032 There is a _cogl_bitmap_new_from_data function which constructs a new
7033 bitmap object and takes ownership of the data pointer. The function
7034 gets passed a destroy callback which gets called when the bitmap is
7035 freed. This is similar to how gdk_pixbuf_new_from_data
7036 works. Alternatively NULL can be passed for the destroy function which
7037 means that the caller will manage the life of the pointer (but must
7038 guarantee that it stays alive at least until the bitmap is
7039 freed). This mechanism is used instead of the old approach of creating
7040 a CoglBitmap struct on the stack and manually filling in the
7041 members. It could also later be used to create a CoglBitmap that owns
7042 a GdkPixbuf ref so that we don't necessarily have to copy the
7043 GdkPixbuf data when converting to a bitmap.
7045 There is also _cogl_bitmap_new_shared. This creates a bitmap using a
7046 reference to another CoglBitmap for the data. This is a bit of a hack
7047 but it is needed by the atlas texture backend which wants to divert
7048 the set_region virtual to another texture but it needs to override the
7049 format of the bitmap to ignore the premult flag.
7051 clutter/cogl/cogl/cogl-atlas-texture-private.h | 2 +-
7052 clutter/cogl/cogl/cogl-atlas-texture.c | 187 +++---
7053 clutter/cogl/cogl/cogl-bitmap-fallback.c | 144 +++--
7054 clutter/cogl/cogl/cogl-bitmap-pixbuf.c | 82 ++-
7055 clutter/cogl/cogl/cogl-bitmap-private.h | 109 +++-
7056 clutter/cogl/cogl/cogl-bitmap.c | 228 ++++++--
7057 clutter/cogl/cogl/cogl-texture-2d-private.h | 2 +-
7058 clutter/cogl/cogl/cogl-texture-2d-sliced-private.h | 2 +-
7059 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 607 +++++++++++---------
7060 clutter/cogl/cogl/cogl-texture-2d.c | 70 ++-
7061 clutter/cogl/cogl/cogl-texture-3d-private.h | 2 +-
7062 clutter/cogl/cogl/cogl-texture-3d.c | 109 ++--
7063 clutter/cogl/cogl/cogl-texture-private.h | 4 +-
7064 clutter/cogl/cogl/cogl-texture-rectangle-private.h | 2 +-
7065 clutter/cogl/cogl/cogl-texture-rectangle.c | 43 +-
7066 clutter/cogl/cogl/cogl-texture.c | 355 +++++++-----
7067 clutter/cogl/cogl/cogl.c | 77 +--
7068 clutter/cogl/cogl/driver/gl/cogl-texture-driver.c | 116 ++--
7069 .../cogl/cogl/driver/gles/cogl-texture-driver.c | 200 ++++---
7070 19 files changed, 1421 insertions(+), 920 deletions(-)
7072 commit fd886d9fc265dabd454e0dd3d13ea34d29211112
7073 Author: Neil Roberts <neil@linux.intel.com>
7074 Date: Wed Jul 14 13:21:54 2010 +0100
7076 cogl-texture-2d-sliced: Store the internal format not image format
7078 The 'format' member of CoglTexture2DSliced is returned by
7079 cogl_texture_get_format. All of the other backends return the internal
7080 format of the GL texture in this case. However the sliced backend was
7081 returning the format of the image data used to create the texture. It
7082 doesn't make any sense to retain this information because it doesn't
7083 necessarily indicate the format of the actual texture. This patch
7084 changes it to store the internal format instead.
7086 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 10 +++++-----
7087 1 file changed, 5 insertions(+), 5 deletions(-)
7089 commit fae35f841180842449d3849df9ee665eb3a01c2d
7090 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7091 Date: Thu Jul 15 14:26:16 2010 +0100
7093 docs: Note the P_() macro in the HACKING file
7095 doc/HACKING | 4 ++++
7096 1 file changed, 4 insertions(+)
7098 commit fd27ca7398337fad6d475fcb8ee4a325daf50c0b
7099 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7100 Date: Thu Jun 3 12:57:50 2010 +0100
7102 Mark property strings for translation
7104 Both the nick and the blurb fields should be translatable, for UI
7105 builders and other introspection-based tools.
7107 clutter/clutter-actor-meta.c | 12 +-
7108 clutter/clutter-actor.c | 194 +++++++++++++-------------
7109 clutter/clutter-align-constraint.c | 12 +-
7110 clutter/clutter-alpha.c | 12 +-
7111 clutter/clutter-animation.c | 24 ++--
7112 clutter/clutter-animator.c | 8 +-
7113 clutter/clutter-behaviour-depth.c | 8 +-
7114 clutter/clutter-behaviour-ellipse.c | 36 ++---
7115 clutter/clutter-behaviour-opacity.c | 8 +-
7116 clutter/clutter-behaviour-path.c | 6 +-
7117 clutter/clutter-behaviour-rotate.c | 28 ++--
7118 clutter/clutter-behaviour-scale.c | 16 +--
7119 clutter/clutter-behaviour.c | 14 +-
7120 clutter/clutter-bin-layout.c | 24 ++--
7121 clutter/clutter-bind-constraint.c | 12 +-
7122 clutter/clutter-binding-pool.c | 4 +-
7123 clutter/clutter-box-layout.c | 64 ++++-----
7124 clutter/clutter-box.c | 12 +-
7125 clutter/clutter-cairo-texture.c | 8 +-
7126 clutter/clutter-child-meta.c | 8 +-
7127 clutter/clutter-click-action.c | 9 +-
7128 clutter/clutter-clone.c | 4 +-
7129 clutter/clutter-colorize-effect.c | 4 +-
7130 clutter/clutter-deform-effect.c | 13 +-
7131 clutter/clutter-desaturate-effect.c | 4 +-
7132 clutter/clutter-device-manager.c | 4 +-
7133 clutter/clutter-drag-action.c | 13 +-
7134 clutter/clutter-flow-layout.c | 33 +++--
7135 clutter/clutter-input-device.c | 12 +-
7136 clutter/clutter-interval.c | 5 +-
7137 clutter/clutter-layout-meta.c | 4 +-
7138 clutter/clutter-media.c | 36 ++---
7139 clutter/clutter-rectangle.c | 16 +--
7140 clutter/clutter-script.c | 8 +-
7141 clutter/clutter-shader-effect.c | 4 +-
7142 clutter/clutter-shader.c | 16 +--
7143 clutter/clutter-stage.c | 60 ++++----
7144 clutter/clutter-state.c | 8 +-
7145 clutter/clutter-text.c | 117 ++++++++--------
7146 clutter/clutter-texture.c | 221 +++++++++++++-----------------
7147 clutter/x11/clutter-x11-texture-pixmap.c | 59 ++++----
7148 po/POTFILES.in | 36 +++++
7149 42 files changed, 596 insertions(+), 600 deletions(-)
7151 commit 8be43b52854caad62114b5a204cc78ecf716a04d
7152 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7153 Date: Thu Jun 3 12:56:17 2010 +0100
7155 Add P_() macro for translating property strings
7157 The P_() macro adds a context for the property nick and blurb. In order
7158 to make xgettext recognize it, we need to drop glib-gettexize inside the
7159 autogen.sh script and ship a modified Makefile.in.in with Clutter.
7163 clutter/clutter-behaviour-ellipse.c | 4 +
7164 clutter/clutter-main.c | 2 +-
7165 clutter/clutter-private.h | 11 ++
7166 clutter/clutter-util.c | 20 +++
7168 po/Makefile.in.in | 281 +++++++++++++++++++++++++++++++++++
7169 8 files changed, 318 insertions(+), 11 deletions(-)
7171 commit 292597a9e10a1b178b9cff5ed27a4cca6bec50f6
7172 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7173 Date: Thu Jun 3 12:32:54 2010 +0100
7175 build: Use AS_ALL_LINGUAS
7177 The AS_ALL_LINGUAS m4 macro allows configure-time generation of the
7178 ALL_LINGUAS variable from the translations inside po/ instead of using
7181 build/autotools/Makefile.am | 1 +
7182 build/autotools/as-linguas.m4 | 24 ++++++++++++++++++++++++
7183 configure.ac | 3 +--
7184 3 files changed, 26 insertions(+), 2 deletions(-)
7186 commit fff5558ad25d3a633657c2bd4558132b21dc8ab8
7187 Author: Nate Stedman <natesm@gmail.com>
7188 Date: Wed Jul 14 14:46:23 2010 -0400
7190 Fixes build with GLX on Mac OS X.
7192 Moves preprocessor #ifdef __linux_ above else statement, avoiding the
7193 lack of an else block if __linux__ is not defined.
7195 http://bugzilla.clutter-project.org/show_bug.cgi?id=2212
7197 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
7199 clutter/glx/clutter-stage-glx.c | 2 +-
7200 1 file changed, 1 insertion(+), 1 deletion(-)
7202 commit e7ae71e072fa7f4218b9601c3c7675e516a11f64
7203 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7204 Date: Thu Jul 15 00:26:42 2010 +0100
7206 build: Fix include path for Cally's introspection
7208 The introspection scanner does not include '.' by default, so it was
7209 always using the installed copy of Clutter-1.0.gir. Which obviously
7210 wouldn't work if we didn't have one.
7212 clutter/Makefile.am | 3 +++
7213 1 file changed, 3 insertions(+)
7215 commit 54b2e1781ee9ed4bd195ac1e91c3cd35e952de93
7216 Author: Neil Roberts <neil@linux.intel.com>
7217 Date: Wed Jul 14 17:49:16 2010 +0100
7219 gles/cogl-texture-driver.c: Fix the include for cogl-material-private
7221 In ddb9016be4 the GL texture driver backend was changed to include
7222 cogl-material-opengl-private.h instead of cogl-material-private.h.
7223 However the gles texture backend was missed from this so it was giving
7224 a compiler warning about using an undeclared function.
7226 clutter/cogl/cogl/driver/gles/cogl-texture-driver.c | 2 +-
7227 1 file changed, 1 insertion(+), 1 deletion(-)
7229 commit ccdcbbb46b91ede23eadabff271e9bed6845eac5
7230 Author: Neil Roberts <neil@linux.intel.com>
7231 Date: Wed Jul 14 17:45:15 2010 +0100
7233 cogl-texture-3d: Use glTexSubImage3D through an indirect pointer
7235 glTexSubImage3D was being called directly in cogl-texture-3d.c but the
7236 function is only available since GL version 1.2 so on Windows it won't
7237 be possible to directly link to it. Also under GLES it is only
7238 available conditionally in an extension.
7240 clutter/cogl/cogl/cogl-texture-3d.c | 1 +
7241 clutter/cogl/cogl/driver/gl/cogl-feature-functions.h | 7 +++++++
7242 2 files changed, 8 insertions(+)
7244 commit 943266db3b31f99438a27473c6feb2aa5f71abb8
7245 Author: Neil Roberts <neil@linux.intel.com>
7246 Date: Wed Jul 14 16:35:33 2010 +0100
7248 cogl-texture-3d: Fix the cogl-material-private header include
7250 In ddb9016be4 the texture backends were changed to include
7251 cogl-material-opengl-private.h instead of cogl-material-private.h.
7252 However the 3D texture backend was missed from this so it was giving a
7253 compiler warning about using an undeclared function.
7255 clutter/cogl/cogl/cogl-texture-3d.c | 2 +-
7256 1 file changed, 1 insertion(+), 1 deletion(-)
7258 commit d0d72e4d979de1078aeed00a5228c33296cd014d
7259 Author: Neil Roberts <neil@linux.intel.com>
7260 Date: Wed Jul 14 16:34:36 2010 +0100
7262 cogl-texture-3d: Don't include cogl-texture-2d-private.h
7264 I think this was included by a cut-and-paste error as it isn't needed
7265 anywhere in the source.
7267 clutter/cogl/cogl/cogl-texture-3d.c | 1 -
7268 1 file changed, 1 deletion(-)
7270 commit 5e6697038565ab8123e5f6ebe4e95c2c2c9145b1
7271 Author: Robert Bragg <robert@linux.intel.com>
7272 Date: Sat Jul 10 03:40:47 2010 +0100
7274 material: splits out all the state flushing code
7276 This moves the code supporting _cogl_material_flush_gl_state into
7277 cogl-material-opengl.c as part of an effort to reduce the size of
7278 cogl-material.c to keep it manageable.
7280 clutter/cogl/cogl/cogl-journal.c | 1 +
7281 clutter/cogl/cogl/cogl-material-opengl-private.h | 7 +
7282 clutter/cogl/cogl/cogl-material-opengl.c | 1014 +++++++++++++++++++++
7283 clutter/cogl/cogl/cogl-material-private.h | 26 +-
7284 clutter/cogl/cogl/cogl-material.c | 1061 +---------------------
7285 clutter/cogl/cogl/cogl-path.c | 1 +
7286 clutter/cogl/cogl/cogl-primitives.c | 1 +
7287 clutter/cogl/cogl/cogl-vertex-buffer.c | 1 +
7288 clutter/cogl/cogl/cogl.c | 1 +
7289 clutter/cogl/cogl/driver/gl/cogl-program.c | 1 +
7290 10 files changed, 1088 insertions(+), 1026 deletions(-)
7292 commit ddb9016be4bda2980712edef4ae37f73cfd05104
7293 Author: Robert Bragg <robert@linux.intel.com>
7294 Date: Sat Jul 10 02:53:38 2010 +0100
7296 material: split the texture unit management out
7298 In general cogl-material.c has become far to large to manage in one
7299 source file. As one of the ways to try and break it down this patch
7300 starts to move some of lower level texture unit state management out
7301 into cogl-material-opengl.c. The naming is such because the plan is to
7302 follow up and migrate the very GL specific state flushing code into the
7305 clutter/cogl/cogl/Makefile.am | 2 +
7306 clutter/cogl/cogl/cogl-atlas-texture.c | 1 +
7307 clutter/cogl/cogl/cogl-context.c | 1 +
7308 clutter/cogl/cogl/cogl-material-fixed.c | 1 +
7309 clutter/cogl/cogl/cogl-material-opengl-private.h | 148 +++++++++++++
7310 clutter/cogl/cogl/cogl-material-opengl.c | 230 ++++++++++++++++++++
7311 clutter/cogl/cogl/cogl-material-private.h | 110 ----------
7312 clutter/cogl/cogl/cogl-material.c | 197 +----------------
7313 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 2 +-
7314 clutter/cogl/cogl/cogl-texture-2d.c | 2 +-
7315 clutter/cogl/cogl/cogl-texture-rectangle.c | 1 +
7316 clutter/cogl/cogl/driver/gl/cogl-texture-driver.c | 2 +-
7317 clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 1 +
7318 13 files changed, 391 insertions(+), 307 deletions(-)
7320 commit 9e893e684e89fd9da1d7542cbbc3563d318c1c5c
7321 Author: Robert Bragg <robert@linux.intel.com>
7322 Date: Sat Jul 10 01:36:22 2010 +0100
7324 material: copy_differences: handle copying fog state
7326 When the support for redirecting the legacy fog state through cogl
7327 material was added in 9b9e764dc, the code to handle copying the fog
7328 state in _cogl_material_copy_differences was missed.
7330 clutter/cogl/cogl/cogl-material.c | 7 +++++++
7331 1 file changed, 7 insertions(+)
7333 commit ceb57087a76056b27f55ea67a2f97915570ad8cb
7334 Author: Neil Roberts <neil@linux.intel.com>
7335 Date: Tue Jul 13 18:41:01 2010 +0100
7337 Add a GL_GENERATE_MIPMAP fallback to the texture 2d and 3d backends
7339 The CoglTexture2DSliced backend has a fallback for when the
7340 framebuffer extension is missing so it's not possible to use
7341 glGenerateMipmap. This involves keeping a copy of the upper-left pixel
7342 of the tex image so that we can temporarily enable GL_GENERATE_MIPMAP
7343 on the texture object and do a sub texture update by reuploading the
7344 contents of the first pixel. This patch copies that mechanism to the
7345 2D and 3D backends. The CoglTexturePixel structure which was
7346 previously internal to the sliced backend has been moved to
7347 cogl-texture-private.h so that it can be shared.
7349 clutter/cogl/cogl/cogl-texture-2d-private.h | 2 +
7350 clutter/cogl/cogl/cogl-texture-2d-sliced-private.h | 13 -----
7351 clutter/cogl/cogl/cogl-texture-2d.c | 48 ++++++++++++++-----
7352 clutter/cogl/cogl/cogl-texture-3d-private.h | 2 +
7353 clutter/cogl/cogl/cogl-texture-3d.c | 50 +++++++++++++-------
7354 clutter/cogl/cogl/cogl-texture-private.h | 16 +++++++
7355 6 files changed, 89 insertions(+), 42 deletions(-)
7357 commit ff56f4ac6f763dbce730454b8aa0806a1127e6cd
7358 Merge: 0cbfabc 6c913aa
7359 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7360 Date: Tue Jul 13 16:12:14 2010 +0100
7362 Merge branch 'wip/xkb-support'
7365 x11: Use XKB to translate keycodes into key symbols
7366 x11: Use XKB to track the Locks state
7367 x11: Use XKB detectable auto-repeat
7368 x11: Add a Keymap ancillary object
7369 x11: Store the group inside the event platform data
7370 events: Add platform-data to allocated Events
7371 build: Check for the XKB extension
7373 commit 0cbfabcda468746a57b922d43778e8c8bd4c1b59
7374 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7375 Date: Fri Apr 16 15:34:36 2010 +0100
7377 stage: Add the NO_CLEAR_ON_PAINT hint
7379 Some apps or some use cases don't need to clear the stage on immediate
7380 rendering GPUs. A media player playing a fullscreen video or a
7381 tile-based game, for instance.
7383 These apps are redrawing the whole screen, so we can avoid clearing the
7384 color buffer when preparing to paint the stage, since there is no
7385 blending with the stage color being performed.
7387 We can add an private set of hints to ClutterStage, and expose accessors
7388 for each potential hint; the first hint is the 'no-clear' one.
7390 http://bugzilla.clutter-project.org/show_bug.cgi?id=2058
7392 clutter/clutter-stage.c | 134 ++++++++++++++++++++++++++--
7393 clutter/clutter-stage.h | 4 +
7394 doc/reference/clutter/clutter-sections.txt | 2 +
7395 3 files changed, 135 insertions(+), 5 deletions(-)
7397 commit 984e04cae8139de268686158ff627d843bab777a
7398 Author: Neil Roberts <neil@linux.intel.com>
7399 Date: Fri Jul 2 13:33:06 2010 +0100
7401 Make the material functions for setting the p wrap mode public
7403 Now that we have 3D texture support it makes sense to expose the wrap
7404 mode for the p coordinate.
7406 clutter/cogl/cogl/cogl-material-private.h | 10 --------
7407 clutter/cogl/cogl/cogl-material.c | 15 +++++-------
7408 clutter/cogl/cogl/cogl-material.h | 38 ++++++++++++++++++++++++++---
7409 clutter/cogl/cogl/cogl-vertex-buffer.c | 2 +-
7410 doc/reference/cogl/cogl-sections.txt | 2 ++
7411 5 files changed, 43 insertions(+), 24 deletions(-)
7413 commit 192cfa7a58bf00cab41ee91b6791e3682dfe4053
7414 Author: Neil Roberts <neil@linux.intel.com>
7415 Date: Mon Jul 12 17:01:32 2010 +0100
7417 Rename the third texure coordinate from 'r' to 'p'
7419 Using 'r' to name the third component is problematic because that is
7420 commonly used to represent the red component of a vector representing
7421 a color. Under GLSL this is awkward because the texture swizzling for
7422 a vector uses a single letter for each component and the names for
7423 colors, textures and positions are synonymous. GLSL works around this
7424 by naming the components of the texture s, t, p and q. Cogl already
7425 effectively already exposes this naming because it exposes GLSL so it
7426 makes sense to use that naming consistently. Another alternative could
7427 be u, v and w. This is what Blender and Direct3D use. However the w
7428 component conflicts with the w component of a position vertex.
7430 clutter/cogl/cogl/cogl-atlas-texture.c | 4 +-
7431 clutter/cogl/cogl/cogl-material-private.h | 8 +--
7432 clutter/cogl/cogl/cogl-material.c | 68 ++++++++++++--------
7433 clutter/cogl/cogl/cogl-sub-texture.c | 4 +-
7434 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 2 +-
7435 clutter/cogl/cogl/cogl-texture-2d.c | 2 +-
7436 clutter/cogl/cogl/cogl-texture-3d-private.h | 2 +-
7437 clutter/cogl/cogl/cogl-texture-3d.c | 10 +--
7438 clutter/cogl/cogl/cogl-texture-private.h | 4 +-
7439 clutter/cogl/cogl/cogl-texture-rectangle.c | 2 +-
7440 clutter/cogl/cogl/cogl-texture.c | 4 +-
7441 clutter/cogl/cogl/cogl-vertex-buffer.c | 4 +-
7442 clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 4 +-
7443 13 files changed, 65 insertions(+), 53 deletions(-)
7445 commit cefc0e381bfebfdf766b8331e82da474e848013b
7446 Author: Neil Roberts <neil@linux.intel.com>
7447 Date: Thu Jul 1 22:05:51 2010 +0100
7449 Add a conformance test for 3D textures
7451 This creates a 3D texture with different colors on all of the images
7452 and renders it using a VBO to verify that the texture coordinates can
7453 select all of the images.
7455 tests/conform/.gitignore | 1 +
7456 tests/conform/Makefile.am | 1 +
7457 tests/conform/test-cogl-texture-3d.c | 230 ++++++++++++++++++++++++++++++++++
7458 tests/conform/test-conform-main.c | 1 +
7459 4 files changed, 233 insertions(+)
7461 commit dfea57b45ab4636b3484c0c1eed615da0f97f112
7462 Author: Neil Roberts <neil@linux.intel.com>
7463 Date: Thu Jul 1 22:04:59 2010 +0100
7465 Add a Cogl texture 3D backend
7467 This adds a publicly exposed experimental API for a 3D texture
7468 backend. There is a feature flag which can be checked for whether 3D
7469 textures are supported. Although we require OpenGL 1.2 which has 3D
7470 textures in core, GLES only provides them through an extension so the
7471 feature can be used to detect that.
7473 The textures can be created with one of two new API functions :-
7475 cogl_texture_3d_new_with_size
7479 cogl_texture_3d_new_from_data
7481 There is also internally a new_from_bitmap function. new_from_data is
7482 implemented in terms of this function.
7484 The two constructors are effectively the only way to upload data to a
7485 3D texture. It does not work to call glTexImage2D with the
7486 GL_TEXTURE_3D target so the virtual for cogl_texture_set_region does
7487 nothing. It would be possible to make cogl_texture_get_data do
7488 something sensible like returning all of the images as a single long
7489 image but this is not currently implemented and instead the virtual
7490 just always fails. We may want to add API specific to the 3D texture
7491 backend to get and set a sub region of the texture.
7493 All of those three functions can throw a GError. This will happen if
7494 the GPU does not support 3D textures or it does not support NPOTs and
7495 an NPOT size is requested. It will also fail if the FBO extension is
7496 not supported and the COGL_TEXTURE_NO_AUTO_MIPMAP flag is not
7497 given. This could be avoided by copying the code for the
7498 GL_GENERATE_MIPMAP TexParameter fallback, but in the interests of
7499 keeping the code simple this is not yet done.
7501 This adds a couple of functions to cogl-texture-driver for uploading
7502 3D data and querying the 3D proxy
7503 texture. prep_gl_for_pixels_upload_full now also takes sets the
7504 GL_UNPACK_IMAGE_HEIGHT parameter so that 3D textures can have padding
7505 between the images. Whenever 3D texture is uploading, both the height
7506 of the images and the height of all of the data is specified (either
7507 explicitly or implicilty from the CoglBitmap) so that the image height
7508 can be deduced by dividing by the depth.
7510 clutter/cogl/cogl/Makefile.am | 3 +
7511 clutter/cogl/cogl/cogl-material-arbfp.c | 7 +
7512 clutter/cogl/cogl/cogl-texture-3d-private.h | 96 +++
7513 clutter/cogl/cogl/cogl-texture-3d.c | 657 ++++++++++++++++++++
7514 clutter/cogl/cogl/cogl-texture-3d.h | 154 +++++
7515 clutter/cogl/cogl/cogl-texture-driver.h | 26 +
7516 clutter/cogl/cogl/cogl-types.h | 4 +-
7517 clutter/cogl/cogl/cogl.h | 1 +
7518 .../cogl/cogl/driver/gl/cogl-feature-functions.h | 14 +
7519 clutter/cogl/cogl/driver/gl/cogl-texture-driver.c | 108 +++-
7520 .../cogl/cogl/driver/gles/cogl-feature-functions.h | 19 +
7521 clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 23 +-
7522 clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h | 4 +
7523 .../cogl/cogl/driver/gles/cogl-texture-driver.c | 135 +++-
7524 doc/reference/cogl/cogl-docs.xml.in | 1 +
7525 doc/reference/cogl/cogl-sections.txt | 8 +
7526 16 files changed, 1233 insertions(+), 27 deletions(-)
7528 commit 8ccf8f6f08623492ca2b5af93d3384878e53d912
7529 Author: Neil Roberts <neil@linux.intel.com>
7530 Date: Mon Jul 12 14:30:44 2010 +0100
7532 configure: Include gl2ext.h or glext.h under GLES
7534 Under big GL, glext.h is included automatically by gl.h. However under
7535 GLES this doesn't appear to happen so it has to be included explicitly
7536 to get the defines for extensions. This patch changes the
7537 clutter_gl_header to be called cogl_gl_headers and it can now take a
7538 space seperated list of multiple headers. This is then later converted
7539 to a list of #include lines which ends up cogl-defines.h. The gles2
7540 and gles1 backends now add their respective ext header to this list.
7542 clutter/cogl/cogl/cogl-defines.h.in | 2 +-
7543 configure.ac | 36 +++++++++++++++++++++--------------
7544 2 files changed, 23 insertions(+), 15 deletions(-)
7546 commit 8940c3068183c4e78bbb8a2c3570c3c77d8ff509
7547 Author: Neil Roberts <neil@linux.intel.com>
7548 Date: Thu Jul 1 21:49:16 2010 +0100
7550 Make a public CoglBitmapError enum
7552 There are many places in the texture backend that need to do
7553 conversion using the CoglBitmap code. Currently none of these
7554 functions can throw an error but they do return a value to indicate
7555 failure. In future it would make sense if new texture functions could
7556 throw an error and in that case they would want to use a CoglBitmap
7557 error if the failure was due to the conversion. This moves the
7558 internal CoglBitmap error from the quartz backend to be public in
7559 cogl-bitmap.h so that it can be used in this way.
7561 clutter/cogl/cogl/cogl-bitmap-pixbuf.c | 16 ----------------
7562 clutter/cogl/cogl/cogl-bitmap.c | 5 +++++
7563 clutter/cogl/cogl/cogl-bitmap.h | 32 ++++++++++++++++++++++++++++++++
7564 doc/reference/cogl/cogl-sections.txt | 2 ++
7565 4 files changed, 39 insertions(+), 16 deletions(-)
7567 commit 539b3f83e1614ebe2b93b8ce3c713cbcee6ea975
7568 Author: Neil Roberts <neil@linux.intel.com>
7569 Date: Tue Jul 13 12:59:24 2010 +0100
7571 Rename COGL_ERROR_MISSING_FEATURE to COGL_ERROR_UNSUPPORTED
7573 We can use this error in more unsupported situations than just when we
7574 have a Cogl feature flag for the error. For example if a non-sliced
7575 texture is created with dimensions that are too large then we could
7576 throw this error. Therefore it seems good to rename to something more
7579 clutter/cogl/cogl/cogl-material.c | 4 ++--
7580 clutter/cogl/cogl/cogl-types.h | 21 ++++++++++++++++++---
7581 2 files changed, 20 insertions(+), 5 deletions(-)
7583 commit 423f7128711ee891ef88f18a6b7bb1d28850ac55
7584 Author: Neil Roberts <neil@linux.intel.com>
7585 Date: Thu Jul 1 11:07:03 2010 +0100
7587 Move _cogl_texture_2d_is_pot to cogl-util.h
7589 This function could be used in many places in Cogl so it makes sense
7590 to share it in cogl-util.h as _cogl_util_is_pot().
7592 clutter/cogl/cogl/cogl-texture-2d.c | 11 ++---------
7593 clutter/cogl/cogl/cogl-util.h | 8 ++++++++
7594 2 files changed, 10 insertions(+), 9 deletions(-)
7596 commit 31c127bfa7066f57d2b15957610ff4c12b5b5465
7597 Author: Neil Roberts <neil@linux.intel.com>
7598 Date: Tue Jul 13 13:59:07 2010 +0100
7600 cogl-gles2-wrapper: Layers aren't equal if one is enabled and one is not
7602 Previously when comparing whether the settings for a layer are equal
7603 it would only check if one of them was enabled. If so then it would
7604 assume the other one was enabled and continue to compare the texture
7605 environment. Now it also checks whether the enabledness differs.
7607 clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 60 +++++++++++---------
7608 1 file changed, 33 insertions(+), 27 deletions(-)
7610 commit 6c913aa55e67d56c5095f48a61aaef85961736ec
7611 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7612 Date: Tue Jul 13 11:54:44 2010 +0100
7614 x11: Use XKB to translate keycodes into key symbols
7616 And fall back to XKeycodeToKeysym() if XKB is not available.
7618 clutter/x11/clutter-event-x11.c | 15 +++++---
7619 clutter/x11/clutter-keymap-x11.c | 73 ++++++++++++++++++++++++++++++++++++--
7620 clutter/x11/clutter-keymap-x11.h | 6 ++++
7621 3 files changed, 87 insertions(+), 7 deletions(-)
7623 commit 1ea4c50041b3193a83e0336e9a39a91b57bdb7ed
7624 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7625 Date: Tue Jul 13 09:15:21 2010 +0100
7627 x11: Use XKB to track the Locks state
7629 For Caps Lock and Num Lock. Store the state of both in the
7630 platform-specific per-event data structure. No accessors, yet.
7632 clutter/x11/clutter-event-x11.c | 17 +++++---
7633 clutter/x11/clutter-keymap-x11.c | 83 ++++++++++++++++++++++++++++++++++++--
7634 clutter/x11/clutter-keymap-x11.h | 6 ++-
7635 3 files changed, 96 insertions(+), 10 deletions(-)
7637 commit bf2f8d670d449299aba85526ebc3289b20f3d300
7638 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7639 Date: Mon Jul 12 18:04:03 2010 +0100
7641 x11: Use XKB detectable auto-repeat
7643 If we have XKB support then we should be using it to turn on the
7644 detectable auto-repeat; this allows avoiding the peeking trick
7645 that emulates it inside the event handling code.
7647 clutter/x11/clutter-backend-x11.h | 3 +
7648 clutter/x11/clutter-event-x11.c | 20 +++--
7649 clutter/x11/clutter-keymap-x11.c | 155 ++++++++++++++++++++++++++++++++++++-
7650 clutter/x11/clutter-keymap-x11.h | 3 +-
7651 4 files changed, 171 insertions(+), 10 deletions(-)
7653 commit bea657d3d5e7306c10b245d5cf348e80e0084719
7654 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7655 Date: Mon Jul 12 17:11:30 2010 +0100
7657 x11: Add a Keymap ancillary object
7659 We should try to abstract everything that is related with the key mapping
7660 to its own object, to avoid complicating ClutterBackendX11 any further.
7662 clutter/x11/Makefile.am | 2 +
7663 clutter/x11/clutter-backend-x11.c | 6 ++
7664 clutter/x11/clutter-backend-x11.h | 3 +
7665 clutter/x11/clutter-event-x11.c | 17 ++---
7666 clutter/x11/clutter-keymap-x11.c | 123 +++++++++++++++++++++++++++++++++++++
7667 clutter/x11/clutter-keymap-x11.h | 44 +++++++++++++
7668 6 files changed, 182 insertions(+), 13 deletions(-)
7670 commit d345a61e6c017af594a4d9624a861035be4dd592
7671 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7672 Date: Thu Jul 8 15:47:18 2010 +0100
7674 x11: Store the group inside the event platform data
7676 Now that we have private, per-event platform data, we can start putting
7677 it to good use. The first, most simple use is to store the key group
7678 given the event's modifiers. Since we assume a modern X11, we use XKB
7679 to retrieve it, or we simply fall back to 0 by default.
7681 The data is exposed as a ClutterX11-specific function, within the
7682 sanctioned clutter_x11_* namespace.
7684 clutter/x11/clutter-backend-x11.c | 25 +++++++++++
7685 clutter/x11/clutter-backend-x11.h | 12 +++++
7686 clutter/x11/clutter-event-x11.c | 90 ++++++++++++++++++++++++++++++++++---
7687 clutter/x11/clutter-x11.h | 2 +
7688 4 files changed, 122 insertions(+), 7 deletions(-)
7690 commit f44ccba42e29b0bc1d32afaaeb83de51a4a35603
7691 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7692 Date: Mon Jun 14 18:01:17 2010 +0100
7694 events: Add platform-data to allocated Events
7696 Events allocated by Clutter should have a pointer to platform-specific
7697 data; this would allow backends to add separate structures for holding
7698 ancillary data, whilst retaining the ClutterEvent structure for use on
7701 In theory, for Clutter 2.x we might just want to drop Event and use an
7702 opaque structure, or a typed data structure inheriting from
7703 GTypeInstance instead.
7705 clutter/clutter-backend.c | 30 ++++++++++++++++++++
7706 clutter/clutter-backend.h | 6 ++++
7707 clutter/clutter-event.c | 68 +++++++++++++++++++++++++++++++++++++++++++--
7708 clutter/clutter-private.h | 11 +++++++-
7709 4 files changed, 112 insertions(+), 3 deletions(-)
7711 commit fd6513858928b05ddac41cc660b6006ffaac6f01
7712 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7713 Date: Mon Jun 14 17:29:21 2010 +0100
7715 build: Check for the XKB extension
7717 When compiling the X11 backends.
7720 configure.ac | 20 +++++++++++++++++++-
7721 2 files changed, 20 insertions(+), 1 deletion(-)
7723 commit 698fd7d9601aa729f4bc1c261adda5d7b5e6dc08
7724 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7725 Date: Mon Jul 12 21:43:04 2010 +0100
7727 Post-release version bump to 1.3.9
7730 1 file changed, 1 insertion(+), 1 deletion(-)
7732 commit e1320b559d1ff8ccb5aa9a5f0e36ac019cab2d69
7733 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7734 Date: Mon Jul 12 21:31:15 2010 +0100
7738 NEWS | 42 +++++++++++++++++++++++++++++++++++++++++-
7740 2 files changed, 42 insertions(+), 2 deletions(-)
7742 commit 1eec056bfd29119a515be072f92807a9398a4a37
7743 Merge: e2a553d 9d96c21
7744 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7745 Date: Mon Jul 12 21:25:25 2010 +0100
7747 Merge remote branch 'elliot/cookbook-animation-inversion'
7749 * elliot/cookbook-animation-inversion:
7750 cookbook: Fixed invalid XML tag
7751 cookbook: Added "inverting an animation" recipe
7752 docs: Enabled animation section
7754 commit e2a553da86f3c62d167b9898e337ff10f43d3575
7755 Merge: 2de61da 97ac28e
7756 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7757 Date: Mon Jul 12 21:25:22 2010 +0100
7759 Merge remote branch 'elliot/cookbook-animation-intro'
7761 * elliot/cookbook-animation-intro:
7762 cookbook: Added introduction for animations section
7763 docs: Enabled animation section
7765 commit 2de61da29661585274fd5e10c27110f7eb1fe6fc
7766 Merge: 25dd0ae 9e5a18f
7767 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7768 Date: Mon Jul 12 21:20:30 2010 +0100
7770 Merge remote branch 'elliot/cookbook-consistency'
7772 * elliot/cookbook-consistency:
7773 cookbook: Fixed typo
7774 cookbook: Fix build so CSS files get installed
7775 cookbook: Moved paragraph where it logically belongs
7776 cookbook: Added some judicious note elements
7777 cookbook: Added more information for contributors
7778 cookbook: Link out to docbook site
7779 cookbook: Made docbook element usage consistent
7780 cookbook: Additional selectors in CSS stylesheet
7781 cookbook: Copy the CSS file into the HTML build directory
7783 commit 25dd0ae356e7e0486e2a56c21f53e601ec54ab54
7784 Author: Øyvind Kolås <pippin@linux.intel.com>
7785 Date: Mon Jul 12 17:34:17 2010 +0100
7787 state: swap clutter_state_set_state and clutter_state_warp_to_state
7789 Got the boolean arguments for the old clutter_state_change wrong,
7790 making the methods do the opposite of what they should.
7792 clutter/clutter-state.c | 4 ++--
7793 1 file changed, 2 insertions(+), 2 deletions(-)
7795 commit 97ac28ee482a02e1309105171bfb8efdbf8be3c8
7796 Author: Elliot Smith <elliot.smith@intel.com>
7797 Date: Mon Jul 12 17:15:16 2010 +0100
7799 cookbook: Added introduction for animations section
7801 Introduces basic concepts (timelines, alphas, frames)
7802 common to different parts of the Clutter animation API.
7804 Gives a high level overview of the three different
7805 approaches to animation (implicit, ClutterAnimator,
7808 doc/cookbook/animations.xml | 203 ++++++++++++++++++++++++++++++++++++++++++-
7809 1 file changed, 200 insertions(+), 3 deletions(-)
7811 commit 295a043194878e66072b619529355e3fc20c9821
7812 Author: Elliot Smith <elliot.smith@intel.com>
7813 Date: Fri Jul 9 11:27:57 2010 +0100
7815 docs: Enabled animation section
7817 doc/cookbook/clutter-cookbook.xml.in | 2 --
7818 1 file changed, 2 deletions(-)
7820 commit 9d96c21de6578efeb6099295da8c4cb1e189dad8
7821 Author: Elliot Smith <elliot.smith@intel.com>
7822 Date: Mon Jul 12 16:59:38 2010 +0100
7824 cookbook: Fixed invalid XML tag
7826 doc/cookbook/animations.xml | 2 +-
7827 1 file changed, 1 insertion(+), 1 deletion(-)
7829 commit 6a443a0cd3a7a661d3cf727f682d636c3dab08a1
7830 Author: Elliot Smith <elliot.smith@intel.com>
7831 Date: Mon Jul 12 15:34:23 2010 +0100
7833 cookbook: Added "inverting an animation" recipe
7835 Added a new recipe (based on the skeleton in the
7836 animations section of the cookbook) about inverting
7837 an animation by reversing the direction of its timeline.
7839 Uses clutter_actor_animate() as the basic approach,
7840 but mentions ClutterState and ClutterAnimator as well.
7842 doc/cookbook/animations.xml | 149 ++++++++++++++++++++++++++++++++++++++++++-
7843 1 file changed, 146 insertions(+), 3 deletions(-)
7845 commit bfb51adf97e3a702c47d3c5d0b7c2a575caf8ddc
7846 Author: Elliot Smith <elliot.smith@intel.com>
7847 Date: Fri Jul 9 11:27:57 2010 +0100
7849 docs: Enabled animation section
7851 doc/cookbook/clutter-cookbook.xml.in | 2 --
7852 1 file changed, 2 deletions(-)
7854 commit 90acc6a2a9a6563c60df5f9849a23c40c89a956f
7855 Author: Neil Roberts <neil@linux.intel.com>
7856 Date: Fri Jul 9 19:09:49 2010 +0100
7858 Add the deprecated ref-counting for cogl_program
7860 cogl_program has always had cogl_program_ref and cogl_program_unref
7861 but this was missed from 89cb325fd4 so they got removed.
7863 clutter/cogl/cogl/driver/gl/cogl-program.c | 1 +
7864 clutter/cogl/cogl/driver/gles/cogl-program.c | 1 +
7865 2 files changed, 2 insertions(+)
7867 commit 8a85088196809cac2b47a84be2d7f0a1e3c67701
7868 Author: Neil Roberts <neil@linux.intel.com>
7869 Date: Fri Jul 9 18:46:31 2010 +0100
7871 Don't define public cogl_is_* functions for internal types
7873 This adds a COGL_OBJECT_INTERNAL_DEFINE macro and friends that are the
7874 same as COGL_OBJECT_DEFINE except that they prefix the cogl_is_*
7875 function with an underscore so that it doesn't get exported in the
7878 clutter/cogl/cogl/cogl-atlas-texture.c | 2 +-
7879 clutter/cogl/cogl/cogl-clip-stack.c | 4 +-
7880 clutter/cogl/cogl/cogl-framebuffer.c | 8 +--
7881 clutter/cogl/cogl/cogl-material.c | 18 ++++---
7882 clutter/cogl/cogl/cogl-object-private.h | 78 ++++++++++++++++++++--------
7883 clutter/cogl/cogl/cogl-sub-texture.c | 4 +-
7884 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 2 +-
7885 clutter/cogl/cogl/cogl-texture-2d.c | 4 +-
7886 clutter/cogl/cogl/cogl-texture-private.h | 6 +++
7887 clutter/cogl/cogl/cogl-texture-rectangle.c | 2 +-
7888 10 files changed, 87 insertions(+), 41 deletions(-)
7890 commit 0e839c37693339287232f0292283f92522fa3ca5
7891 Author: Neil Roberts <neil@linux.intel.com>
7892 Date: Fri Jul 9 18:24:28 2010 +0100
7894 Add cogl_vertex_buffer_is_indices to the public headers
7896 This function has always been defined in the shared library but it was
7897 missed from the public headers.
7899 clutter/cogl/cogl/cogl-vertex-buffer.h | 15 +++++++++++++++
7900 doc/reference/cogl/cogl-sections.txt | 1 +
7901 2 files changed, 16 insertions(+)
7903 commit 89cb325fd4e921149fc9ad861d66ef1ed9acd3df
7904 Author: Neil Roberts <neil@linux.intel.com>
7905 Date: Fri Jul 9 17:59:16 2010 +0100
7907 cogl: Don't define the deprecated ref/unref accessors for new types
7909 Previously COGL_OBJECT_DEFINE would always define deprecated
7910 cogl_$type_{ref,unref} functions even if the type is new or if the
7911 type is entirely internal. An application would still find it
7912 difficult to use these because they wouldn't be in the headers, but it
7913 still looks bad that they are exported from the shared library. This
7914 patch changes it so that the deprecated ref counting functions are
7915 defined using a separate macro and only the types that have these
7916 functions in the headers call this macro.
7918 clutter/cogl/cogl/cogl-framebuffer.c | 1 +
7919 clutter/cogl/cogl/cogl-material.c | 1 +
7920 clutter/cogl/cogl/cogl-object-private.h | 4 +++-
7921 clutter/cogl/cogl/cogl-vertex-buffer.c | 1 +
7922 clutter/cogl/cogl/driver/gl/cogl-shader.c | 1 +
7923 clutter/cogl/cogl/driver/gles/cogl-shader.c | 1 +
7924 6 files changed, 8 insertions(+), 1 deletion(-)
7926 commit 903560c6c8c50c28959c2588d24d288bc2c4db26
7927 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7928 Date: Fri Jul 9 18:37:34 2010 +0100
7930 text: Layouts for single-line-mode entries are boundless
7932 A PangoLayout for an editable, single-line text entry is by definition
7933 without a given width, since the actor will be clipped when being drawn.
7935 clutter/clutter-text.c | 26 ++++++++++++++++++++------
7936 1 file changed, 20 insertions(+), 6 deletions(-)
7938 commit 1635a2db1256ec1df40a5b920e3afe6a9f9745d9
7939 Author: Robert Bragg <robert@linux.intel.com>
7940 Date: Thu Jul 8 11:49:31 2010 +0100
7942 material: use common node type for materials and layers
7944 Since 365605cf42, materials and layers are represented in a tree
7945 structure that allows traversing up through parents and iterating down
7946 through children. This re-works the related typedefs and reparenting
7947 code so that they can be shared.
7949 clutter/cogl/cogl/cogl-material-arbfp.c | 25 +-
7950 clutter/cogl/cogl/cogl-material-private.h | 109 +++----
7951 clutter/cogl/cogl/cogl-material.c | 479 +++++++++++++++--------------
7952 3 files changed, 326 insertions(+), 287 deletions(-)
7954 commit 9e82fe39444d4f69dc3ca920fdfd94d1ba000136
7955 Author: Damien Lespiau <damien.lespiau@intel.com>
7956 Date: Fri Jul 9 17:55:31 2010 +0100
7958 cogl-texture-pixmap-x11: This API is new in 1.4, not 1.2
7960 CoglTexturePixmapX11 has been introduced in the 1.3 development cycle. A
7961 Stability: Unstable tag was missing too, so add it.
7963 clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.h | 11 +++++++----
7964 1 file changed, 7 insertions(+), 4 deletions(-)
7966 commit 892aa455138c692b464b3bce37a548e33d68e083
7967 Author: Damien Lespiau <damien.lespiau@intel.com>
7968 Date: Fri Jul 9 15:59:14 2010 +0100
7970 cogl: Add Stability tag to new experimental API
7972 Functions guarded with COGL_ENABLE_EXPERIMENTAL API should be also maked
7973 as being Unstable with the Stability gtk-doc tag.
7975 Fixes: http://bugzilla.clutter-project.org/show_bug.cgi?id=2175
7977 clutter/cogl/cogl/cogl-material.h | 8 ++++++++
7978 1 file changed, 8 insertions(+)
7980 commit b7f99ddd3c55f3d1356bb162114cbdf85ffb6101
7981 Author: Emmanuele Bassi <ebassi@linux.intel.com>
7982 Date: Fri Jul 9 14:59:32 2010 +0100
7984 script: Let ClutterActor parse behaviours
7986 Up until now, the "behaviours" member of an actor definition was parsed
7987 by the ClutterScript parser itself - even though it's not strictly
7990 In an effort to minimize the ad hoc code in the Script parser, we should
7991 let ClutterActor handle all the special cases that involve
7992 actor-specific members.
7994 clutter/clutter-actor.c | 66 ++++++++++++++++++++++++++++++
7995 clutter/clutter-script-parser.c | 83 +-------------------------------------
7996 clutter/clutter-script-private.h | 1 -
7997 clutter/clutter-script.c | 3 --
7998 4 files changed, 67 insertions(+), 86 deletions(-)
8000 commit fdc79427a6bf152b11831accbef5ca3b0165f71b
8001 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8002 Date: Fri Jul 9 11:40:00 2010 +0100
8004 Add new tests to the ignore files
8006 tests/conform/.gitignore | 1 +
8007 tests/interactive/.gitignore | 1 +
8008 2 files changed, 2 insertions(+)
8010 commit a65429363e5c9dc03f84df3b8d4a95988b602dd1
8011 Author: Neil Roberts <neil@linux.intel.com>
8012 Date: Thu Jul 8 18:37:01 2010 +0100
8014 Use GL_MAX_TEXTURE_SIZE on GLES when checking supported tex size
8016 Under big GL, _cogl_texture_driver_size_supported uses the proxy
8017 texture to check whether the given texture size is supported. Proxy
8018 textures aren't available under GLES so previously this would just
8019 return TRUE to assume all texture sizes are supported. This patch
8020 makes it use glGetIntegerv with GL_MAX_TEXTURE_SIZE to give a second
8023 This fixes the sliced texture backend so that it will use slices when
8024 the texture is too big.
8026 clutter/cogl/cogl/driver/gles/cogl-texture-driver.c | 8 +++++++-
8027 1 file changed, 7 insertions(+), 1 deletion(-)
8029 commit eb24d2a252b33ce86f9bfa476b12c683d88a4776
8030 Author: Neil Roberts <neil@linux.intel.com>
8031 Date: Thu Jul 8 18:33:45 2010 +0100
8033 Fix cogl_texture_get_data when an intermediate buffer is used
8035 When an intermediate buffer is used for downloading texture data it
8036 was using the wrong byte length for a row so the copy back to the
8037 user's buffer would fail.
8039 clutter/cogl/cogl/cogl-texture.c | 2 +-
8040 1 file changed, 1 insertion(+), 1 deletion(-)
8042 commit 9e1bb31922a53a7a27bf03ac92cb9a5cfa743770
8043 Author: Neil Roberts <neil@linux.intel.com>
8044 Date: Thu Jul 8 18:31:29 2010 +0100
8046 Use GL_NEAREST filter in the draw-and-read get_data texture fallback
8048 The fallback for when glGetTexImage is not available renders the
8049 texture to the framebuffer to read the data using glReadPixels. This
8050 patch just sets the COGL_MATERIAL_FILTER_NEAREST filter mode on the
8051 material before rendering to avoid linear filtering which would alter
8054 clutter/cogl/cogl/cogl-texture.c | 4 ++++
8055 1 file changed, 4 insertions(+)
8057 commit 25cf5979e63e093397bad042e3953da7455d0491
8058 Author: Neil Roberts <neil@linux.intel.com>
8059 Date: Thu Jul 8 18:29:12 2010 +0100
8061 Use cogl_read_pixels in the cogl texture draw-and-read fallback
8063 The fallback for when glGetTexImage is not available draws parts of
8064 the texture to the framebuffer and uses glReadPixels to extract the
8065 data. However it was using cogl_rectangle to draw and then immediately
8066 using raw glReadPixels to fetch the data. This won't cause a journal
8067 flush so the rectangle won't necessarily have hit the framebuffer
8068 yet. Instead it now uses cogl_read_pixels which does flush the
8071 clutter/cogl/cogl/cogl-texture.c | 15 +++++++--------
8072 1 file changed, 7 insertions(+), 8 deletions(-)
8074 commit e454b9cadfd8393f65ad38030c5fe98a69be2904
8075 Author: Neil Roberts <neil@linux.intel.com>
8076 Date: Thu Jul 8 18:28:11 2010 +0100
8078 cogl-material: Fix some problems with flushing texture overrides
8080 There were a few problems flushing texture overrides so that sliced
8081 textures would not work:
8083 * In _cogl_material_set_layer_texture it ignored the 'overriden'
8084 parameter and always set texture_overridden to FALSE.
8086 * cogl_texture_get_gl_texture wasn't being called correctly in
8087 override_layer_texture_cb. It returns a gboolean to indicate the
8088 error status but this boolean was being assigned to gl_target.
8090 * _cogl_material_layer_texture_equal did not take into account the
8093 * _cogl_material_layer_get_texture_info did not return the overridden
8094 texture so it would always use the first texture slice.
8096 clutter/cogl/cogl/cogl-material.c | 22 ++++++++++++++++++----
8097 1 file changed, 18 insertions(+), 4 deletions(-)
8099 commit 8beb49164ffeffa867d52c9da89c6dbb6e754e4a
8100 Author: Neil Roberts <neil@linux.intel.com>
8101 Date: Thu Jul 8 15:15:22 2010 +0100
8103 cogl-texture: Share the common code in the set_region virtual
8105 There was a lot of common code that was copied to all of the backends
8106 to convert the data to a suitable format and wrap it into a CoglBitmap
8107 so that it can be passed to _cogl_texture_driver_upload_subregion_to_gl.
8108 This patch moves the common code to cogl-texture.c so that the virtual
8109 just takes a CoglBitmap that is already in the right format.
8111 clutter/cogl/cogl/cogl-atlas-texture.c | 83 +++++---------------
8112 clutter/cogl/cogl/cogl-sub-texture.c | 21 ++---
8113 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 57 +++-----------
8114 clutter/cogl/cogl/cogl-texture-2d.c | 58 +++-----------
8115 clutter/cogl/cogl/cogl-texture-private.h | 19 +++--
8116 clutter/cogl/cogl/cogl-texture-rectangle.c | 58 +++-----------
8117 clutter/cogl/cogl/cogl-texture.c | 74 ++++++++++++++---
8118 clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 6 +-
8119 8 files changed, 135 insertions(+), 241 deletions(-)
8121 commit 972c0c24f012e09fd2ad47296f2eba15f8ff11da
8122 Author: Neil Roberts <neil@linux.intel.com>
8123 Date: Thu Jul 8 14:25:23 2010 +0100
8125 Add a conformance test for cogl_texture_{get_data,set_region}
8127 This verifies that calling cogl_texture_get_data returns the same data
8128 uploaded to the texture. The bottom quarter of the texture is replaced
8129 using cogl_texture_set_region. It tries creating the texture with
8130 different sizes and flags in the hope that it will hit different
8133 tests/conform/Makefile.am | 1 +
8134 tests/conform/test-cogl-texture-get-set-data.c | 131 ++++++++++++++++++++++++
8135 tests/conform/test-conform-main.c | 1 +
8136 3 files changed, 133 insertions(+)
8138 commit 0577c81c3b2b76e97aeca672b2f39df42e03ad5d
8139 Author: Neil Roberts <neil@linux.intel.com>
8140 Date: Thu Jul 8 13:54:37 2010 +0100
8142 cogl-texture: Share the common code in the get_data virtual
8144 Previously cogl_texture_get_data would pretty much directly pass on to
8145 the get_data texture virtual function. This ended up with a lot of
8146 common code that was copied to all of the backends. For example, the
8147 method is expected to return the required data size if the data
8148 pointer is NULL and to calculate its own rowstride if the rowstride is
8149 0. Also it needs to convert the downloaded data if GL can't support
8150 that format directly.
8152 This patch moves the common code to cogl-texture.c so the virtual is
8153 always called with a format that can be downloaded directly by GL and
8154 with a valid rowstride. If the download fails then the virtual can
8155 return FALSE in which case cogl-texture will use the draw and read
8158 clutter/cogl/cogl/cogl-atlas-texture.c | 2 +-
8159 clutter/cogl/cogl/cogl-sub-texture.c | 26 ++---
8160 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 93 +++--------------
8161 clutter/cogl/cogl/cogl-texture-2d.c | 102 +++----------------
8162 clutter/cogl/cogl/cogl-texture-private.h | 13 ++-
8163 clutter/cogl/cogl/cogl-texture-rectangle.c | 106 +++-----------------
8164 clutter/cogl/cogl/cogl-texture.c | 98 +++++++++++++++++-
8165 clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 2 +-
8166 8 files changed, 150 insertions(+), 292 deletions(-)
8168 commit 4ca1e491dae164559479c218f4118869d0fa9187
8169 Author: Robert Bragg <robert@linux.intel.com>
8170 Date: Thu Jul 8 19:20:33 2010 +0100
8172 tests: don't delay/skip frames due to glReadPixel concerns
8174 This greatly speeds up running all the conformance tests by no longer
8175 delaying many of the tests for a number of dummy frames to be painted.
8177 We used to skip frames because we thought there was a problem with the
8178 driver's glReadPixels implementation. Although we have seen driver
8179 issues at times the real reason the delay was needed was because
8180 resizing the stage usually happens asynchronously (because a non
8181 synchronous X request is used by clutter_stage_set_size()). We now force
8182 all X requests to be synchronized for the conformance tests so this is
8183 no longer a problem and we can avoid these hacks.
8185 tests/conform/test-cogl-blend-strings.c | 36 ++----------
8186 tests/conform/test-cogl-depth-test.c | 29 ++--------
8187 tests/conform/test-cogl-materials.c | 24 +-------
8188 tests/conform/test-cogl-multitexture.c | 19 ++-----
8189 tests/conform/test-cogl-npot-texture.c | 13 ++---
8190 tests/conform/test-cogl-pixel-buffer.c | 13 ++---
8191 tests/conform/test-cogl-premult.c | 59 ++++++--------------
8192 tests/conform/test-cogl-sub-texture.c | 13 ++---
8193 tests/conform/test-cogl-texture-mipmaps.c | 13 +----
8194 tests/conform/test-cogl-texture-rectangle.c | 17 +-----
8195 tests/conform/test-cogl-vertex-buffer-contiguous.c | 20 ++-----
8196 tests/conform/test-cogl-vertex-buffer-interleved.c | 20 ++-----
8197 tests/conform/test-cogl-vertex-buffer-mutability.c | 21 ++-----
8198 tests/conform/test-cogl-wrap-modes.c | 17 +-----
8199 tests/conform/test-pick.c | 2 +-
8200 tests/conform/test-texture-fbo.c | 13 ++---
8201 16 files changed, 63 insertions(+), 266 deletions(-)
8203 commit f47152c557c3d21ebacc7b774e94cfa4f6dcb3bc
8204 Author: Neil Roberts <neil@linux.intel.com>
8205 Date: Wed Apr 7 11:06:20 2010 +0100
8207 cogl-vertex-buffer: Default to GL_CLAMP_TO_EDGE for point sprites
8209 For point sprites you are usually drawing the whole texture so you
8210 most often want GL_CLAMP_TO_EDGE. This patch removes the override for
8211 COGL_MATERIAL_WRAP_MODE_AUTOMATIC when point sprites are enabled for a
8212 layer so that it will clamp to edge.
8214 clutter/cogl/cogl/cogl-material.h | 6 ++--
8215 clutter/cogl/cogl/cogl-vertex-buffer.c | 57 +++++++++++++++++---------------
8216 2 files changed, 35 insertions(+), 28 deletions(-)
8218 commit ad6d597445f58b9ef55c7d3696935b35739957bd
8219 Author: Neil Roberts <neil@linux.intel.com>
8220 Date: Mon Mar 22 13:48:27 2010 +0000
8222 Add an interactive test for cogl point sprites
8224 The test draws some fireworks with trailing sparks that fade out.
8226 http://bugzilla.openedhand.com/show_bug.cgi?id=2047
8228 tests/interactive/Makefile.am | 3 +-
8229 tests/interactive/test-cogl-point-sprites.c | 280 +++++++++++++++++++++++++++
8230 2 files changed, 282 insertions(+), 1 deletion(-)
8232 commit ab05f6bfb1493bb1a6d17c79656c0efef21da5e1
8233 Author: Neil Roberts <neil@linux.intel.com>
8234 Date: Mon Mar 22 13:33:55 2010 +0000
8236 cogl-material: Add support for point sprites
8238 This adds a new API call to enable point sprite coordinate generation
8239 for a material layer:
8242 cogl_material_set_layer_point_sprite_coords_enabled (CoglHandle material,
8246 There is also a corresponding get function.
8248 Enabling point sprite coords simply sets the GL_COORD_REPLACE of the
8249 GL_POINT_SPRITE glTexEnv when flusing the material. There is no
8250 separate application control for glEnable(GL_POINT_SPRITE). Instead it
8251 is left permanently enabled under the assumption that it has no affect
8252 unless GL_COORD_REPLACE is enabled for a texture unit.
8254 http://bugzilla.openedhand.com/show_bug.cgi?id=2047
8256 clutter/cogl/cogl/cogl-context.c | 14 ++
8257 clutter/cogl/cogl/cogl-material-private.h | 12 +-
8258 clutter/cogl/cogl/cogl-material.c | 166 +++++++++++++++++++-
8259 clutter/cogl/cogl/cogl-material.h | 44 ++++++
8260 clutter/cogl/cogl/cogl-types.h | 5 +-
8261 .../cogl/cogl/driver/gl/cogl-feature-functions.h | 7 +
8262 clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 63 ++++++--
8263 clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h | 19 ++-
8264 clutter/cogl/cogl/driver/gles/cogl.c | 3 +
8265 doc/reference/cogl/cogl-sections.txt | 2 +
8266 10 files changed, 305 insertions(+), 30 deletions(-)
8268 commit 73642ac9c435709e79c62973fd0523494b9b14fb
8269 Author: Neil Roberts <neil@linux.intel.com>
8270 Date: Mon Mar 22 09:32:17 2010 +0000
8272 cogl-material: Add a property for setting the point size
8274 This adds cogl_material_{get,set}_point_size. If the point size is not
8275 1.0f then glPointSize will be called when the material is flushed.
8277 http://bugzilla.openedhand.com/show_bug.cgi?id=2047
8279 clutter/cogl/cogl/cogl-context.c | 2 +
8280 clutter/cogl/cogl/cogl-context.h | 2 +
8281 clutter/cogl/cogl/cogl-material-private.h | 10 ++-
8282 clutter/cogl/cogl/cogl-material.c | 72 ++++++++++++++++++++
8283 clutter/cogl/cogl/cogl-material.h | 33 +++++++++
8284 .../cogl/driver/gles/cogl-fixed-vertex-shader.glsl | 6 ++
8285 clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 19 ++++++
8286 clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h | 9 ++-
8287 doc/reference/cogl/cogl-sections.txt | 2 +
8288 9 files changed, 151 insertions(+), 4 deletions(-)
8290 commit c76d53a9c4be0e7376392c0d9fb1d316aaeae69d
8291 Author: Neil Roberts <neil@linux.intel.com>
8292 Date: Thu Jul 8 15:28:37 2010 +0100
8294 tests/accessibility: Fix the soname for libclutter
8296 The required .so file was named using @CLUTTER_WINSYS@ but since
8297 bf9d5f394997 the .so should be named with @CLUTTER_SONAME_INFIX@. This
8298 was breaking the build on eglx.
8300 tests/accessibility/Makefile.am | 2 +-
8301 1 file changed, 1 insertion(+), 1 deletion(-)
8303 commit b2decfe7627e605e8ac7de8b372d7e9d4df49a35
8304 Author: Robert Bragg <robert@linux.intel.com>
8305 Date: Wed Jul 7 20:43:54 2010 +0100
8307 material: support dumping layer state graph to dot file
8309 Recently I added a _cogl_debug_dump_materials_dot_file function for
8310 debugging the sparse material state. This extends the state dumped to
8311 include the graph of layer state also.
8313 clutter/cogl/cogl/cogl-material.c | 133 ++++++++++++++++++++++++++++++-------
8314 1 file changed, 110 insertions(+), 23 deletions(-)
8316 commit 7eedf0f2342dc717f8a293627ab1dd13d17eda52
8317 Author: Robert Bragg <robert@linux.intel.com>
8318 Date: Wed Jul 7 19:23:57 2010 +0100
8320 material: set ->layer_index on new layers for unit0
8322 We were mistakenly only initializing layer->layer_index for new layers
8323 associated with texture units > 0. This had gone unnoticed because
8324 normally layers associated with texture unit0 have a layer index of 0
8325 too. Mutter was hitting this issue because it was initializing layer 1
8326 before layer 0 for one of its materials so layer 1 was temporarily
8327 associated with texture unit 0.
8329 clutter/cogl/cogl/cogl-material.c | 2 +-
8330 1 file changed, 1 insertion(+), 1 deletion(-)
8332 commit 9e730727ca3318067164121b52ed62d164884649
8333 Author: Øyvind Kolås <pippin@linux.intel.com>
8334 Date: Wed Jul 7 18:14:43 2010 +0100
8336 state: add clutter_state_set_state and clutter_state_warp_to_state
8338 Replaced clutter_state_change with a boolean argument for animating the
8339 transition or not with two separate argument-less methods.
8341 clutter/clutter-state.c | 61 ++++++++++++++++++++--------
8342 clutter/clutter-state.h | 7 ++--
8343 doc/reference/clutter/clutter-sections.txt | 3 +-
8344 tests/interactive/test-state-animator.c | 6 +--
8345 tests/interactive/test-state.c | 15 +++----
8346 5 files changed, 60 insertions(+), 32 deletions(-)
8348 commit f87e4037a880b3bf180a547dea1713a99aa3398b
8349 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8350 Date: Wed Jul 7 16:30:31 2010 +0100
8352 build: Distcheck fixes after the Cally merge
8354 clutter/cally/Makefile.am | 4 +++-
8355 doc/reference/cally/Makefile.am | 4 ++--
8356 tests/Makefile.am | 2 +-
8357 tests/accessibility/Makefile.am | 14 ++++++++------
8358 4 files changed, 14 insertions(+), 10 deletions(-)
8360 commit e3a8ece54d3a626f012b955a953d0ae69a22ad7a
8361 Merge: 175317a a3c69dc
8362 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8363 Date: Wed Jul 7 16:06:30 2010 +0100
8365 Merge branch 'cally-merge'
8368 cally: Add introspection generation
8369 cally: Improving cally doc
8370 cally: Cleaning CallyText
8371 cally: Refactoring "window:create" and "window:destroy" emission code
8372 cally: Use proper backend information on CallyActor
8373 cally: Check HAVE_CONFIG_H on cally-util.c
8374 docs: Fix Cally documentation
8375 cally: Clean up the headers
8376 Add binaries of the Cally examples to the ignore file
8377 docs: Add Cally API reference
8378 Avoid to load cally module on a11y examples
8379 Add accessibility tests
8380 Initialize accessibility support on clutter_init
8381 Rename some methods and includes to avoid -Wshadow warnings
8382 Cally initialization code
8385 commit 175317a75481b9d3e228258d86e17dfd12263551
8386 Author: Robert Bragg <robert@linux.intel.com>
8387 Date: Wed Jul 7 15:58:02 2010 +0100
8389 test-timeline: instantiate a stage so the master clock runs
8391 This makes test-timeline get the default stage so there is at least one
8392 stage instantiated. Without any stages the master clock will never run
8393 which was causing this test to fail.
8395 tests/conform/test-timeline.c | 5 +++++
8396 1 file changed, 5 insertions(+)
8398 commit a3c69dc27c5fc492184a2b6948f59ef27b60f10c
8399 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8400 Date: Wed Jul 7 15:57:43 2010 +0100
8402 cally: Add introspection generation
8404 Toolkits and applications not written in C might still need access to
8405 the Cally API to write accessibility extensions based on it for their
8406 own native elements.
8408 clutter/Makefile.am | 30 +++++++++++++++++++++++++++---
8409 clutter/cally/Makefile.am | 6 ++----
8410 clutter/cogl/cogl/Makefile.am | 2 +-
8411 3 files changed, 30 insertions(+), 8 deletions(-)
8413 commit 7d1445afcaee17a341d3e206d7a38d2d3e555e27
8414 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8415 Date: Wed Jul 7 14:50:24 2010 +0100
8417 Restore the report on the conformance test suite
8419 The report generation was broken by the split of the various test units;
8420 also, we were using GTest in a way that's not really sanctioned by
8423 This commit tries to re-use the targets from GLib's Makefile rules while
8424 compensating for our own set up.
8426 tests/conform/.gitignore | 4 ++
8427 tests/conform/Makefile.am | 142 +++++++++++++++++++++++++++-----------------
8428 tests/conform/run-tests.sh | 4 +-
8429 3 files changed, 92 insertions(+), 58 deletions(-)
8431 commit 608a5a8ae6951dc06c9fcb67b00491d2a60404c0
8432 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8433 Date: Wed Jul 7 14:49:28 2010 +0100
8435 x11: Clean up NET_WM_STATE modifiers
8437 Use a separate function to avoid code duplication.
8439 clutter/x11/clutter-stage-x11.c | 44 ++++++++++++++++++++++++++++-----------
8440 1 file changed, 32 insertions(+), 12 deletions(-)
8442 commit eca398f11309ff91c6a10d51e5358ed28f816397
8443 Author: Emmanuele Bassi <ebassi@linux.intel.com>
8444 Date: Tue Jul 6 17:13:55 2010 +0100
8446 x11: Do not swallow XSettings events
8448 We might want pieces higher in the stack (like Mx) to handle XSettings
8449 events as well, and swallowing them by removing them from the events
8450 queue would make it impossible.
8452 clutter/x11/clutter-backend-x11.c | 11 +++++++----
8453 1 file changed, 7 insertions(+), 4 deletions(-)
8455 commit a2f8ce175fed304b8e48304ff82703af58022bfb
8456 Author: Alejandro Piñeiro <apinheiro@igalia.com>
8457 Date: Tue Jul 6 16:51:24 2010 +0200
8459 cally: Improving cally doc
8461 * Add documentation for all undocumented symbols
8462 * Add an overview section
8464 clutter/cally/cally-actor.c | 2 +-
8465 clutter/cally/cally-actor.h | 8 ++--
8466 clutter/cally/cally-clone.c | 11 +++++
8467 clutter/cally/cally-factory.h | 26 ++++++++++
8468 clutter/cally/cally-rectangle.c | 11 +++++
8469 clutter/cally/cally-root.c | 11 ++++-
8470 clutter/cally/cally-stage.c | 65 +++++++++++++++++++++++++
8471 clutter/cally/cally-text.c | 11 +++++
8472 clutter/cally/cally-texture.c | 11 +++++
8473 clutter/cally/cally.c | 11 ++++-
8474 doc/reference/cally/Makefile.am | 6 ++-
8475 doc/reference/cally/cally-docs.xml.in | 7 ++-
8476 doc/reference/cally/cally-overview.xml | 74 +++++++++++++++++++++++++++++
8477 doc/reference/clutter/running-clutter.xml | 4 ++
8478 14 files changed, 248 insertions(+), 10 deletions(-)
8480 commit c931e11e3df98119f1d2c64abc64083453ad0ab4
8481 Author: Alejandro Piñeiro <apinheiro@igalia.com>
8482 Date: Tue Jul 6 13:28:38 2010 +0200
8484 cally: Cleaning CallyText
8486 * Removing superfluous g_return_if_fail
8487 * Removing unused ClutterText::text-changed callback
8489 clutter/cally/cally-text.c | 18 ------------------
8490 1 file changed, 18 deletions(-)
8492 commit 137790bec9d4c29a4e5504ea49623884e90e3cca
8493 Author: Alejandro Piñeiro <apinheiro@igalia.com>
8494 Date: Tue Jul 6 13:25:44 2010 +0200
8496 cally: Refactoring "window:create" and "window:destroy" emission code
8498 Previously "window:create" and "window:destroy" were emitted on
8499 CallyUtil. Although it works, and CallyUtil already have callbacks to
8500 stage_added/removed signals, I think that it is more tidy/clear to do
8503 * CallyRoot already has code to manage ClutterStage addition/removal
8505 * In fact, we can see CallyRoot as the object exposing the a11y
8506 information from ClutterStageManager, so it fits better here.
8508 * CallyUtil callbacks these signals are related to key event
8509 listeners (key snooper simulation). One of the main CallyUtil
8510 responsabilities is managing event (connecting, emitting), so I
8511 would prefer to not start to add/mix more functionalities here.
8513 Ideally it would be better to emit all CallyStage methods from
8514 CallyStage, but it is clear that "create" and "destroy" are more easy
8515 to emit from a external object
8517 clutter/cally/cally-root.c | 2 ++
8518 clutter/cally/cally-util.c | 10 ----------
8519 2 files changed, 2 insertions(+), 10 deletions(-)
8521 commit ffd1f125604a2a25015804bcf2b8ebb6503fdd77
8522 Author: Alejandro Piñeiro <apinheiro@igalia.com>
8523 Date: Tue Jul 6 13:36:48 2010 +0200
8525 cally: Use proper backend information on CallyActor
8527 It uses HAVE_CLUTTER_GLX to check the current backend in use for
8528 some accessibility related methods.
8532 clutter/cally/cally-actor.c | 4 ++--
8533 clutter/cally/cally-util.c | 4 ----
8534 2 files changed, 2 insertions(+), 6 deletions(-)
8536 commit d45499f88b3b3fb4b7f5e95434677ad6710776ac
8537 Author: Alejandro Piñeiro <apinheiro@igalia.com>
8538 Date: Wed Jul 7 14:05:27 2010 +0200
8540 cally: Check HAVE_CONFIG_H on cally-util.c
8542 clutter/cally/cally-util.c | 17 +++++++++++++++++
8543 1 file changed, 17 insertions(+)
8545 commit 1dd174add37f5b5e118d3c7ce84019d33dfc9e8f
8546 Author: Robert Bragg <robert@linux.intel.com>
8547 Date: Wed Jul 7 14:41:54 2010 +0100
8549 framebuffer: Replace CoglHandle with CoglFramebuffer *
8551 One more object converted to stop using CoglHandle re:a8c8cbee513
8553 clutter/cogl/cogl/cogl-clip-state.c | 16 ++--
8554 clutter/cogl/cogl/cogl-framebuffer-private.h | 33 +++----
8555 clutter/cogl/cogl/cogl-framebuffer.c | 121 +++++++++++---------------
8556 clutter/cogl/cogl/cogl-journal.c | 2 +-
8557 clutter/cogl/cogl/cogl-texture.c | 2 +-
8558 clutter/cogl/cogl/cogl.c | 2 +-
8559 clutter/cogl/cogl/cogl.h | 22 ++---
8560 7 files changed, 88 insertions(+), 110 deletions(-)
8562 commit 9b9e764dc1dcc2025e3cabb63ea118fa37ed373d
8563 Author: Robert Bragg <robert@linux.intel.com>
8564 Date: Tue Jul 6 20:18:26 2010 +0100
8566 material: route fogging state through CoglMaterial
8568 Previously cogl_set_fog would cause a flush of the Cogl journal and
8569 would directly bang the GL state machine to setup fogging. As part of
8570 the ongoing effort to track most state in CoglMaterial to support
8571 renderlists this now adds an indirection so that cogl_set_fog now just
8572 updates ctx->legacy_fog_state. The fogging state then gets enabled as a
8573 legacy override similar to how the old depth testing API is handled.
8575 clutter/cogl/cogl/cogl-context.c | 3 +-
8576 clutter/cogl/cogl/cogl-context.h | 3 +-
8577 clutter/cogl/cogl/cogl-material-arbfp.c | 2 +-
8578 clutter/cogl/cogl/cogl-material-fixed.c | 48 ++++++++++++++++++++++
8579 clutter/cogl/cogl/cogl-material-private.h | 20 ++++++++--
8580 clutter/cogl/cogl/cogl-material.c | 62 +++++++++++++++++++++++++++++
8581 clutter/cogl/cogl/cogl.c | 54 +++++--------------------
8582 7 files changed, 143 insertions(+), 49 deletions(-)
8584 commit 279e68d8d9a84356c83e32502c5bc5af5160da08
8585 Author: Robert Bragg <robert@linux.intel.com>
8586 Date: Tue Jul 6 16:47:09 2010 +0100
8588 osx: explicitly request depth and stencil buffer bits
8590 This is a blind patch because I don't know enough about the osx backend
8591 and the osx backend probably doesn't even work these days anyway but
8592 since people have filed bugs specifically on OSX that imply they don't
8593 have a depth or stencil buffer this tries to fix that.
8595 Maybe someone will eventually pick up the osx backend again and verify
8598 http://bugzilla.clutter-project.org/show_bug.cgi?id=1394
8600 clutter/osx/clutter-backend-osx.c | 2 ++
8601 1 file changed, 2 insertions(+)
8603 commit 2e0d2cf055050c0dd27841e639a4c98cd182919f
8604 Author: Robert Bragg <robert@linux.intel.com>
8605 Date: Tue Jul 6 01:21:43 2010 +0100
8607 cogl-buffer: Move malloc fallback logic into CoglBuffer
8609 Since we'll want to share the fallback logic with CoglVertexArray this
8610 moves the malloc based fallback (for when OpenGL doesn't support vertex
8611 or pixel buffer objects) into cogl-buffer.c.
8613 clutter/cogl/cogl/cogl-buffer-private.h | 9 +-
8614 clutter/cogl/cogl/cogl-buffer.c | 201 ++++++++++++++++++++++++++-----
8615 clutter/cogl/cogl/cogl-pixel-array.c | 183 ++--------------------------
8616 3 files changed, 182 insertions(+), 211 deletions(-)
8618 commit 2353aa56eacbe13f1024cc066a129615e10583d3
8619 Author: Robert Bragg <robert@linux.intel.com>
8620 Date: Mon Jul 5 23:32:55 2010 +0100
8622 cogl-buffer: consider it an error to free a mapped buffer
8624 Explicitly warn if we detect that a CoglBuffer is being freed while it
8625 is still mapped. Previously we silently unmapped the buffer, but it's
8626 not something we want to encourage.
8628 clutter/cogl/cogl/cogl-buffer.c | 3 +--
8629 clutter/cogl/cogl/cogl-buffer.h | 3 ++-
8630 2 files changed, 3 insertions(+), 3 deletions(-)
8632 commit 429d7cf696a19181cfd7408344803b757b331b69
8633 Author: Robert Bragg <robert@linux.intel.com>
8634 Date: Mon Jul 5 23:24:34 2010 +0100
8636 cogl-buffer: Track the last used bind target in CoglBuffer
8638 This makes CoglBuffer track the last used bind target as a private
8639 property. This is later used when binding a buffer to map instead of
8640 always using the PIXEL_UNPACK target.
8642 This also adds some additional sanity checks that code doesn't try to
8643 nest binds to the same target or bind a buffer to multiple targets at
8646 clutter/cogl/cogl/cogl-buffer-private.h | 23 ++++++-
8647 clutter/cogl/cogl/cogl-buffer.c | 86 +++++++++++++++++++++-----
8648 clutter/cogl/cogl/cogl-context.c | 6 +-
8649 clutter/cogl/cogl/cogl-context.h | 4 +-
8650 clutter/cogl/cogl/cogl-pixel-array-private.h | 1 -
8651 clutter/cogl/cogl/cogl-pixel-array.c | 35 ++++++-----
8652 clutter/cogl/cogl/cogl-texture.c | 5 +-
8653 7 files changed, 121 insertions(+), 39 deletions(-)
8655 commit 551945ce6cc1438eec0b304cb9dc0a1b730bdb7e
8656 Author: Robert Bragg <robert@linux.intel.com>
8657 Date: Wed Jul 7 13:38:10 2010 +0100
8659 tests: Force X synchronization so the stage size is reliable
8661 Normally the asynchronous nature of X means that setting the clutter
8662 stage size may really happen an indefinite amount of time later but
8663 since the tests are so short lived and may only render a single frame
8664 this is not an acceptable semantic.
8666 This way we should be able to remove all the hacky sleeps and frame
8667 count delays from our tests.
8669 tests/conform/test-conform-common.c | 17 +++++++++++++++++
8670 1 file changed, 17 insertions(+)
8672 commit b24c96189df25df19a164cd477ea634cf41b45d9
8673 Author: Robert Bragg <robert@linux.intel.com>
8674 Date: Wed Jul 7 13:31:35 2010 +0100
8676 tests: no longer clean up state between tests
8678 Since we now run every test in a separate process there is no need to
8679 try and avoid state leakage between tests. This removes the code to
8680 cleanup all children of the stage and disconnect handlers from the
8681 stage paint signal. We now explicitly print a warning if the users tries
8682 to run multiple tests in one process.
8684 tests/conform/test-conform-common.c | 43 ++++++++---------------------------
8685 1 file changed, 9 insertions(+), 34 deletions(-)
8687 commit 3570852b02fb7a26919bf50cbad1bc76dd4d2be7
8688 Author: Robert Bragg <robert@linux.intel.com>
8689 Date: Tue Jul 6 02:01:24 2010 +0100
8691 cogl: expose the semantic differences of gl/gles2 npot textures
8693 This adds three new feature flags COGL_FEATURE_TEXTURE_NPOT_BASIC,
8694 COGL_FEATURE_TEXTURE_NPOT_MIPMAP and COGL_FEATURE_TEXTURE_NPOT_REPEAT
8695 that can tell you if your hardware supports non power of two textures,
8696 npot textures + mipmaps and npot textures + wrap modes other than
8699 The pre-existing COGL_FEATURE_TEXTURE_NPOT feature implies all of the
8702 By default GLES 2 core supports npot textures but mipmaps and repeat
8703 modes can only be used with power of two textures. This patch also makes
8704 GLES check for the GL_OES_texture_npot extension to determine if mipmaps
8705 and repeating are supported with npot textures.
8707 clutter/cogl/cogl/cogl-types.h | 21 ++++++++++++++++++--
8708 clutter/cogl/cogl/driver/gl/cogl.c | 5 ++++-
8709 .../cogl/cogl/driver/gles/cogl-feature-functions.h | 10 ++++++++++
8710 clutter/cogl/cogl/driver/gles/cogl.c | 3 +++
8711 4 files changed, 36 insertions(+), 3 deletions(-)
8713 commit 9e5a18fea435a46dd57c53e8e8e0fab867a5bb92
8714 Author: Elliot Smith <elliot.smith@intel.com>
8715 Date: Tue Jul 6 17:14:22 2010 +0100
8717 cookbook: Fixed typo
8719 Removed stray 'd' character.
8721 doc/cookbook/actors.xml | 2 +-
8722 1 file changed, 1 insertion(+), 1 deletion(-)
8724 commit 7c67903a44d8bfdd188a1d8fddbfdd67025d2f48
8725 Author: Elliot Smith <elliot.smith@intel.com>
8726 Date: Tue Jul 6 16:22:47 2010 +0100
8728 cookbook: Fix build so CSS files get installed
8730 I had changed the build so CSS files get put into
8731 the HTML build directory; but done it in such
8732 a way that they were then being ignored during
8733 install. Fixed this.
8735 doc/cookbook/Makefile.am | 3 ++-
8736 1 file changed, 2 insertions(+), 1 deletion(-)
8738 commit e566c56bd14157e496e741e095961ce2babaf6a2
8739 Author: Elliot Smith <elliot.smith@intel.com>
8740 Date: Tue Jul 6 16:11:46 2010 +0100
8742 cookbook: Moved paragraph where it logically belongs
8744 There was a note about constants for keys and
8745 where they are defined in Clutter header files; but
8746 the sentence about where key modifiers are defined
8747 was outside the note. Logically, they belong
8750 doc/cookbook/events.xml | 26 ++++++++++++++------------
8751 1 file changed, 14 insertions(+), 12 deletions(-)
8753 commit 03b19af38ecbf7f51188317c20a368ef24cb448f
8754 Author: Elliot Smith <elliot.smith@intel.com>
8755 Date: Tue Jul 6 16:09:58 2010 +0100
8757 cookbook: Added some judicious note elements
8759 In some cases, there were blocks of text which
8760 were really asides/interrupts to the flow, but
8761 which weren't explicitly marked as such. I fixed
8762 them by turning them into <note> blocks.
8764 doc/cookbook/events.xml | 4 ++--
8765 doc/cookbook/textures.xml | 4 ++--
8766 2 files changed, 4 insertions(+), 4 deletions(-)
8768 commit 9a609cf629dd1251a9e995b02c43512dff2b5b39
8769 Author: Elliot Smith <elliot.smith@intel.com>
8770 Date: Tue Jul 6 16:08:43 2010 +0100
8772 cookbook: Added more information for contributors
8774 Suggested use of <note> element for adding detail
8775 or asides which would otherwise interrupt the
8778 doc/cookbook/clutter-cookbook.xml.in | 4 ++++
8779 1 file changed, 4 insertions(+)
8781 commit 15331d3a0106c8087ab2dceccb744b0857e91e09
8782 Author: Elliot Smith <elliot.smith@intel.com>
8783 Date: Tue Jul 6 16:04:46 2010 +0100
8785 cookbook: Link out to docbook site
8787 Corrected the link on the word Docbook, as it
8788 was an internal <link> rather than an external
8791 doc/cookbook/clutter-cookbook.xml.in | 2 +-
8792 1 file changed, 1 insertion(+), 1 deletion(-)
8794 commit c108a32c30b31790e92dde0bb9bd06c8ed8bc3d7
8795 Author: Elliot Smith <elliot.smith@intel.com>
8796 Date: Tue Jul 6 16:00:33 2010 +0100
8798 cookbook: Made docbook element usage consistent
8800 Made usage of docbook elements consistent across
8801 recipes; to ensure the conventions are kept by others,
8802 added a section about how to write and style recipes.
8804 doc/cookbook/actors.xml | 22 ++++----
8805 doc/cookbook/clutter-cookbook.xml.in | 57 ++++++++++++++++++--
8806 doc/cookbook/events.xml | 97 +++++++++++++++++++---------------
8807 doc/cookbook/textures.xml | 93 +++++++++++++++++---------------
8808 4 files changed, 172 insertions(+), 97 deletions(-)
8810 commit fe7385cb7d011ade2394b465a12fb4c89a98ad79
8811 Author: Elliot Smith <elliot.smith@intel.com>
8812 Date: Tue Jul 6 15:42:32 2010 +0100
8814 cookbook: Additional selectors in CSS stylesheet
8816 Added some selectors for docbook element types
8817 [properties and types], so those elements can be used in recipes
8819 doc/common/style.css | 34 +++++++++++++++++++---------------
8820 1 file changed, 19 insertions(+), 15 deletions(-)
8822 commit dfe7c554fd6f8d5cf1d5217c7c67b17148e3f145
8823 Author: Elliot Smith <elliot.smith@intel.com>
8824 Date: Tue Jul 6 15:34:19 2010 +0100
8826 cookbook: Copy the CSS file into the HTML build directory
8828 This makes local testing easier, as you can see what the
8829 cookbook will look like when installed.
8831 doc/cookbook/Makefile.am | 2 +-
8832 1 file changed, 1 insertion(+), 1 deletion(-)
8834 commit ced7915ea1977bd9d9aa2a70f54f1f2f774ed567
8835 Author: Neil Roberts <neil@linux.intel.com>
8836 Date: Tue Jul 6 16:08:06 2010 +0100
8838 cogl-vertex-buffer: Fix the #define for glDisableVertexAttribArray
8840 glDisableVertexAttribArray was defined to glEnableVertexAttribArray so
8841 it would probably cause crashes if it was ever used. Presumably
8842 nothing is using these yet because the generic attributes are not yet
8843 tied to shader attributes in a predictable way.
8845 clutter/cogl/cogl/cogl-vertex-buffer.c | 2 +-
8846 1 file changed, 1 insertion(+), 1 deletion(-)
8848 commit 6757f41c861481540cbea86dd624860645df0ff1
8849 Author: Robert Bragg <robert@linux.intel.com>
8850 Date: Tue Jul 6 14:23:40 2010 +0100
8852 configure: Improves GLES 1.x checks
8854 We now always aim to use pkg-config based configuration when possible,
8855 but when not configure.ac now knows the difference between GLES_CM
8856 libraries that contain EGL symbols (I.e. a separate EGL library doesn't
8857 need to be found) and GLESv1_CM libraries that don't contain EGL
8860 http://bugzilla.clutter-project.org/show_bug.cgi?id=2160
8862 configure.ac | 92 +++++++++++++++++++++++++++++++---------------------------
8863 1 file changed, 50 insertions(+), 42 deletions(-)
8865 commit 5cb4e0c5d002809afbce93f477ba968979f0c5be
8866 Author: Øyvind Kolås <pippin@linux.intel.com>
8867 Date: Tue Jul 6 14:26:07 2010 +0100
8869 test-state: fix test for state count after state removal
8871 In the .json file used for the test, there is no null -> "base"
8872 transition defined only a "clicked" -> "base", when the "clicked" state
8873 is removed the "base" state will also disappear.
8875 tests/conform/test-state.c | 6 +++++-
8876 1 file changed, 5 insertions(+), 1 deletion(-)
8878 commit 290038ee683d3672b68a063903483440f02407a8
8879 Author: Øyvind Kolås <pippin@linux.intel.com>
8880 Date: Tue Jul 6 13:38:16 2010 +0100
8882 animator: fix removal of multiple keys
8884 When removing keys, sometimes a couple of keys would be remaining.
8886 clutter/clutter-animator.c | 11 ++++++-----
8887 1 file changed, 6 insertions(+), 5 deletions(-)
8889 commit ec05230b97a9b683620af1c84c823eb7d161b64c
8890 Author: Øyvind Kolås <pippin@linux.intel.com>
8891 Date: Tue Jul 6 13:47:49 2010 +0100
8893 state: added clutter_state_key_get_property_type
8895 A function to retrieve the type of the value stored in a key, the
8896 equivalent already exists for ClutterAnimator.
8898 clutter/clutter-state.c | 22 ++++++++++++++++++++++
8899 clutter/clutter-state.h | 1 +
8900 doc/reference/clutter/clutter-sections.txt | 17 +++++++++--------
8901 3 files changed, 32 insertions(+), 8 deletions(-)
8903 commit 6d1f697bc42d87e2cdbcdc3cfef91bf98a485b84
8904 Author: Øyvind Kolås <pippin@linux.intel.com>
8905 Date: Tue Jul 6 13:34:22 2010 +0100
8907 state: automatically remove unused states
8909 When there is no further keys with a state as the target state, remove
8910 the state (and all transitions that used this state as a target)
8912 clutter/clutter-state.c | 24 ++++++++++++++----------
8913 tests/conform/test-state.c | 22 ++++++++++++++++++++++
8914 2 files changed, 36 insertions(+), 10 deletions(-)
8916 commit 140f76abf44594dc6b004b381e3ec24b6ecdc208
8917 Author: Alexandros Frantzis <alexandros.frantzis@linaro.org>
8918 Date: Tue Jul 6 13:24:00 2010 +0100
8920 build: Exclude built sources from the dist
8922 http://bugzilla.clutter-project.org/show_bug.cgi?id=2169
8924 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
8926 clutter/cogl/cogl/Makefile.am | 8 ++++----
8927 1 file changed, 4 insertions(+), 4 deletions(-)
8929 commit 1860d45087f85a956e21ce69631b9a1cf0e7436f
8930 Author: Damien Lespiau <damien.lespiau@intel.com>
8931 Date: Sun Jun 6 22:47:02 2010 +0100
8933 build: Allow to run the tests from any directory
8935 I was fed up to cd into the tests/conform or tests/interactive directories
8936 to launch a specific test. Now, with the power the abs_ variants of
8937 builddir and srcdir we can run specific test from any directory.
8939 http://bugzilla.clutter-project.org/show_bug.cgi?id=2159
8942 tests/conform/.gitignore | 1 +
8943 tests/conform/Makefile.am | 6 ++++--
8944 tests/conform/test-launcher.sh | 25 -------------------------
8945 tests/conform/test-launcher.sh.in | 25 +++++++++++++++++++++++++
8946 tests/interactive/.gitignore | 1 +
8947 tests/interactive/Makefile.am | 8 +++++---
8948 tests/interactive/wrapper.sh | 15 ---------------
8949 tests/interactive/wrapper.sh.in | 15 +++++++++++++++
8950 9 files changed, 53 insertions(+), 45 deletions(-)
8952 commit 739240095ff62a69b6cb34cdee4243fa258e5382
8953 Author: Robert Bragg <robert@linux.intel.com>
8954 Date: Tue Jul 6 01:30:25 2010 +0100
8956 debug: Adds a COGL_DEBUG=disable-pbos debug option
8958 For testing purposes, either to identify bugs in Cogl or the driver or
8959 simulate lack of PBO support COGL_DEBUG=disable-pbos can be used to
8960 fallback to malloc instead.
8962 clutter/cogl/cogl/cogl-debug.c | 2 ++
8963 clutter/cogl/cogl/cogl-debug.h | 9 +++++----
8964 clutter/cogl/cogl/cogl.c | 3 +++
8965 3 files changed, 10 insertions(+), 4 deletions(-)
8967 commit b4b98358e191f31acb73d773fdd9a8a4b72f3292
8968 Author: Robert Bragg <robert@linux.intel.com>
8969 Date: Sat Jul 3 19:05:04 2010 +0100
8971 pango-render: set CLAMP_TO_EDGE wrap mode on glyph_material
8973 The pango renderer was causing lots of override materials to be allocated
8974 because the vertex_buffer API converts AUTOMATIC mode into REPEAT for
8975 backwards compatibility. By explicitly setting the wrap mode to
8976 CLAMP_TO_EDGE when creating the glyph_material then the vertex_buffer
8977 API will leave it untouched.
8979 clutter/cogl/pango/cogl-pango-render.c | 2 ++
8980 1 file changed, 2 insertions(+)
8982 commit 82ba7220afcb03f87606a0a8800eb067f0962724
8983 Author: Robert Bragg <robert@linux.intel.com>
8984 Date: Mon Jul 5 16:14:00 2010 +0100
8986 pixel-array: Allow passing of hints to cogl_buffer_map
8988 This allows you to tell Cogl that you are planning to replace all the
8989 buffer's data once it is mapped with cogl_buffer_map. This means if the
8990 buffer is currently being accessed by the GPU then the driver doesn't
8991 have to stall and wait for it to finish before it can access it from the
8992 CPU and can instead potentially allocate a new buffer with undefined
8995 clutter/cogl/cogl/cogl-buffer-private.h | 3 ++-
8996 clutter/cogl/cogl/cogl-buffer.c | 8 ++++---
8997 clutter/cogl/cogl/cogl-buffer.h | 36 ++++++++++++++++++++++++++++---
8998 clutter/cogl/cogl/cogl-pixel-array.c | 9 +++++---
8999 tests/conform/test-cogl-pixel-buffer.c | 4 +++-
9000 5 files changed, 49 insertions(+), 11 deletions(-)
9002 commit 0273b13d757ad968e29579e283aaf5c54a0e016c
9003 Author: Robert Bragg <robert@linux.intel.com>
9004 Date: Mon Jul 5 19:49:35 2010 +0100
9006 test-cogl-pixel-array: fix how data is initialized
9008 There was a missing '* 4' and '* i' in the for() loops that initialized
9009 the first test buffer, so it was containing uninitialized data causing
9012 tests/conform/test-cogl-pixel-buffer.c | 4 ++--
9013 1 file changed, 2 insertions(+), 2 deletions(-)
9015 commit fb79b0c14e20849de5a5d95fd7eab45f763843ef
9016 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9017 Date: Tue Jul 6 11:57:16 2010 +0100
9019 moduleset: Update cairo and pixman versions
9021 The gtk+ we use for clutter-gtk depends on a new version of Cairo.
9023 build/clutter.modules | 14 +++++++-------
9024 1 file changed, 7 insertions(+), 7 deletions(-)
9026 commit aa8ffef5439553f9e06e776285fc58e42d497c84
9027 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9028 Date: Tue Jul 6 11:42:08 2010 +0100
9030 moduleset: Remove libXft
9032 The system one should be enough.
9034 build/clutter.modules | 2 ++
9035 1 file changed, 2 insertions(+)
9037 commit a63eb10855a94426ecd53cc9888f08b1ced1cede
9038 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9039 Date: Mon Jul 5 15:10:42 2010 +0100
9041 docs: Fix Cally documentation
9043 clutter/cally/cally-actor.c | 64 +++++++++++++++++++++++----------------
9044 clutter/cally/cally-clone.c | 43 ++++++++++++++++++++++++--
9045 clutter/cally/cally-group.c | 19 ++++++++++--
9046 clutter/cally/cally-rectangle.c | 4 +--
9047 clutter/cally/cally-root.c | 11 +++----
9048 clutter/cally/cally-stage.c | 5 +--
9049 clutter/cally/cally-text.c | 4 +--
9050 clutter/cally/cally-texture.c | 5 +--
9051 8 files changed, 109 insertions(+), 46 deletions(-)
9053 commit 09c6553f0dd086413ce80c17eec05665a6ea03d3
9054 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9055 Date: Mon Jul 5 14:43:18 2010 +0100
9057 cally: Clean up the headers
9059 Make Cally follow the single-include header file policy of Clutter and
9060 Cogl; this means making cally.h the single include header, and requires
9061 a new cally-main.h file for the functions defined by cally.h.
9065 • clean up the licensing notice and remove the FSF address;
9067 • document the object structures (instance and class);
9069 • G_GNUC_CONST-ify the get_type() functions;
9071 • reduce the padding for CallyActor sub-classes;
9073 • reduce the amount of headers included.
9075 clutter/cally/Makefile.am | 3 +-
9076 clutter/cally/cally-actor-private.h | 11 +++++---
9077 clutter/cally/cally-actor.c | 11 ++++----
9078 clutter/cally/cally-actor.h | 45 +++++++++++++++++++++++------
9079 clutter/cally/cally-clone.h | 35 +++++++++++++++++------
9080 clutter/cally/cally-group.h | 34 +++++++++++++++++-----
9081 clutter/cally/cally-main.h | 39 ++++++++++++++++++++++++++
9082 clutter/cally/cally-rectangle.h | 35 +++++++++++++++++------
9083 clutter/cally/cally-root.h | 32 ++++++++++++++++-----
9084 clutter/cally/cally-stage.h | 34 +++++++++++++++++-----
9085 clutter/cally/cally-text.c | 6 ++++
9086 clutter/cally/cally-text.h | 53 ++++++++++++++++++++++++-----------
9087 clutter/cally/cally-texture.h | 35 +++++++++++++++++------
9088 clutter/cally/cally-util.h | 31 ++++++++++++++++----
9089 clutter/cally/cally.c | 7 +++++
9090 clutter/cally/cally.h | 29 +++++++++++--------
9091 clutter/cally/cally.pc.in | 8 +++---
9092 doc/reference/cally/Makefile.am | 2 +-
9093 18 files changed, 346 insertions(+), 104 deletions(-)
9095 commit da4dbbb9260fcbe3a142e0287a6b3b2ea90420ff
9096 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9097 Date: Mon Jul 5 14:00:29 2010 +0100
9099 Add binaries of the Cally examples to the ignore file
9101 tests/accessibility/.gitignore | 5 +++++
9102 1 file changed, 5 insertions(+)
9104 commit e0a1f20ca2a0c38015acde9d1e77fa8c3e484a6c
9105 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9106 Date: Mon Jul 5 13:59:36 2010 +0100
9108 docs: Add Cally API reference
9112 doc/reference/Makefile.am | 2 +-
9113 doc/reference/cally/Makefile.am | 87 ++++++++++++++++
9114 doc/reference/cally/cally-docs.xml.in | 130 ++++++++++++++++++++++++
9115 doc/reference/cally/cally-sections.txt | 174 ++++++++++++++++++++++++++++++++
9116 doc/reference/cally/cally.types | 9 ++
9117 doc/reference/clutter/Makefile.am | 3 +-
9118 8 files changed, 419 insertions(+), 2 deletions(-)
9120 commit e110b3569446b3c950273c69651e9aaed21e28a1
9121 Author: Alejandro Piñeiro <apinheiro@igalia.com>
9122 Date: Tue Apr 27 12:08:42 2010 +0200
9124 Avoid to load cally module on a11y examples
9126 As cally is being integrated on clutter is not required to load
9127 cally module anymore. Anyway, it is still required to load
9128 the atk bridge by hand. The current way to load it could change
9129 in the future, more information here:
9131 https://bugzilla.gnome.org/show_bug.cgi?id=612599
9132 https://bugzilla.gnome.org/show_bug.cgi?id=619946
9134 Part [4/4] of CB#2099
9136 tests/accessibility/cally-examples-util.c | 80 ++---------------------------
9137 1 file changed, 3 insertions(+), 77 deletions(-)
9139 commit 790d2165f3178cc947455acfd08d42dcafdbdd02
9140 Author: Alejandro Piñeiro <apinheiro@igalia.com>
9141 Date: Mon Apr 26 20:07:22 2010 +0200
9143 Add accessibility tests
9145 http://bugzilla.clutter-project.org/show_bug.cgi?id=2099
9147 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
9150 tests/Makefile.am | 2 +-
9152 tests/accessibility/Makefile.am | 61 +++++
9153 tests/accessibility/cally-atkcomponent-example.c | 102 ++++++++
9154 .../accessibility/cally-atkeditabletext-example.c | 270 ++++++++++++++++++++
9155 tests/accessibility/cally-atkevents-example.c | 180 +++++++++++++
9156 tests/accessibility/cally-atktext-example.c | 212 +++++++++++++++
9157 tests/accessibility/cally-clone-example.c | 112 ++++++++
9158 tests/accessibility/cally-examples-util.c | 216 ++++++++++++++++
9159 tests/accessibility/cally-examples-util.h | 24 ++
9160 11 files changed, 1182 insertions(+), 1 deletion(-)
9162 commit 8f8e88b692b04fc8cf1949fa1b98c7ae47846a90
9163 Author: Alejandro Piñeiro <apinheiro@igalia.com>
9164 Date: Mon Apr 26 19:33:49 2010 +0200
9166 Initialize accessibility support on clutter_init
9168 Initialize the accessibility support calling cally_accessibility_init
9170 Take into account that this is required to at least be sure that
9171 CallyUtil class is available.
9173 It also modifies cally_accessibility_module_init in order to return
9174 if the initialization was fine (and the name, removing the module word).
9176 It also removes the gnome accessibility hooks, as it is not anymore
9181 clutter/cally/cally.c | 64 +++++++++++++++++++++++++-----------------------
9182 clutter/cally/cally.h | 11 +++------
9183 clutter/clutter-main.c | 27 ++++++++++++++++++++
9184 clutter/clutter-main.h | 1 +
9185 4 files changed, 65 insertions(+), 38 deletions(-)
9187 commit 774541d71e2518f03bc4fdfb7ad481077a9b0dcb
9188 Author: Alejandro Piñeiro <apinheiro@igalia.com>
9189 Date: Tue Jun 15 13:45:19 2010 +0200
9191 Rename some methods and includes to avoid -Wshadow warnings
9193 http://bugzilla.clutter-project.org/show_bug.cgi?id=2097
9195 clutter/cally/cally-actor.c | 5 ++---
9196 clutter/cally/cally-util.c | 14 +++++++-------
9197 2 files changed, 9 insertions(+), 10 deletions(-)
9199 commit 72da871c0a918a33b742f3353c73c2e984c46f57
9200 Author: Alejandro Piñeiro <apinheiro@igalia.com>
9201 Date: Mon Jun 14 18:05:57 2010 +0200
9203 Cally initialization code
9205 This commit includes a method to init the a11y support. Two main purposes:
9207 * Register the different Atk factories.
9208 * Ensure that there are a AtkUtil implementation class available.
9212 clutter/cally/cally.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++
9213 clutter/cally/cally.h | 40 +++++++++++++++++++++
9214 2 files changed, 133 insertions(+)
9216 commit c0f753d108b7a2ad23dbf5a5b596f80175442927
9217 Author: Alejandro Piñeiro <apinheiro@igalia.com>
9218 Date: Mon Jun 14 13:38:25 2010 +0200
9222 The Clutter Accessibility Library is an implementation of the ATK,
9223 the Accessibility Toolkit, which exposes Clutter actors to accessibility
9224 tools. This allows not only writing accessible user interfaces, but also
9225 allows testing and verification frameworks based on A11Y technologies to
9226 inspect and test a Clutter scene graph.
9228 http://bugzilla.clutter-project.org/show_bug.cgi?id=2097
9230 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
9232 clutter/Makefile.am | 10 +-
9233 clutter/cally/Makefile.am | 79 ++
9234 clutter/cally/cally-actor-private.h | 35 +
9235 clutter/cally/cally-actor.c | 1491 +++++++++++++++++++++++++++++++++++
9236 clutter/cally/cally-actor.h | 108 +++
9237 clutter/cally/cally-clone.c | 105 +++
9238 clutter/cally/cally-clone.h | 63 ++
9239 clutter/cally/cally-factory.h | 91 +++
9240 clutter/cally/cally-group.c | 138 ++++
9241 clutter/cally/cally-group.h | 65 ++
9242 clutter/cally/cally-rectangle.c | 102 +++
9243 clutter/cally/cally-rectangle.h | 63 ++
9244 clutter/cally/cally-root.c | 273 +++++++
9245 clutter/cally/cally-root.h | 64 ++
9246 clutter/cally/cally-stage.c | 258 ++++++
9247 clutter/cally/cally-stage.h | 62 ++
9248 clutter/cally/cally-text.c | 1255 +++++++++++++++++++++++++++++
9249 clutter/cally/cally-text.h | 63 ++
9250 clutter/cally/cally-texture.c | 103 +++
9251 clutter/cally/cally-texture.h | 63 ++
9252 clutter/cally/cally-util.c | 557 +++++++++++++
9253 clutter/cally/cally-util.h | 61 ++
9254 clutter/cally/cally.pc.in | 18 +
9256 24 files changed, 5126 insertions(+), 3 deletions(-)
9258 commit b9c65510cbae99598bec271e78be9ae737af8e0e
9259 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9260 Date: Mon Jul 5 16:45:19 2010 +0100
9262 Update conformance Git ignore file
9264 tests/conform/.gitignore | 1 +
9265 1 file changed, 1 insertion(+)
9267 commit ae43fe9968d901524003b2d19e6d016d8715a6fd
9268 Author: Robert Bragg <robert@linux.intel.com>
9269 Date: Mon Jul 5 16:17:34 2010 +0100
9271 conform: don't reference old test_cogl_pixel_buffer symbol
9273 Since CoglPixelBuffer was renamed to CoglPixelArray the test entry point
9274 was also renamed to test_cogl_pixel_array, but mistakenly the
9275 corresponding test-conform-main.c change wasn't pushed at the same time.
9277 tests/conform/test-conform-main.c | 2 +-
9278 1 file changed, 1 insertion(+), 1 deletion(-)
9280 commit 3e03ba1e7e11d44f5afd290e0d6f1e7fe77f9786
9281 Author: Robert Bragg <robert@linux.intel.com>
9282 Date: Sat Jul 3 21:11:33 2010 +0100
9284 cogl-object: cogl_is_XYZ prototype should take void *
9286 This changes the cogl_is_XYZ function prototypes generated when using
9287 the COGL_OBJECT_DEFINE macro to take a void * argument instead of a
9288 CoglHandle argument.
9290 clutter/cogl/cogl/cogl-object-private.h | 2 +-
9291 1 file changed, 1 insertion(+), 1 deletion(-)
9293 commit 8a5aed36fe8e9cd57c4644653a8e7103ca946bc3
9294 Author: Robert Bragg <robert@linux.intel.com>
9295 Date: Sun Jul 4 00:49:31 2010 +0100
9297 pixel-array: Only allow allocation of arrays with a 2D size
9299 This removes cogl_pixel_array_new which just took a size in bytes.
9301 Without the image size and pixel format then the driver often doesn't
9302 have enough information to allocate optimal GPU memory that can be
9303 textured from directly. This is because GPUs often have ways to
9304 spatially alter the layout of a texture to improve cache access patterns
9305 which may require special alignment and padding dependant in the images
9306 width, height and bpp.
9308 Although currently we are limited by OpenGL because it doesn't let us
9309 pass on the width and height when allocating a PBO, the hope is that we
9310 can define a better extension at some point.
9312 clutter/cogl/cogl/cogl-pixel-array.c | 6 ++---
9313 clutter/cogl/cogl/cogl-pixel-array.h | 16 --------------
9314 tests/conform/test-cogl-pixel-buffer.c | 38 ++++++++++++++++++--------------
9315 3 files changed, 24 insertions(+), 36 deletions(-)
9317 commit cfef390d87076454195d6b2288cb7fa9c17acf4b
9318 Author: Robert Bragg <robert@linux.intel.com>
9319 Date: Sun Jul 4 00:45:12 2010 +0100
9321 pixel-array: rename new_from_size to new_with_size
9323 It is more in keeping with other coding conventions in Cogl to use new
9324 "with" size instead of new "from" size.
9326 clutter/cogl/cogl/cogl-pixel-array.c | 8 ++++----
9327 clutter/cogl/cogl/cogl-pixel-array.h | 12 ++++++------
9328 2 files changed, 10 insertions(+), 10 deletions(-)
9330 commit 8ae0478850461285fa8e2d493a79fccd6c94c7fb
9331 Author: Robert Bragg <robert@linux.intel.com>
9332 Date: Sun Jul 4 00:18:10 2010 +0100
9334 cogl-buffer-private.h: cleanup up the coding style
9336 This file was following the Clutter coding style of arranging prototypes
9337 into columns which Cogl doesn't copy.
9339 clutter/cogl/cogl/cogl-buffer-private.h | 42 ++++++++++++++++++-------------
9340 1 file changed, 25 insertions(+), 17 deletions(-)
9342 commit 54f4a3a7526bf0b0a188ae1c865ed64581395507
9343 Author: Robert Bragg <robert@linux.intel.com>
9344 Date: Sat Jul 3 23:46:03 2010 +0100
9346 rename CoglPixelBuffer to CoglPixelArray
9348 This renames CoglPixelBuffer to CoglPixelArray to be consistent with the
9349 new CoglVertexArray API.
9351 clutter/cogl/cogl/Makefile.am | 6 +-
9352 clutter/cogl/cogl/cogl-buffer.c | 2 +-
9353 clutter/cogl/cogl/cogl-pixel-array-private.h | 74 ++++++
9354 clutter/cogl/cogl/cogl-pixel-array.c | 324 +++++++++++++++++++++++++
9355 clutter/cogl/cogl/cogl-pixel-array.h | 147 +++++++++++
9356 clutter/cogl/cogl/cogl-pixel-buffer-private.h | 73 ------
9357 clutter/cogl/cogl/cogl-pixel-buffer.c | 323 ------------------------
9358 clutter/cogl/cogl/cogl-pixel-buffer.h | 146 -----------
9359 clutter/cogl/cogl/cogl-texture.c | 14 +-
9360 clutter/cogl/cogl/cogl.h | 2 +-
9361 tests/conform/test-cogl-pixel-buffer.c | 24 +-
9362 11 files changed, 569 insertions(+), 566 deletions(-)
9364 commit 57341dbb607280410bcfaf19d09876570a966a3b
9365 Author: Robert Bragg <robert@linux.intel.com>
9366 Date: Sat Jul 3 21:30:33 2010 +0100
9368 cogl-buffer: make the COGL_BUFFER_USAGE_HINT private
9370 The usage hint should be implied by the CoglBuffer subclass type so the
9371 public getter and setter APIs for manually changing the usage hint of a
9372 CoglBuffer have now been removed.
9374 clutter/cogl/cogl/cogl-buffer-private.h | 9 +++++++
9375 clutter/cogl/cogl/cogl-buffer.c | 22 ----------------
9376 clutter/cogl/cogl/cogl-buffer.h | 44 -------------------------------
9377 tests/conform/test-cogl-pixel-buffer.c | 5 ----
9378 4 files changed, 9 insertions(+), 71 deletions(-)
9380 commit 7820842262a086d2075f7fc5c043a589a05e4825
9381 Author: Robert Bragg <robert@linux.intel.com>
9382 Date: Sat Jul 3 23:56:44 2010 +0100
9384 cogl-buffer: Handle subclass registration like cogl-texture
9386 Instead of having to extend cogl_is_buffer with new buffer types
9387 manually this now adds a new COGL_BUFFER_DEFINE macro to be used instead
9388 of COGL_OBJECT_DEFINE for CoglBuffer subclasses. This macro will
9389 automatically register the new type with ctx->buffer_types which will
9390 iterated by cogl_is_buffer. This is the same coding pattern used for
9393 clutter/cogl/cogl/cogl-buffer-private.h | 12 ++++++++++++
9394 clutter/cogl/cogl/cogl-buffer.c | 28 +++++++++++++++++++++++++---
9395 clutter/cogl/cogl/cogl-context.c | 2 ++
9396 clutter/cogl/cogl/cogl-context.h | 4 ++++
9397 clutter/cogl/cogl/cogl-pixel-buffer.c | 2 +-
9398 5 files changed, 44 insertions(+), 4 deletions(-)
9400 commit 90931e261fbfd75b52330817e5f28981303be3a6
9401 Author: Robert Bragg <robert@linux.intel.com>
9402 Date: Sat Jul 3 20:24:36 2010 +0100
9404 pixel-buffer: Replace CoglHandle with CoglPixelBuffer *
9406 One more file converted to stop using CoglHandle re:a8c8cbee513
9408 clutter/cogl/cogl/cogl-buffer-private.h | 5 +++--
9409 clutter/cogl/cogl/cogl-pixel-buffer-private.h | 4 ++--
9410 clutter/cogl/cogl/cogl-pixel-buffer.c | 26 ++++++++++++-------------
9411 clutter/cogl/cogl/cogl-pixel-buffer.h | 18 +++++++++--------
9412 4 files changed, 28 insertions(+), 25 deletions(-)
9414 commit baacf2e707fced48d9dc658527f7b599ce609029
9415 Author: Robert Bragg <robert@linux.intel.com>
9416 Date: Fri Jul 2 18:04:45 2010 +0100
9418 cogl-material: Adds debug api to dump sparse material graph
9420 This adds a _cogl_debug_dump_materials_dot_file function that can be
9421 used to dump all the descendants of the default material to a file using
9422 the dot format which can then be converted to an image to visualize.
9424 clutter/cogl/cogl/cogl-material.c | 165 +++++++++++++++++++++++++++++++++++++
9425 1 file changed, 165 insertions(+)
9427 commit f3b75541c7b5c286911c6761e902e74bb39c6ed7
9428 Author: Robert Bragg <robert@linux.intel.com>
9429 Date: Sun Jul 4 02:44:37 2010 +0100
9431 cogl-vertex-buffer.h: #include <cogl/cogl-defines.h>
9433 cogl-vertex-buffer.h was assuming that the platforms GL headers had
9434 already been included but that shouldn't have to be the case.
9436 clutter/cogl/cogl/cogl-vertex-buffer.h | 1 +
9437 1 file changed, 1 insertion(+)
9439 commit ed232070837c77bfaf7c2c7f522bac73a80d2b63
9440 Author: Robert Bragg <robert@linux.intel.com>
9441 Date: Sat Jul 3 21:10:05 2010 +0100
9443 cogl-object-private.h: #include glib.h and cogl-types.h
9445 cogl-object-private.h was only working in places that had already
9446 included glib.h and cogl-types.h
9448 clutter/cogl/cogl/cogl-object-private.h | 3 +++
9449 1 file changed, 3 insertions(+)
9451 commit cf8e88768fcd98ccd9ebb9b080264eec882b2268
9452 Author: Robert Bragg <robert@linux.intel.com>
9453 Date: Sat Jul 3 18:44:47 2010 +0100
9455 material: don't keep extra ref on copy-on-write materials
9457 In _cogl_material_pre_change_notify if a material with descendants is
9458 modified then we create a new material that is a copy of the one being
9459 modified and reparent those descendants to the new material.
9461 This patch ensures we drop the reference we get from cogl_material_copy
9462 since we can rely on the descendants to keep the new material alive.
9464 clutter/cogl/cogl/cogl-material.c | 4 ++++
9465 1 file changed, 4 insertions(+)
9467 commit 70925a31949dee013a97ed6aff1f62e98b8f1076
9468 Author: Robert Bragg <robert@linux.intel.com>
9469 Date: Fri Jul 2 01:07:36 2010 +0100
9471 build: Fix GLES builds since the material backend split
9473 The commit to split the fragment processing backends out from
9474 cogl-material.c (3e1323a6362906a95) broke the GLES 1 and 2 builds the
9475 fix was to guard the code in each backend according to the
9476 COGL_MATERIAL_BACKEND_XYZ defines which are setup in
9477 cogl-material-private.h.
9479 clutter/cogl/cogl/cogl-material-arbfp.c | 7 ++++++-
9480 clutter/cogl/cogl/cogl-material-fixed.c | 7 ++++++-
9481 clutter/cogl/cogl/cogl-material-glsl.c | 7 ++++++-
9482 clutter/cogl/cogl/cogl-material-private.h | 2 ++
9483 4 files changed, 20 insertions(+), 3 deletions(-)
9485 commit 9313f44e67b131543e358fe8461e33a3d1210b2d
9486 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9487 Date: Fri Jul 2 17:48:19 2010 +0100
9489 docs: Add a cogl-paths section
9491 The path primitives have a specific section, now, and gtk-doc is loudly
9492 complaining about it being defined but not referenced.
9494 doc/reference/cogl/cogl-docs.xml.in | 1 +
9495 doc/reference/cogl/cogl-sections.txt | 6 ++++--
9496 2 files changed, 5 insertions(+), 2 deletions(-)
9498 commit 38941372bf09e0d36752ab8e9be626dc744bf847
9499 Author: Øyvind Kolås <pippin@linux.intel.com>
9500 Date: Fri Jul 2 16:44:54 2010 +0100
9502 state: rename property "target-state" to "state"
9504 This reduces the amount of typing, and should provide for more readable
9505 code for most uses of ClutterState.
9507 clutter/clutter-state.c | 80 +++++++++++------------
9508 clutter/clutter-state.h | 98 ++++++++++++++--------------
9509 doc/reference/clutter/clutter-sections.txt | 2 +-
9510 tests/interactive/test-state.c | 4 +-
9511 4 files changed, 91 insertions(+), 93 deletions(-)
9513 commit 25509e6a7b04be9b40c9fa0821901e88d4b7ec03
9514 Author: Neil Roberts <neil@linux.intel.com>
9515 Date: Fri Jul 2 16:19:48 2010 +0100
9517 Convert the ASCII art documentation in cogl-vertex-buffer to PNGs
9519 The documentation for cogl_vertex_buffer_indices_get_for_quads was
9520 using ugly ASCII art to draw the diagrams. These have now been
9521 replaced with PNG figures.
9523 clutter/cogl/cogl/cogl-vertex-buffer.h | 35 ++++++++++---------------
9524 doc/reference/cogl/Makefile.am | 4 +++
9525 doc/reference/cogl/quad-indices-order.png | Bin 0 -> 2620 bytes
9526 doc/reference/cogl/quad-indices-triangles.png | Bin 0 -> 8018 bytes
9527 4 files changed, 18 insertions(+), 21 deletions(-)
9529 commit 86500cd3d5bda3025da90105fb80127069e4ddef
9530 Author: Neil Roberts <neil@linux.intel.com>
9531 Date: Fri Jul 2 13:49:34 2010 +0100
9533 Add CoglMaterialWrapMode to the Cogl docs and fix docs for the getters
9535 CoglMaterialWrapMode was missing from the cogl-sections.txt file so it
9536 wasn't getting displayed. There were also no documented return values
9539 clutter/cogl/cogl/cogl-material.h | 4 ++++
9540 doc/reference/cogl/cogl-sections.txt | 1 +
9541 2 files changed, 5 insertions(+)
9543 commit 9338df438c0e9683e4eb9387d0897fc638b91a19
9544 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9545 Date: Fri Jul 2 11:38:22 2010 +0100
9547 align-constraint: Offset the position after the alignment factor
9549 Instead of aligning (pos + size), align on size alone, and then offset
9552 http://bugzilla.clutter-project.org/show_bug.cgi?id=2168
9554 clutter/clutter-align-constraint.c | 8 ++++----
9555 1 file changed, 4 insertions(+), 4 deletions(-)
9557 commit 884df17536a11c092880392232ecc7c5b71f39a7
9558 Author: Neil Roberts <neil@linux.intel.com>
9559 Date: Thu Jul 1 20:34:59 2010 +0100
9561 Fix building the tesselator code for GLES
9563 The tesselator code uses some defines that it expects to be in the GL
9564 headers such as GLAPI and GLAPIENTRY. These are used to mark the entry
9565 points as exportable on each platform. We don't really want the
9566 tesselator code to use these but we also don't want to modify the C
9567 files so instead they are #defined to be empty in the stub glu.h. That
9568 header is only included internally when building the tesselator/ files
9569 so it shouldn't affect the rest of Cogl.
9571 GLES also doesn't have a GLdouble type so we just #define this to be a
9574 clutter/cogl/cogl/cogl-path.c | 4 ++--
9575 clutter/cogl/cogl/tesselator/GL/glu.h | 14 ++++++++++++++
9576 clutter/cogl/cogl/tesselator/tesselator.h | 30 ++++++++++++++---------------
9577 3 files changed, 31 insertions(+), 17 deletions(-)
9579 commit c019ff241d472edba3d54f8e698ea1f80c26a651
9580 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9581 Date: Thu Jul 1 16:05:41 2010 +0100
9583 cookbook: Fix up the textures section
9585 doc/cookbook/textures.xml | 16 ++++++++--------
9586 1 file changed, 8 insertions(+), 8 deletions(-)
9588 commit da06f650df3366c3d342da32c4e04ac7c7efc66c
9589 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9590 Date: Thu Jul 1 15:59:15 2010 +0100
9592 cookbook: Fix examples
9594 doc/cookbook/actors.xml | 60 +++++++++++++++++++++++------------------------
9595 1 file changed, 29 insertions(+), 31 deletions(-)
9597 commit b74c722670bfa0e17c6fe9d51ec5afc614318a05
9598 Author: Neil Roberts <neil@linux.intel.com>
9599 Date: Thu Jul 1 15:27:03 2010 +0100
9601 cogl-material: Don't doubly ref the parent in cogl_material_copy
9603 cogl_material_copy was taking a reference on the original texture when
9604 making a copy. However it then calls _cogl_material_set_parent on the
9605 material which also takes a reference on the parent. The second
9606 reference is cleaned up whenever _cogl_material_unparent is called and
9607 this is also called by _cogl_material_free. However, it seems that
9608 nothing was cleaning up the first reference. I think the reference is
9609 entirely unnecessary so this patch removes it.
9611 clutter/cogl/cogl/cogl-material.c | 2 --
9612 1 file changed, 2 deletions(-)
9614 commit daf19205e0fe367acb6b79f240c2123156a13348
9615 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9616 Date: Thu Jul 1 14:09:37 2010 +0100
9618 align-constraint: Follow the position of the source
9620 The AlignConstraint update is using only the width/height of the source,
9621 but it should also take into account the position.
9623 Also, instead of using the ::notify signal, it should follow the
9624 BindConstraint, and switch to the ::allocation-changed signal, since
9625 it's less expensive (one emission instead of four notifications, one for
9626 each property we use).
9628 clutter/clutter-align-constraint.c | 30 +++++++++++++++++-------------
9629 1 file changed, 17 insertions(+), 13 deletions(-)
9631 commit b625d94362b69fcd4dee6dfa621429c5b07ff0ea
9632 Author: Robert Bragg <robert@linux.intel.com>
9633 Date: Thu Jul 1 12:21:25 2010 +0100
9635 cogl: don't include cogl-vector.h twice in cogl.h
9637 cogl-vector.h should only be included by cogl.h when
9638 COGL_ENABLE_EXPERIMENTAL_API is defined. This removes the unguarded
9641 clutter/cogl/cogl/cogl.h | 1 -
9642 1 file changed, 1 deletion(-)
9644 commit 5187804e13d43cc40cd255b58ef2425dbbba2b76
9645 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9646 Date: Thu Jul 1 12:17:01 2010 +0100
9648 cookbook: Clean up build
9650 Create two HTML versions of the cookbook:
9655 Use the online version of the DocBook XHTML XSL, and disable the PDF
9656 generation until we can restore it.
9659 doc/cookbook/Makefile.am | 28 ++++++++++++++++++----------
9660 2 files changed, 19 insertions(+), 10 deletions(-)
9662 commit 089b9b545e393848a0f8bce73d2a8468566d56c6
9663 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9664 Date: Thu Jul 1 11:29:46 2010 +0100
9666 cookbook: Split the cookbook chapters
9668 Use separate files, to avoid making the XML too big and uneditable.
9670 This breaks the PDF build.
9672 doc/cookbook/Makefile.am | 13 +-
9673 doc/cookbook/actors.xml | 260 +++++++
9674 doc/cookbook/animations.xml | 42 ++
9675 doc/cookbook/clutter-cookbook.xml.in | 1255 +---------------------------------
9676 doc/cookbook/events.xml | 337 +++++++++
9677 doc/cookbook/introduction.xml | 103 +++
9678 doc/cookbook/recipe-template.xml | 24 +
9679 doc/cookbook/textures.xml | 483 +++++++++++++
9680 8 files changed, 1270 insertions(+), 1247 deletions(-)
9682 commit 9c11538bee618c52809e936f7d218901a15d3d8b
9683 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9684 Date: Thu Jul 1 11:08:51 2010 +0100
9686 cookbook: Fix up the examples
9688 doc/cookbook/clutter-cookbook.xml.in | 56 +++++++++++++++++-----------------
9689 1 file changed, 28 insertions(+), 28 deletions(-)
9691 commit 534472a0d46688b660bac41f0a0f3797059d2be9
9692 Author: Robert Bragg <robert@linux.intel.com>
9693 Date: Wed Jun 30 18:06:04 2010 +0100
9695 cogl: declare experimental symbols consistently
9697 We had several different ways of exposing experimental API, in one case
9698 the symbols had no special suffix, in two other ways the symbols were
9699 given an _EXP suffix but in different ways.
9701 This makes all experimental API have an _EXP suffix which is handled
9702 using #defines in the header so the prototypes in the .c and .h files
9703 don't have the suffix.
9705 The documented reason for the suffix is so that anyone watching Cogl for
9706 ABI changes who sees symbols disappear will hopefully understand what's
9709 clutter/cogl/cogl/cogl-buffer.c | 32 ++++----
9710 clutter/cogl/cogl/cogl-buffer.h | 67 ++++------------
9711 clutter/cogl/cogl/cogl-pixel-buffer.c | 82 ++++----------------
9712 clutter/cogl/cogl/cogl-pixel-buffer.h | 47 ++++-------
9713 clutter/cogl/cogl/cogl-vector.h | 22 ++++++
9714 clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.h | 56 ++++---------
9715 6 files changed, 96 insertions(+), 210 deletions(-)
9717 commit 06710027485f1b836a2d143cf86c743eb913d9c3
9718 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9719 Date: Wed Jun 30 17:26:34 2010 +0100
9721 cookbook: Fix entity typo
9723 doc/cookbook/clutter-cookbook.xml.in | 2 +-
9724 1 file changed, 1 insertion(+), 1 deletion(-)
9726 commit 54aa553d0f691268346657fd661450ed9bf8845a
9727 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9728 Date: Wed Jun 30 17:18:15 2010 +0100
9732 Use a modified version of the Poky Handbook CSS for the HTML version of
9735 Promote Elliot as author.
9737 Re-license from the GPLv2.0 to the CC BY-NC-SA 2.0.
9739 doc/common/style.css | 992 +++++++++++++++++++++++++++++++---
9740 doc/cookbook/Makefile.am | 6 +-
9741 doc/cookbook/clutter-cookbook.xml.in | 36 +-
9742 doc/cookbook/images/clutter-logo.png | Bin 0 -> 3270 bytes
9743 4 files changed, 953 insertions(+), 81 deletions(-)
9745 commit 698743d4549660b1409e425ed9268a03df54650a
9746 Author: Neil Roberts <neil@linux.intel.com>
9747 Date: Wed Jun 30 15:51:52 2010 +0100
9749 cogl/tesselator: Update to the latest code from GLU
9751 This grabs the latest code for libtess from git Mesa. This is mostly
9752 so that we can get the following commit which fixes a lot of compiler
9753 warnings in Clutter:
9755 commit 75acb896c6da758d03e86f8725d6ca0cb2c6ad82
9756 Author: Neil Roberts <neil@linux.intel.com>
9757 Date: Wed Jun 30 12:41:11 2010 +0100
9759 glu: Fix some compiler warnings in libtess
9761 When compiled with the more aggressive compiler warnings such as
9762 -Wshadow and -Wempty-body the libtess code gives a lot more
9763 warnings. This fixes the following issues:
9765 * The 'Swap' macro tries to combine multiple statements into one and
9766 then consume the trailing semicolon by using if(1){/*...*/}else.
9767 This gives warnings because the else part ends up with an empty
9768 statement. It also seems a bit dangerous because if the semicolon
9769 were missed then it would still be valid syntax but it would just
9770 ignore the following statement. This patch replaces it with the more
9771 common idiom do { /*...*/ } while(0).
9773 * 'free' was being used as a local variable name but this shadows the
9774 global function. This has been renamed to 'free_handle'
9776 * TRUE and FALSE were being unconditionally defined. Although this
9777 isn't currently a problem it seems better to guard them with #ifndef
9778 because it's quite common for them to be defined in other headers.
9780 https://bugs.freedesktop.org/show_bug.cgi?id=28845
9782 clutter/cogl/cogl/tesselator/geom.c | 2 +-
9783 clutter/cogl/cogl/tesselator/mesh.c | 4 ++++
9784 clutter/cogl/cogl/tesselator/normal.c | 4 ++++
9785 clutter/cogl/cogl/tesselator/priorityq-heap.c | 22 +++++++++++++---------
9786 clutter/cogl/cogl/tesselator/priorityq.c | 2 +-
9787 clutter/cogl/cogl/tesselator/render.c | 8 ++++++--
9788 clutter/cogl/cogl/tesselator/sweep.c | 4 ++++
9789 clutter/cogl/cogl/tesselator/tess.c | 4 ++++
9790 8 files changed, 37 insertions(+), 13 deletions(-)
9792 commit 4ed4e86e75a0837080324ecbb5022d49add74758
9793 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9794 Date: Wed Jun 30 15:50:47 2010 +0100
9796 docs: Various fixes for gtk-doc
9798 clutter/clutter-alpha.c | 22 +++++++++++-----------
9799 clutter/clutter-animator.c | 8 ++++----
9800 clutter/clutter-script.c | 20 ++++++++++----------
9801 clutter/cogl/cogl/cogl.h | 10 +++++-----
9802 doc/reference/clutter/Makefile.am | 1 +
9803 doc/reference/cogl/Makefile.am | 12 ++++++------
9804 6 files changed, 37 insertions(+), 36 deletions(-)
9806 commit 005a99f346fa0f253ee82b17af656a7d3e8fbeb0
9807 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9808 Date: Wed Jun 30 15:00:01 2010 +0100
9810 backend: Move one-off free in finalize()
9812 Instead of using dispose().
9814 clutter/clutter-backend.c | 14 ++++++++++----
9815 1 file changed, 10 insertions(+), 4 deletions(-)
9817 commit 7ca340fade26643a17c5048022abc49ac8fcb782
9818 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9819 Date: Wed Jun 30 14:58:47 2010 +0100
9821 docs: Avoid warnings from the g-ir-scanner
9823 The scanner has some issues when parsing valid gtk-doc annotations; we
9824 should make its (and, in return, ours) life easier.
9826 We still get warnings for code declared in <programlisting> sections,
9829 clutter/clutter-actor.c | 10 +++++-----
9830 clutter/clutter-align-constraint.c | 12 ++++++------
9831 clutter/clutter-alpha.c | 3 +--
9832 clutter/clutter-units.c | 2 +-
9833 4 files changed, 13 insertions(+), 14 deletions(-)
9835 commit e32c6c123571de2e09d5f5bdb93c8666a93d6535
9836 Author: Robert Bragg <robert@linux.intel.com>
9837 Date: Tue Jun 22 14:02:17 2010 +0100
9839 material: Replace CoglHandle with CoglMaterial *
9841 As part of the ongoing effort to remove CoglHandle from the API this
9842 switches the cogl_material API to use a strongly typed CoglMaterial
9843 pointer instead of CoglHandle.
9845 clutter/cogl/cogl/cogl-context.h | 10 +-
9846 clutter/cogl/cogl/cogl-material-private.h | 46 ++-
9847 clutter/cogl/cogl/cogl-material.c | 435 ++++++++++++-----------------
9848 clutter/cogl/cogl/cogl-material.h | 270 +++++++++---------
9849 4 files changed, 349 insertions(+), 412 deletions(-)
9851 commit 3e1323a6362906a956131a1e4639b69776dbc188
9852 Author: Robert Bragg <robert@linux.intel.com>
9853 Date: Tue Jun 15 16:44:52 2010 +0100
9855 material: Split the fragment processing backends out
9857 This splits the fragment processing backends (glsl, arbfp and fixed) out
9858 from cogl-material.c into their own cogl-material-{glsl,arbfp,fixed}.c
9859 files in an effort to help and keep cogl-material.c maintainable.
9861 clutter/cogl/cogl/Makefile.am | 6 +
9862 clutter/cogl/cogl/cogl-material-arbfp-private.h | 36 +
9863 clutter/cogl/cogl/cogl-material-arbfp.c | 1029 ++++++++++++++++++
9864 clutter/cogl/cogl/cogl-material-fixed-private.h | 36 +
9865 clutter/cogl/cogl/cogl-material-fixed.c | 201 ++++
9866 clutter/cogl/cogl/cogl-material-glsl-private.h | 36 +
9867 clutter/cogl/cogl/cogl-material-glsl.c | 123 +++
9868 clutter/cogl/cogl/cogl-material-private.h | 83 +-
9869 clutter/cogl/cogl/cogl-material.c | 1309 +----------------------
9870 9 files changed, 1587 insertions(+), 1272 deletions(-)
9872 commit 411438f3099dc368bf17b517c970a03e11ffda44
9873 Author: Robert Bragg <robert@linux.intel.com>
9874 Date: Wed Jun 30 03:31:37 2010 +0100
9876 material: remove a duplicate gtk-doc "Since: 1.4"
9878 The cogl_material_get_depth_writing_enabled documentation had two
9879 "Since: 1.4" annotations which was confusing the gobject introspection
9882 clutter/cogl/cogl/cogl-material.h | 1 -
9883 1 file changed, 1 deletion(-)
9885 commit f4e825b81da6dda14d5d4f4ea8501a2c25bf40f9
9886 Author: Robert Bragg <robert@linux.intel.com>
9887 Date: Wed Jun 30 11:23:16 2010 +0100
9889 backend: fix double free of priv->font_name
9891 If the backend was disposed then priv->font_name would be freed but not
9892 set to NULL and so if clutter_backend_get_font_name was then called it
9893 would double free priv->font_name.
9895 clutter/clutter-backend.c | 1 +
9896 1 file changed, 1 insertion(+)
9898 commit 268bfccd28b6ccca60c9505cd3ddc009549c7484
9899 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9900 Date: Wed Jun 30 13:26:32 2010 +0100
9902 build: Redirect xsltproc to a directory
9904 Apparently, xsltproc recognizes a directory if it has a '/' at the end
9905 of its path, and not by doing the sensible thing and stat()'ing the
9906 argument for the --output option.
9908 doc/cookbook/Makefile.am | 2 +-
9909 1 file changed, 1 insertion(+), 1 deletion(-)
9911 commit 40c45ef29b73a81046c2b5e2fee4687a63500256
9912 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9913 Date: Wed Jun 30 12:53:20 2010 +0100
9915 Post-release version bump to 1.3.7
9918 1 file changed, 1 insertion(+), 1 deletion(-)
9920 commit a534ef65b1bfbc8dbedd9158a36a8895cab3649e
9921 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9922 Date: Wed Jun 30 11:18:36 2010 +0100
9926 NEWS | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
9928 2 files changed, 103 insertions(+), 1 deletion(-)
9930 commit b9c5405c29b41c9cf5100255a225b4b3c8bccb8f
9931 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9932 Date: Wed Jun 30 12:40:38 2010 +0100
9934 Revert "build: Enable the cookbook on distcheck"
9936 The cookbook fails the distcheck phase, so we'll need to investigate
9937 this a little bit more.
9939 This reverts commit f2361a65de090dfe8aa05534cb9bc1c760555084.
9942 1 file changed, 1 insertion(+), 1 deletion(-)
9944 commit e9b16923bf77a748d561dca0da58e53e4cbfea72
9945 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9946 Date: Wed Jun 30 11:55:52 2010 +0100
9948 build: Distcheck fixes
9950 doc/cookbook/Makefile.am | 28 ++++++++++++++--------------
9951 doc/manual/Makefile.am | 8 ++++----
9952 2 files changed, 18 insertions(+), 18 deletions(-)
9954 commit 65b11a305db0c34808f293e3d1795aef361008c4
9955 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9956 Date: Wed Jun 30 11:55:16 2010 +0100
9958 docs: Disable manual
9960 The manual never really took off, so we just ship it in the tarballs but
9963 doc/Makefile.am | 2 +-
9964 1 file changed, 1 insertion(+), 1 deletion(-)
9966 commit 286f307c10db82ccdeb4c98e632073c7ed8a512c
9967 Author: Emmanuele Bassi <ebassi@linux.intel.com>
9968 Date: Wed Jun 30 11:30:45 2010 +0100
9972 clutter/clutter-align-constraint.h | 14 +++++++-------
9973 clutter/clutter-bind-constraint.h | 2 +-
9974 clutter/clutter-settings.c | 8 ++++++++
9975 doc/reference/clutter/clutter-sections.txt | 12 ++++++++++++
9976 4 files changed, 28 insertions(+), 8 deletions(-)
9978 commit 6341ba98f966ab08827a92c19eefe733fd02933b
9979 Author: Neil Roberts <neil@linux.intel.com>
9980 Date: Wed Jun 23 17:17:40 2010 +0100
9982 test-cogl-path: Add tests for changing the fill rule
9984 This creates a path with an outer clockwise and two internal sub
9985 paths, one clockwise and one counter-clockwise. The path is then
9986 painted twice, once with each fill rule.
9988 tests/conform/test-cogl-path.c | 31 +++++++++++++++++++++++++++++++
9989 1 file changed, 31 insertions(+)
9991 commit 3a1456f34e17161b54ecd8ec55692e8a40c46456
9992 Author: Neil Roberts <neil@linux.intel.com>
9993 Date: Wed Jun 23 13:40:43 2010 +0100
9995 cogl-path: Allow changing the fill rule
9997 This adds two new API calls- cogl_path_set_fill_rule and
9998 cogl_path_get_fill_rule. This allows modifying the fill rule of the
9999 current path. In addition to the previous default fill rule of
10000 'even-odd' it now supports the 'non-zero' rule. The fill rule is a
10001 property of the path (not the Cogl context) so creating a new path or
10002 preserving a path with cogl_path_get_handle affects the fill rule.
10004 clutter/cogl/cogl/cogl-path-private.h | 3 +
10005 clutter/cogl/cogl/cogl-path.c | 38 +++++++++++++
10006 clutter/cogl/cogl/cogl-path.h | 88 +++++++++++++++++++++++------
10007 doc/reference/cogl/Makefile.am | 6 +-
10008 doc/reference/cogl/cogl-sections.txt | 3 +
10009 doc/reference/cogl/fill-rule-even-odd.png | Bin 0 -> 3121 bytes
10010 doc/reference/cogl/fill-rule-non-zero.png | Bin 0 -> 3143 bytes
10011 doc/reference/cogl/fill-rule.png | Bin 3121 -> 0 bytes
10012 8 files changed, 120 insertions(+), 18 deletions(-)
10014 commit 95317b9623efc5768d74098cc963de7854ca0805
10015 Author: Neil Roberts <neil@linux.intel.com>
10016 Date: Mon Apr 19 11:24:24 2010 +0100
10018 cogl-debug: Remove the force-scanline-paths option
10020 The scanline path rasterizer has been removed because the paths can be
10021 drawn with the tesselator instead. The option therefore no longer does
10024 clutter/cogl/cogl/cogl-debug.c | 2 --
10025 clutter/cogl/cogl/cogl-debug.h | 1 -
10026 2 files changed, 3 deletions(-)
10028 commit 0cdbe7e0981da7715451d10c9463491fcad1903e
10029 Author: Neil Roberts <neil@linux.intel.com>
10030 Date: Thu Apr 15 23:56:46 2010 +0100
10032 cogl-path: Use the GLU tesselator to draw paths
10034 Instead of drawing paths using the stencil buffer trick, it now
10035 tesselates the path into triangles using the GLU tesselator and
10036 renders them directly. A vbo is created with one vertex for each node
10037 on the path. The tesselator is used to generate a series of indices
10038 into the vbo as triangles. The tesselator's output of strips and fans
10039 is converted into GL_TRIANGLES so that it can be rendered with a
10040 single draw call (but the vertices are still shared via the
10041 indices). The vbo is stored with the path so that if the application
10042 uses retained paths then Cogl won't have to tessellate again.
10044 The vertices also have texture coordinates associated with them so
10045 that it can replicate the old behaviour of drawing a material with a
10046 texture by fitting the texture to the bounding box of the path and
10047 then clipping it. However if the texture contains waste or is sliced
10048 then the vertex buffer code will refuse to draw it. In this case it
10049 will revert back to drawing the path into the stencil buffer and then
10050 drawing the material as a clipped quad.
10052 The VBO is used even when setting up the stencil buffer for clipping
10053 to a path because the tessellated geometry may cover less area.
10055 The old scanline rasterizer has been removed because the tesselator
10056 should work equally well on drivers with no stencil buffer.
10058 clutter/cogl/cogl/cogl-path-private.h | 5 +
10059 clutter/cogl/cogl/cogl-path.c | 737 ++++++++++++++++++++-------------
10060 2 files changed, 463 insertions(+), 279 deletions(-)
10062 commit fae4d6010639705b4a33367ce3850335e15e46ee
10063 Author: Neil Roberts <neil@linux.intel.com>
10064 Date: Fri Apr 16 00:28:15 2010 +0100
10066 cogl: Pull in the code for GLU tesselator from Mesa/SGI
10068 This copies the files for the GLU tesselator from Mesa. The Mesa code
10069 is based on the original SGI code and is released under a BSD license.
10071 The memalloc.h header has been replaced with one that forces the code
10072 to use g_malloc and friends. The rest of the files are not altered
10073 from the original so it should be possible to later upgrade the files
10074 by simply overwriting them.
10076 There is a tesselator.h header which is expected to be included by
10077 rest of Cogl to use the tesselator. This contains a trimmed down
10078 version of glu.h that only includes parts that pertain to the
10079 tesselator. There is also a stub glu.h in the GL directory which is
10080 just provided so that the tesselator code can include <GL/gl.h>
10081 without depending on the system header. It just redirects to
10084 clutter/cogl/cogl/Makefile.am | 7 +-
10085 clutter/cogl/cogl/tesselator/GL/glu.h | 26 +
10086 clutter/cogl/cogl/tesselator/Makefile.am | 41 +
10087 clutter/cogl/cogl/tesselator/README | 446 ++++++++
10088 clutter/cogl/cogl/tesselator/dict-list.h | 100 ++
10089 clutter/cogl/cogl/tesselator/dict.c | 111 ++
10090 clutter/cogl/cogl/tesselator/dict.h | 100 ++
10091 clutter/cogl/cogl/tesselator/geom.c | 264 +++++
10092 clutter/cogl/cogl/tesselator/geom.h | 84 ++
10093 clutter/cogl/cogl/tesselator/gluos.h | 1 +
10094 clutter/cogl/cogl/tesselator/memalloc.h | 42 +
10095 clutter/cogl/cogl/tesselator/mesh.c | 794 +++++++++++++++
10096 clutter/cogl/cogl/tesselator/mesh.h | 266 +++++
10097 clutter/cogl/cogl/tesselator/normal.c | 253 +++++
10098 clutter/cogl/cogl/tesselator/normal.h | 45 +
10099 clutter/cogl/cogl/tesselator/priorityq-heap.c | 252 +++++
10100 clutter/cogl/cogl/tesselator/priorityq-heap.h | 107 ++
10101 clutter/cogl/cogl/tesselator/priorityq-sort.h | 117 +++
10102 clutter/cogl/cogl/tesselator/priorityq.c | 260 +++++
10103 clutter/cogl/cogl/tesselator/priorityq.h | 117 +++
10104 clutter/cogl/cogl/tesselator/render.c | 498 +++++++++
10105 clutter/cogl/cogl/tesselator/render.h | 52 +
10106 clutter/cogl/cogl/tesselator/sweep.c | 1357 +++++++++++++++++++++++++
10107 clutter/cogl/cogl/tesselator/sweep.h | 77 ++
10108 clutter/cogl/cogl/tesselator/tess.c | 628 ++++++++++++
10109 clutter/cogl/cogl/tesselator/tess.h | 165 +++
10110 clutter/cogl/cogl/tesselator/tesselator.h | 121 +++
10111 clutter/cogl/cogl/tesselator/tessmono.c | 201 ++++
10112 clutter/cogl/cogl/tesselator/tessmono.h | 71 ++
10114 30 files changed, 6602 insertions(+), 2 deletions(-)
10116 commit 347f3b614dc542318065cefce7a4b6db56bc55e0
10117 Author: Elliot Smith <elliot.smith@intel.com>
10118 Date: Tue Jun 29 15:49:40 2010 +0100
10120 cookbook: Add a recipe for image loading
10122 http://bugzilla.clutter-project.org/show_bug.cgi?id=2165
10124 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
10126 doc/cookbook/clutter-cookbook.xml.in | 208 ++++++++++++++++++++++++++++++++++
10127 1 file changed, 208 insertions(+)
10129 commit f2361a65de090dfe8aa05534cb9bc1c760555084
10130 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10131 Date: Tue Jun 29 18:05:12 2010 +0100
10133 build: Enable the cookbook on distcheck
10135 We want to start distributing the cookbook along with the documentation.
10138 1 file changed, 1 insertion(+), 1 deletion(-)
10140 commit e50893f674cfa40ea62e93bfd4fc83fda55131a9
10141 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10142 Date: Tue Jun 29 18:04:52 2010 +0100
10144 cookbook: Add acknowledgment section
10148 doc/cookbook/clutter-cookbook.xml.in | 16 +++++++++++++---
10149 1 file changed, 13 insertions(+), 3 deletions(-)
10151 commit fc49dceae305d1c59b5d1540785dd1bd4df8e026
10152 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10153 Date: Tue Jun 29 17:57:29 2010 +0100
10155 cookbook: Add introduction to the events section
10157 doc/cookbook/clutter-cookbook.xml.in | 43 ++++++++++++++++++++++++++++++----
10158 1 file changed, 39 insertions(+), 4 deletions(-)
10160 commit 566f75d97f7580495181835ef0545278f34fc000
10161 Author: Elliot Smith <elliot.smith@intel.com>
10162 Date: Tue Jun 29 17:27:54 2010 +0100
10164 cookbook: Add recipe for key event handling
10166 Attached patch contains a cookbook recipe about key press event
10169 It covers both a simple approach (connecting a callback to a
10170 key-press-event signal which manually analyses the key and
10171 modifiers), and a more complicated one based on a binding pool.
10173 There's also some discussion of the two approaches.
10175 http://bugzilla.clutter-project.org/show_bug.cgi?id=2162
10177 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
10179 doc/cookbook/clutter-cookbook.xml.in | 294 ++++++++++++++++++++++++++++++++++
10180 1 file changed, 294 insertions(+)
10182 commit 30ca03de1dfb0d92664c8ffd289004c3dc0676b1
10183 Author: Elliot Smith <elliot.smith@intel.com>
10184 Date: Tue Jun 29 17:26:55 2010 +0100
10186 cookbook: Add recipe for scaling images with :keep-aspect-ratio
10188 The cookbook contains a commented-out recipe covering scaling images
10189 inside a texture while retaining their aspect ratio; the attached
10190 patch fleshes out this recipe.
10192 http://bugzilla.clutter-project.org/show_bug.cgi?id=2163
10194 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
10196 doc/cookbook/clutter-cookbook.xml.in | 101 ++++++++++++++++++++++++++++++++--
10197 1 file changed, 95 insertions(+), 6 deletions(-)
10199 commit f64c66ede8c3edea31931bae4edcb4c10f53d93a
10200 Author: Colin Walters <walters@verbum.org>
10201 Date: Tue Jun 29 16:25:18 2010 +0100
10203 autogen.sh: Support NOCONFIGURE, like gnome-common
10205 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
10207 autogen.sh | 4 +++-
10208 1 file changed, 3 insertions(+), 1 deletion(-)
10210 commit 8801c947d556e81b39691d819898e377092d6f59
10211 Author: Chris Lord <chris@linux.intel.com>
10212 Date: Tue Jun 29 15:30:25 2010 +0100
10214 event: Typos in event code could cause crashes
10216 A typo in clutter-event.c meant that the wrong struct location could be
10217 used for the input device of key events. Also, a typo in the X11 event
10218 code meant that key-presses would come from the pointer device (releases
10219 would still come from the keyboard device).
10221 clutter/clutter-event.c | 2 +-
10222 clutter/x11/clutter-event-x11.c | 2 +-
10223 2 files changed, 2 insertions(+), 2 deletions(-)
10225 commit 32ad63efef8ee92b0bc361b9dea3fd46ba72fbd1
10226 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10227 Date: Mon Jun 28 17:18:35 2010 +0100
10229 bind-constraint: Add width and height binding
10231 Allow using the BindConstraint to bind width and height of a source
10234 Also, add a test for the BindConstraint showing all types of usages
10235 for this constraint class.
10237 clutter/clutter-bind-constraint.c | 105 ++++++++++++++++++++++++++++-------
10238 clutter/clutter-bind-constraint.h | 8 ++-
10239 tests/interactive/.gitignore | 1 +
10240 tests/interactive/Makefile.am | 3 +-
10241 tests/interactive/test-bind.c | 110 +++++++++++++++++++++++++++++++++++++
10242 5 files changed, 204 insertions(+), 23 deletions(-)
10244 commit b3ffe602a207edf14c69f05f6d1e0b892eb706b4
10245 Author: Neil Roberts <neil@linux.intel.com>
10246 Date: Mon Jun 28 15:25:19 2010 +0100
10248 cogl: Add const to some pointer arguments
10250 Some of the arguments to the material and path functions were taking a
10251 pointer to a CoglColor or an array of floats that was not intended to
10252 be written to but were not marked with const.
10254 clutter/cogl/cogl/cogl-material.c | 6 +++---
10255 clutter/cogl/cogl/cogl-material.h | 14 +++++++-------
10256 clutter/cogl/cogl/cogl-path.c | 4 ++--
10257 clutter/cogl/cogl/cogl-path.h | 8 ++++----
10258 4 files changed, 16 insertions(+), 16 deletions(-)
10260 commit a20def9df6463ba923859aac31532ff1ccdb488b
10261 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10262 Date: Mon Jun 28 10:43:13 2010 +0100
10264 text: Use the ::settings-changed signal
10266 Instead of the ::font-changed one.
10268 clutter/clutter-text.c | 2 +-
10269 1 file changed, 1 insertion(+), 1 deletion(-)
10271 commit c81ef75942cac24627a88eda21ad5e4e4e32efcf
10272 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10273 Date: Mon Jun 28 10:32:54 2010 +0100
10275 x11: Add XSETTINGS watcher
10277 If we want to be able to get live notification of system settings
10278 changes, we need watch the window that the XSETTINGS client conjures
10281 clutter/x11/clutter-backend-x11.c | 49 ++++++++++++++++++++++++++++++++++---
10282 clutter/x11/clutter-backend-x11.h | 1 +
10283 2 files changed, 47 insertions(+), 3 deletions(-)
10285 commit 31fc8e9664f235d3375bacd9de8d9c614f31b884
10286 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10287 Date: Sat Jun 26 23:05:36 2010 +0100
10289 text: Document and annotate :font-name for NULL values
10291 Update the documentation of :font-name, to make it clear that by setting
10292 it to NULL the Text actor will use the default font.
10294 Also, set the annotation for the @font_name argument of the setter to be
10295 allow-none, and allow passing NULL through bindings.
10297 clutter/clutter-text.c | 4 +++-
10298 1 file changed, 3 insertions(+), 1 deletion(-)
10300 commit 809211588d7a34af7aa02c1559badef7a2619b16
10301 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10302 Date: Sat Jun 26 15:49:15 2010 +0100
10304 text: Update actors using the default font
10306 If a ClutterText actor is using the default font from the backend then
10307 we should track font name changes and update it accordingly. This only
10308 applies to ClutterText actors with the :font-name property unset or
10309 explicitly set to NULL.
10311 clutter/clutter-text.c | 105 +++++++++++++++++++++++++++++-------------------
10312 1 file changed, 64 insertions(+), 41 deletions(-)
10314 commit 8e4d221821b633442d374e89053474183f57cccb
10315 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10316 Date: Sat Jun 26 15:42:31 2010 +0100
10318 clutter.modules: Update with the gdk-pixbuf split
10320 Gdk-Pixbuf has been split back into its own module once again. This
10321 means that Clutter doesn't have a build requirement on gtk+ any more.
10323 build/clutter.modules | 12 +++++++++++-
10324 1 file changed, 11 insertions(+), 1 deletion(-)
10326 commit 26fb0960953069006e781cf59a005bfdfa5d6d5b
10327 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10328 Date: Sat Jun 26 13:51:06 2010 +0100
10330 settings: Emit Backend::font-changed
10332 When the :font-name property changes, to maintain the invariant.
10334 clutter/clutter-settings.c | 10 +++++++++-
10335 1 file changed, 9 insertions(+), 1 deletion(-)
10337 commit 98613382a4b897012e78fff60b0cb7cf7ef97ad2
10338 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10339 Date: Fri Jun 25 11:41:05 2010 +0100
10341 test-text-field: Use the system font instead of using Sans
10343 tests/interactive/test-text-field.c | 9 +++------
10344 1 file changed, 3 insertions(+), 6 deletions(-)
10346 commit 2e4e321dadb8249860c7ae5b853573a5d94f8d7d
10347 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10348 Date: Fri Jun 25 11:40:32 2010 +0100
10350 Detail the font-name value in the font settings debug note
10352 clutter/clutter-settings.c | 6 ++++--
10353 1 file changed, 4 insertions(+), 2 deletions(-)
10355 commit 527ad961ab039c55f7cc0cc3066aedcf183db857
10356 Author: Neil Roberts <neil@linux.intel.com>
10357 Date: Thu Jun 24 18:14:04 2010 +0100
10359 clutter-event-win32: Emit multiple events for WM_MOUSEWHEEL Messages
10361 It's possible that a single WM_MOUSEWHEEL event can arrive with a
10362 scroll amount greater than WHEEL_DELTA. Previously it would accumulate
10363 these amounts but it would still only emit a single event per
10364 message. For example, if a message arrived that is worth two
10365 WHEEL_DELTAs then it would emit one event and leave scroll_pos as
10366 +WHEEL_DELTA. If the wheel is then scrolled in the opposite direction
10367 then wheel delta would end up as zero and the scroll event would get
10370 This patch fixes it so that it always emits enough events to put
10371 scroll_pos back to less than WHEEL_DELTA.
10373 http://bugzilla.clutter-project.org/show_bug.cgi?id=2135
10375 clutter/win32/clutter-event-win32.c | 2 +-
10376 1 file changed, 1 insertion(+), 1 deletion(-)
10378 commit 2c8d73f0472798896a6528359f82f8ea6f7589e2
10379 Author: Neil Roberts <neil@linux.intel.com>
10380 Date: Thu Jun 24 18:07:20 2010 +0100
10382 clutter-event-win32: Directly enqueue events in message_translate
10384 Previously the window procedure for the stage window would always
10385 create a ClutterEvent struct for every message and then pass that on
10386 to message_translate to fill in the details. message_translate could
10387 return FALSE to abandon the event. Instead of this, message_translate
10388 now creates and queues the event itself whenever it sees a message
10389 that could translate to an event. The function now returns void. This
10390 has a number of advantages:
10392 * It saves redundantly allocating events for messages that Clutter
10393 doesn't care about.
10395 * A single message can now easily be translated into multiple events.
10397 * There were some messages that were handled and did not fill in the
10398 event struct but did not cause the function to return FALSE. I think
10399 this would end up with a CLUTTER_NOTHING event being emitted.
10401 http://bugzilla.clutter-project.org/show_bug.cgi?id=2135
10403 clutter/win32/clutter-event-win32.c | 297 +++++++++++++++++++----------------
10404 1 file changed, 162 insertions(+), 135 deletions(-)
10406 commit b4607f7a37597f6d45d356d8a85ce3f8f40def1e
10407 Author: Øyvind Kolås <pippin@linux.intel.com>
10408 Date: Fri Jun 25 02:02:48 2010 +0100
10410 state: avoid g_str_equal if a string might be NULL
10412 clutter/clutter-state.c | 1 +
10413 1 file changed, 1 insertion(+)
10415 commit fbeab378289a0e9f9470aa9f532003cf66529970
10416 Author: Neil Roberts <neil@linux.intel.com>
10417 Date: Thu Jun 24 17:33:43 2010 +0100
10419 test-conformance: Use -export-dynamic instead of -rdynamic
10421 The -rdynamic linker option is specific to ELF so it was breaking
10422 builds on systems with other object formats such as Windows and
10423 Solaris. This patch replaces that option with -export-dynamic which is
10424 a portable libtool option which should do the right thing on each
10427 http://bugzilla.clutter-project.org/show_bug.cgi?id=1930
10429 tests/conform/Makefile.am | 2 +-
10430 1 file changed, 1 insertion(+), 1 deletion(-)
10432 commit a950388bc68a0fbdb76bf83cc0673bdca2f1d1d5
10433 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10434 Date: Thu Jun 24 17:21:26 2010 +0100
10436 actor: Top-levels should always report a 255 opacity
10438 The paint opacity should always assume a fully opaque top-level at the
10439 end, otherwise the scene would be rendered fully transparent.
10441 http://bugzilla.clutter-project.org/show_bug.cgi?id=2050
10443 clutter/clutter-actor.c | 7 +++++++
10444 1 file changed, 7 insertions(+)
10446 commit 42df1a150b8ecb49f02a5780b9f9c983221c97ea
10447 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10448 Date: Thu Jun 24 17:19:36 2010 +0100
10450 actor: Ignore the NOP paint at 0 opacity for top-levels
10452 A top-level actor could still have 0 opacity (e.g. a Stage with the
10453 :use-alpha property set to TRUE), but we want its children to still
10456 http://bugzilla.clutter-project.org/show_bug.cgi?id=2050
10458 clutter/clutter-actor.c | 4 +++-
10459 1 file changed, 3 insertions(+), 1 deletion(-)
10461 commit 1b153971208185bbbc152c315e0ab6ca063af603
10462 Author: Robert Bragg <robert@linux.intel.com>
10463 Date: Wed Jun 23 17:10:03 2010 +0100
10465 material: Avoid possibly reading invalid memory
10467 in _cogl_material_prune_empty_layer_difference we sometimes unref the
10468 given layer before dereferencing it to get a pointer to its parent. This
10469 defers the unref until after we have fetched the parent pointer.
10471 clutter/cogl/cogl/cogl-material.c | 2 +-
10472 1 file changed, 1 insertion(+), 1 deletion(-)
10474 commit 1ad7eb969cbc5be9a22d18e1a7d76b4bc62f814f
10475 Author: Øyvind Kolås <pippin@linux.intel.com>
10476 Date: Thu Jun 24 16:52:23 2010 +0100
10478 state: added more documentation
10480 clutter/clutter-state.c | 11 ++++++++---
10481 1 file changed, 8 insertions(+), 3 deletions(-)
10483 commit 2a29cd2aeebf7369a3c93cbaf3321962df304536
10484 Author: Øyvind Kolås <pippin@linux.intel.com>
10485 Date: Thu Jun 24 02:26:46 2010 +0100
10487 state: removed special handling of state named "default"
10489 The "default" state used for unspecified source transitions is NULL.
10490 Small update and some other fixes to documentation.
10492 clutter/clutter-state.c | 44 ++++++++++++++++----------------------------
10493 tests/conform/test-state.c | 5 +++++
10494 2 files changed, 21 insertions(+), 28 deletions(-)
10496 commit d37dee8258ec2a10f5825694376cc27bc43b8f93
10497 Author: Alejandro Piñeiro <apinheiro@igalia.com>
10498 Date: Wed Apr 14 18:07:21 2010 +0200
10500 Improve clutter_text_get_chars doc
10502 Explicitly explain that end_pos is not included with the resulting
10505 http://bugzilla.clutter-project.org/show_bug.cgi?id=2081
10507 clutter/clutter-text.c | 2 +-
10508 1 file changed, 1 insertion(+), 1 deletion(-)
10510 commit 213cd30cebfb58df1298a13adf528755aad6cdfa
10511 Author: Elliot Smith <elliot.smith@intel.com>
10512 Date: Thu Jun 24 11:23:50 2010 +0100
10514 docs: Fix example code in BindingPool
10516 The code sample in the gtk-doc annotations for ClutterBindingPool shows
10517 the arguments in the wrong order.
10519 http://bugzilla.clutter-project.org/show_bug.cgi?id=2133
10521 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
10523 clutter/clutter-binding-pool.c | 5 +++--
10524 1 file changed, 3 insertions(+), 2 deletions(-)
10526 commit 4e5c84ebc5fba38afdf0593f830dc2ea08098a30
10527 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10528 Date: Wed Jun 23 18:46:52 2010 +0100
10530 doap: Update after the infrastructure changes
10532 clutter.doap | 64 +++++-----------------------------------------------------
10533 1 file changed, 5 insertions(+), 59 deletions(-)
10535 commit f60999becfc40af940eba23cd2dbdd8dd2455b1a
10536 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10537 Date: Wed Jun 23 18:46:38 2010 +0100
10539 Change the Bugzilla link in the configure script
10541 configure.ac | 2 +-
10542 1 file changed, 1 insertion(+), 1 deletion(-)
10544 commit 6ff5d105e52c300b4b06d08f966500b344e0aeca
10545 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10546 Date: Wed Jun 23 18:43:18 2010 +0100
10548 docs: Change the mailing list link
10551 1 file changed, 2 insertions(+), 5 deletions(-)
10553 commit d17ea2c021a9ba19580c013743224d2d40ac1f76
10554 Author: Neil Roberts <neil@linux.intel.com>
10555 Date: Wed Jun 23 17:29:08 2010 +0100
10557 cogl: Remove cogl-defines.h.in from the driver make files
10559 Commit 7fae8ac051292 changed cogl-defines.h.in so there is only a
10560 single copy in clutter/cogl/ instead of one for each driver. However
10561 the old files were still mentioned in the EXTRA_DIST of the
10562 Makefile.am so make distcheck was failing.
10564 clutter/cogl/cogl/Makefile.am | 2 ++
10565 clutter/cogl/cogl/driver/gl/Makefile.am | 2 +-
10566 clutter/cogl/cogl/driver/gles/Makefile.am | 1 -
10567 3 files changed, 3 insertions(+), 2 deletions(-)
10569 commit 97e39228c524c5605e68e93b773ff05fc52d61ef
10570 Author: Chris Lord <chris@linux.intel.com>
10571 Date: Wed Jun 23 15:53:50 2010 +0100
10573 cogl-path: Disable texture coord arrays before drawing
10575 It was possible that the texture co-ord arrays were left enabled during
10576 stroking, which could possibly cause a crash.
10578 clutter/cogl/cogl/cogl-path.c | 4 ++++
10579 1 file changed, 4 insertions(+)
10581 commit 8512423f22995dced954b9b5c5e6481af83ba5a0
10582 Author: Neil Roberts <neil@linux.intel.com>
10583 Date: Fri Jun 18 11:12:51 2010 +0100
10585 clutter-animation: Fix for using fixed:: from clutter_actor_animatev
10587 When using clutter_actor_animatev it would set a boolean whenever a
10588 property begins with "fixed::". However it would never clear the
10589 variable so it would end up marking all subsequent properties as
10592 http://bugzilla.openedhand.com/show_bug.cgi?id=2180
10594 http://bugzilla.clutter-project.org/show_bug.cgi?id=2149
10596 clutter/clutter-animation.c | 2 +-
10597 1 file changed, 1 insertion(+), 1 deletion(-)
10599 commit 66d9d481357e2e9f55a4b546104fbb1c5ff8167c
10600 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10601 Date: Wed Jun 23 13:34:36 2010 +0100
10603 Revert 7e6b60270d1951f0789868740b8df6acfe677d57
10605 You should not commit patches based on the bugzilla description alone.
10606 You should not commit patches based on the bugzilla description alone.
10607 You should not commit patches based on the bugzilla description alone.
10610 clutter.pc.in | 4 ++--
10611 1 file changed, 2 insertions(+), 2 deletions(-)
10613 commit e28ea848e22b11490f653d655ddad3dc90726b09
10614 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10615 Date: Wed Jun 23 13:23:19 2010 +0100
10617 Fix the libdir in the pkg-config file
10619 clutter.pc.in | 2 +-
10620 1 file changed, 1 insertion(+), 1 deletion(-)
10622 commit f423d794ccd410368cef25af99fb7a6317655552
10623 Author: Robert Bragg <robert@linux.intel.com>
10624 Date: Tue Jun 22 15:42:41 2010 +0100
10626 texture-pixmap-x11: don't assume anything about the GLXFBConfig type
10628 A pedantic change to get_fbconfig_for_depth() so that we don't need to
10629 make any assumptions about the GLXFBConfig typedef or what values
10630 we can overload to indicate an invalid config.
10632 get_fbconfig_for_depth() now simply returns FALSE if it fails to find a
10635 clutter/cogl/cogl/winsys/cogl-context-winsys.h | 1 +
10636 clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 37 ++++++++++----------
10637 2 files changed, 19 insertions(+), 19 deletions(-)
10639 commit 62c08b4a0995467f54d8135e7c579e2f81debb20
10640 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10641 Date: Tue Jun 22 16:12:53 2010 +0100
10643 drag-action: Disable picking during drag
10645 While dragging we don't need to perform picking to determine the actor
10646 underneath the pointer, for two reasons:
10648 • we use a capture on the stage to determine the motion delta.
10649 • we know the actor underneath the pointer because that's the
10650 actor we are dragging around.
10652 This change should make dragging actors in complex scenes a bit faster.
10654 clutter/clutter-drag-action.c | 10 ++++++++--
10655 1 file changed, 8 insertions(+), 2 deletions(-)
10657 commit d89270d7c16aae0369ed80a8c69f2a58ebcaf7e4
10658 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10659 Date: Tue Jun 22 14:43:36 2010 +0100
10661 Silence another compiler warning
10663 clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 2 +-
10664 1 file changed, 1 insertion(+), 1 deletion(-)
10666 commit db47e9082951a872fe1071241f35fc262a049926
10667 Author: Neil Roberts <neil@linux.intel.com>
10668 Date: Tue Jun 22 14:10:44 2010 +0100
10670 cogl-texture-pixmap-x11: Use NULL instead of None for invalid GLXFBConfig
10672 GLXFBConfigs are opaque pointers not XIDs so it doesn't make sense to
10673 return None from get_fbconfig_for_depth. Instead it now returns NULL.
10675 clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 2 +-
10676 1 file changed, 1 insertion(+), 1 deletion(-)
10678 commit e9fa68fbdd74c37816693d95efb76974ae33906f
10679 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10680 Date: Tue Jun 22 14:05:39 2010 +0100
10682 Add test-cogl-texture-pixmap-x11 to the ignore file
10684 tests/conform/.gitignore | 1 +
10685 1 file changed, 1 insertion(+)
10687 commit b2c87eaddf9ebe68daf5a458a0c7453e3c16d805
10688 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10689 Date: Tue Jun 22 13:48:53 2010 +0100
10691 Silence some compiler warnings
10693 clutter/cogl/cogl/cogl-material.c | 5 +++--
10694 1 file changed, 3 insertions(+), 2 deletions(-)
10696 commit d52fd33d0f912009c15a13eac2af2e4ad5fb7209
10697 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10698 Date: Tue Jun 22 13:31:41 2010 +0100
10700 docs: Fix release notes wording
10703 1 file changed, 2 insertions(+), 2 deletions(-)
10705 commit e12e6974a0f938ff32e94c1c0e9c4f9da7a0fc3b
10706 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10707 Date: Tue Jun 22 13:31:31 2010 +0100
10709 docs: Fix links in the README
10711 README | 14 +++++++-------
10712 1 file changed, 7 insertions(+), 7 deletions(-)
10714 commit e3360f497e197ecbf80b96f88d2e952ca8454093
10715 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10716 Date: Tue Jun 22 13:29:03 2010 +0100
10718 docs: Remove the 'copyright-waiver' section
10720 There is no need to toggle the copyright-waiver flag on Bugzilla
10723 README | 9 ---------
10724 1 file changed, 9 deletions(-)
10726 commit 3734408962fbd36388811c67160ec0253df08e12
10727 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10728 Date: Tue Jun 22 12:13:31 2010 +0100
10730 Use -Bsymbolic-functions
10732 The -Bsymbolic-functions linker flag allows to avoid intra-library
10733 PLT jumps on ELF platforms. It is similar to the aliasing hack in
10734 GLib and GTK+, but definitely less messy.
10736 The configure script should look for the flags, in order to support
10737 platforms/linkers that do not have it.
10739 clutter/Makefile.am | 5 ++---
10740 configure.ac | 16 ++++++++++++++++
10741 2 files changed, 18 insertions(+), 3 deletions(-)
10743 commit c2b8a0272bc7e9d0baf0f0025c082c69f7c0584e
10744 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10745 Date: Tue Jun 22 11:59:07 2010 +0100
10747 conform: Do not use deprecated API in test-clutter-units
10749 Setting the DPI is done through the ClutterSettings:font-dpi property.
10751 tests/conform/test-clutter-units.c | 8 +++++---
10752 1 file changed, 5 insertions(+), 3 deletions(-)
10754 commit 7e6b60270d1951f0789868740b8df6acfe677d57
10755 Author: Emmanuele Bassi <ebassi@linux.intel.com>
10756 Date: Tue Jun 22 08:29:02 2010 +0100
10758 Do not hardcode paths in pkgconfig file
10760 The pkgconfig file correctly sets $prefix to @prefix@, but the other
10761 paths should be relative to $prefix.
10763 clutter.pc.in | 13 ++++++++-----
10764 1 file changed, 8 insertions(+), 5 deletions(-)
10766 commit 05b6c283eb00df0b0be125418672531df3f46d62
10767 Author: Neil Roberts <neil@linux.intel.com>
10768 Date: Fri Jun 18 18:51:15 2010 +0100
10770 Add a test case for CoglTexturePixmapX11
10772 tests/conform/Makefile.am | 1 +
10773 tests/conform/test-cogl-texture-pixmap-x11.c | 247 ++++++++++++++++++++++++++
10774 tests/conform/test-conform-main.c | 1 +
10775 3 files changed, 249 insertions(+)
10777 commit 5d860a99788f4e80711e40e2d1d5d6f636f4977f
10778 Author: Neil Roberts <neil@linux.intel.com>
10779 Date: Wed May 26 18:06:39 2010 +0100
10781 clutter-{glx,x11}-texture-pixmap: Use CoglTexturePixmapX11
10783 The pixmap handling of both of the texture pixmap actors in Clutter is
10784 now removed and instead it just creates a CoglTexturePixmapX11. Both
10785 actors are now equivalent so there is no need to choose between the
10788 clutter/glx/clutter-glx-texture-pixmap.c | 818 +-----------------------------
10789 clutter/x11/clutter-x11-texture-pixmap.c | 493 +++---------------
10790 2 files changed, 94 insertions(+), 1217 deletions(-)
10792 commit a197baa53325a99c3a355486bf43a2ccbc1a6220
10793 Author: Neil Roberts <neil@linux.intel.com>
10794 Date: Tue May 25 18:56:14 2010 +0100
10796 Add a CoglTexturePixmapX11 texture backend
10798 This is a publicly exposed texture backend to create a texture which
10799 contains the contents of an X11 pixmap. The API is currently marked as
10802 The backend internally holds a handle to another texture. All of the
10803 backend virtuals simply redirect to the internal texture.
10805 The texture can optionally be automatically updated if the
10806 automatic_updates parameter is TRUE. If set then Cogl will listen for
10807 damage events on the pixmap and update the texture accordingly.
10808 Alternatively a damage object can be created externally and passed
10811 The updates can be performed with XGetImage, XShmGetImage or the
10812 GLX_EXT_texture_pixmap extension. If the TFP extension is used it will
10813 optionally try to create a rectangle texture if the driver does not
10814 support NPOTs or it is forced through the
10815 COGL_PIXMAP_TEXTURE_RECTANGLE or CLUTTER_PIXMAP_TEXTURE_RECTANGLE
10816 environment variables.
10818 If the GLXFBConfig does not support mipmapping then it will fallback
10819 to using X{Shm,}GetImage. It keeps a separate texture around for this
10820 so that it can later start using the TFP texture again if the texture
10821 is later drawn with mipmaps disabled.
10823 clutter/cogl/cogl/Makefile.am | 7 +-
10824 clutter/cogl/cogl/cogl-debug.c | 4 +-
10825 clutter/cogl/cogl/cogl-debug.h | 3 +-
10826 clutter/cogl/cogl/winsys/cogl-context-winsys.c | 26 +-
10827 clutter/cogl/cogl/winsys/cogl-context-winsys.h | 40 +-
10828 .../cogl/winsys/cogl-texture-pixmap-x11-private.h | 92 ++
10829 clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 1397 ++++++++++++++++++++
10830 clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.h | 176 +++
10831 .../cogl/winsys/cogl-winsys-feature-functions.h | 20 +
10832 9 files changed, 1758 insertions(+), 7 deletions(-)
10834 commit d42c3069d101d33cf12e2c836d610e906610846f
10835 Author: Neil Roberts <neil@linux.intel.com>
10836 Date: Mon Jun 14 17:36:24 2010 +0100
10838 test-pixmap: Use the 'm' key to toggle texture quality
10840 When the 'm' key is pressed it will now recursively look for all
10841 ClutterTexture subclasses on the stage and toggle the texture quality
10842 between high and low. This is useful to test the mipmap fallback.
10844 tests/interactive/test-pixmap.c | 32 ++++++++++++++++++++++++++++++++
10845 1 file changed, 32 insertions(+)
10847 commit c5b5a88d6d74242939ea9db67c8a8098ed74171d
10848 Author: Neil Roberts <neil@linux.intel.com>
10849 Date: Fri May 28 18:41:20 2010 +0100
10851 test-pixmap: Draw something more interesting when the mouse is clicked
10853 When the mouse button is pressed it would previously draw a small
10854 1-pixel wide fully transparent line to the pixmap. This is a useful
10855 feature to help test the automatic updates but the line is quite hard
10856 to see so it's to easy miss. This patch changes it to draw a thick
10857 black circle. The circle is drawn at a different position every time
10858 the button is clicked.
10860 tests/interactive/test-pixmap.c | 27 ++++++++++++++++++++-------
10861 1 file changed, 20 insertions(+), 7 deletions(-)
10863 commit 02de8b9ad5f450952c7e60f0a9acab87b618d589
10864 Author: Neil Roberts <neil@linux.intel.com>
10865 Date: Fri May 28 17:53:04 2010 +0100
10867 test-pixmap: Add a --disable-animation option
10869 Sometimes the animation makes debugging awkward so this patch adds a
10870 --disable-animation option to simplify the test.
10872 tests/interactive/test-pixmap.c | 19 +++++++++++++++----
10873 1 file changed, 15 insertions(+), 4 deletions(-)
10875 commit 75f48ad0ec52c4c9a99c1323916b5ec42dbf0b02
10876 Author: Neil Roberts <neil@linux.intel.com>
10877 Date: Fri May 28 17:45:07 2010 +0100
10879 test-pixmap: Enable automatic updates for the hand
10881 The hand actor has a feature that if you click on the stage it will
10882 draw a line to the actor. However it's not possible to see the results
10883 of this because automatic updates were disabled so the texture would
10886 tests/interactive/test-pixmap.c | 2 ++
10887 1 file changed, 2 insertions(+)
10889 commit f7dfc8caa4cb69f67fc14cf73725a39d7940479d
10890 Author: Neil Roberts <neil@linux.intel.com>
10891 Date: Fri May 28 17:32:21 2010 +0100
10893 test-pixmap: Implement the --disable-x11 option
10895 test-pixmap has long had a --disable-x11 option that didn't do
10896 anything. This patch adds the neccessary if (disable_x11) to disable
10897 adding the ClutterX11TexturePixmap actor when the option is given.
10899 tests/interactive/test-pixmap.c | 37 ++++++++++++++++++++++---------------
10900 1 file changed, 22 insertions(+), 15 deletions(-)
10902 commit 6ca13e54d880a727d7926fd66d6d0786c48c7622
10903 Author: Neil Roberts <neil@linux.intel.com>
10904 Date: Mon Jun 21 12:48:02 2010 +0100
10906 Add -DCOGL_ENABLE_EXPERIMENTAL_API to Makefiles for Cogl and x11/glx
10908 Cogl and Clutter should be able to use the experimental API so this
10909 adds the required define to the CPPFLAGS in the Makefiles.
10911 clutter/cogl/cogl/Makefile.am | 1 +
10912 clutter/glx/Makefile.am | 1 +
10913 clutter/x11/Makefile.am | 1 +
10914 3 files changed, 3 insertions(+)
10916 commit 7fae8ac05129285fefb470ff0b88d764a759d153
10917 Author: Neil Roberts <neil@linux.intel.com>
10918 Date: Fri Jun 18 14:30:23 2010 +0100
10920 cogl-defines.h: Add a COGL_HAS_X11 define
10922 This will be defined in cogl-defines.h whenever Cogl is built using a
10923 winsys that supports X11. This implies CoglTexturePixmapX11 will be
10926 To make this work the two separate cogl-defines.h.in files have been
10927 merged into one. The configure script now makes a @COGL_DEFINES@
10928 substitution variable which contains the #define lines to put in
10929 rather than directly having them in the seperate files.
10931 clutter/cogl/cogl/Makefile.am | 3 --
10932 clutter/cogl/cogl/cogl-defines.h.in | 36 ++++++++++++++++++++
10933 clutter/cogl/cogl/driver/gl/cogl-defines.h.in | 37 --------------------
10934 clutter/cogl/cogl/driver/gles/cogl-defines.h.in | 41 -----------------------
10935 configure.ac | 36 ++++++++++++++++++--
10936 5 files changed, 70 insertions(+), 83 deletions(-)
10938 commit a01b094630d748d4b0505852724b57b837e49d3a
10939 Author: Neil Roberts <neil@linux.intel.com>
10940 Date: Fri Jun 4 10:38:30 2010 +0100
10942 cogl: Add _cogl_xlib_{,un}trap_errors
10944 This is similar to clutter_x11_{,un}trap_errors except that it stores
10945 the previous trap state in a caller-allocated struct so that it can be
10948 Make _cogl_xlib_trap_errors re-entrant
10950 (this will be squashed into an earlier commit)
10952 clutter/cogl/cogl/winsys/cogl-context-winsys.c | 2 ++
10953 clutter/cogl/cogl/winsys/cogl-context-winsys.h | 23 ++++++++++++++
10954 clutter/cogl/cogl/winsys/cogl-xlib.c | 39 ++++++++++++++++++++++++
10955 clutter/cogl/cogl/winsys/cogl-xlib.h | 29 ++++++++++++++++++
10956 4 files changed, 93 insertions(+)
10958 commit 3abe26b913c895072d31fa5e88a8724ba311d174
10959 Author: Neil Roberts <neil@linux.intel.com>
10960 Date: Tue Jun 1 13:32:57 2010 +0100
10962 cogl-texture: Avoid premult conversion if the dst format has no alpha
10964 The _cogl_texture_needs_premult_conversion function was already
10965 checking whether the source format had an alpha channel before
10966 returning TRUE, but it also doesn't make sense to do the premult
10967 conversion if the destination format has no alpha. This patch adds
10970 clutter/cogl/cogl/cogl-texture.c | 3 ++-
10971 1 file changed, 2 insertions(+), 1 deletion(-)
10973 commit 279ad7b7e51572138d41bf5a078adab33a57c913
10974 Author: Neil Roberts <neil@linux.intel.com>
10975 Date: Wed Jun 2 17:55:56 2010 +0100
10977 cogl: Add the infrastructure for checking for winsys extensions
10979 This adds the framework needed to check for winsys specific extensions
10980 (such as GLX extensions) using a similar mechanism to the
10981 cogl-feature-functions header. There is a separate
10982 cogl-winsys-feature-functions header which will contain macros to list
10983 the extensions and functions. cogl_create_context_winsys now calls
10984 _cogl_feature_check for each of these functions. _cogl_feature_check
10985 has had to be changed to accept the driver prefix as the first
10986 parameter so that it can prepend "GLX" rather than "GL" in this case.
10988 clutter/cogl/cogl/Makefile.am | 1 +
10989 clutter/cogl/cogl/cogl-feature-private.c | 7 ++-
10990 clutter/cogl/cogl/cogl-feature-private.h | 3 +-
10991 clutter/cogl/cogl/driver/gl/cogl.c | 2 +-
10992 clutter/cogl/cogl/driver/gles/cogl.c | 2 +-
10993 clutter/cogl/cogl/winsys/cogl-context-winsys.c | 64 ++++++++++++++++++++
10994 clutter/cogl/cogl/winsys/cogl-context-winsys.h | 21 ++++++-
10995 .../cogl/winsys/cogl-winsys-feature-functions.h | 25 ++++++++
10996 8 files changed, 118 insertions(+), 7 deletions(-)
10998 commit 9cdcc155f37d2ed10a23c1b4f7261fb134e763c9
10999 Author: Neil Roberts <neil@linux.intel.com>
11000 Date: Wed May 19 16:13:07 2010 +0100
11002 Pass all Xlib events through Cogl
11004 The Clutter X11 backend now passes all events through
11005 _cogl_xlib_handle_event. This function can now internally be hooked
11006 with _cogl_xlib_add_filter. These are added to a list of callbacks
11007 which are all called in turn by _cogl_xlib_handle_event. This is
11008 intended to be used internally in Cogl by any parts that need to see
11011 Cogl now also has an internally exposed function to set a pointer to
11012 the Xlib display. This is stored in a global variable. The Clutter X11
11015 _cogl_xlib_handle_event and _cogl_xlib_set_display can be removed once
11016 Cogl gains a proper window system abstraction.
11018 clutter/cogl/cogl/Makefile.am | 11 ++--
11019 clutter/cogl/cogl/cogl-internal.h | 52 ++++++++++++++++
11020 clutter/cogl/cogl/winsys/cogl-context-winsys.c | 20 ++++++
11021 clutter/cogl/cogl/winsys/cogl-context-winsys.h | 7 +++
11022 clutter/cogl/cogl/winsys/cogl-xlib.c | 77 ++++++++++++++++++++++++
11023 clutter/cogl/cogl/winsys/cogl-xlib.h | 37 ++++++++++++
11024 clutter/x11/clutter-backend-x11.c | 5 ++
11025 clutter/x11/clutter-event-x11.c | 6 ++
11026 8 files changed, 211 insertions(+), 4 deletions(-)
11028 commit 811bbba0751d76f742c9db11d07a227ff4d21848
11029 Author: Neil Roberts <neil@linux.intel.com>
11030 Date: Wed Jun 2 15:16:14 2010 +0100
11032 cogl: Add a struct for winsys-specific data to CoglContext
11034 This creates a separate struct to store the fields of the context that
11035 are specific to the winsys. This is all stored in one file but ideally
11036 this could work more like the CoglContextDriver struct and have a
11037 different header for each winsys.
11039 clutter/cogl/cogl/Makefile.am | 2 ++
11040 clutter/cogl/cogl/cogl-context.c | 8 +++++
11041 clutter/cogl/cogl/cogl-context.h | 2 ++
11042 clutter/cogl/cogl/winsys/cogl-context-winsys.c | 38 ++++++++++++++++++++++++
11043 clutter/cogl/cogl/winsys/cogl-context-winsys.h | 32 ++++++++++++++++++++
11044 5 files changed, 82 insertions(+)
11046 commit 3a3d55cd88f347c8fbd307401f13f1453caa9b26
11047 Author: Neil Roberts <neil@linux.intel.com>
11048 Date: Thu Jun 10 15:33:34 2010 +0100
11050 cogl: Add an internal CoglTextureRectangle backend
11052 This adds an internal rectangle texture backend which is mostly based
11053 on the CoglTexture2D backend. It will throw assert failures if any
11054 operations are attempted that rectangle textures don't support, such
11055 as mipmapping or hardware repeating.
11057 clutter/cogl/cogl/Makefile.am | 2 +
11058 clutter/cogl/cogl/cogl-texture-rectangle-private.h | 68 ++
11059 clutter/cogl/cogl/cogl-texture-rectangle.c | 662 ++++++++++++++++++++
11060 .../cogl/cogl/driver/gl/cogl-feature-functions.h | 7 +
11061 clutter/cogl/cogl/driver/gl/cogl-texture-driver.c | 41 +-
11062 5 files changed, 763 insertions(+), 17 deletions(-)
11064 commit fd3a3e93bf000960afe740bf76d62ccbad385b8c
11065 Author: Neil Roberts <neil@linux.intel.com>
11066 Date: Wed Jun 9 17:39:59 2010 +0100
11068 cogl-texture: Replace the ensure_mipmaps virtual with pre_paint
11070 Instead of the ensure_mipmaps virtual that is only called whenever the
11071 texture is about to be rendered with a min filter that needs the
11072 mipmap, there is now a pre_paint virtual that is always called when
11073 the texture is about to be painted in any way. It has a flags
11074 parameter which is used to specify whether the mipmap will be needed.
11076 This is useful for CoglTexturePixmapX11 because it needs to do stuff
11077 before painting that is unrelated to mipmapping.
11079 clutter/cogl/cogl/cogl-atlas-texture.c | 13 ++++++-----
11080 clutter/cogl/cogl/cogl-material-private.h | 7 +++---
11081 clutter/cogl/cogl/cogl-material.c | 33 ++++++++++++++--------------
11082 clutter/cogl/cogl/cogl-primitives.c | 4 ++--
11083 clutter/cogl/cogl/cogl-sub-texture.c | 7 +++---
11084 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 9 ++++++--
11085 clutter/cogl/cogl/cogl-texture-2d.c | 27 ++++++++++++-----------
11086 clutter/cogl/cogl/cogl-texture-private.h | 12 ++++++++--
11087 clutter/cogl/cogl/cogl-texture.c | 4 ++--
11088 clutter/cogl/cogl/cogl-vertex-buffer.c | 2 +-
11089 10 files changed, 67 insertions(+), 51 deletions(-)
11091 commit 87240cd764ad29d5789c0f72c71614f1b79fe29f
11092 Author: Neil Roberts <neil@linux.intel.com>
11093 Date: Fri Jun 11 13:50:36 2010 +0100
11095 cogl-texture: List texture subclass types rather than hardcoding them
11097 Instead of having a hardcoded series of if-statements in
11098 cogl_is_texture to determine which types should appear as texture
11099 subclasses, they are now stored in a GSList attached to the Cogl
11100 context. The list is amended to using a new cogl_texture_register_type
11101 function. There is a convenience macro called COGL_TEXTURE_DEFINE
11102 which uses COGL_HANDLE_DEFINE_WITH_CODE to register the texture type
11103 when the _get_type() function is first called.
11105 clutter/cogl/cogl/cogl-atlas-texture.c | 2 +-
11106 clutter/cogl/cogl/cogl-context.c | 4 ++++
11107 clutter/cogl/cogl/cogl-context.h | 4 ++++
11108 clutter/cogl/cogl/cogl-sub-texture.c | 2 +-
11109 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 2 +-
11110 clutter/cogl/cogl/cogl-texture-2d.c | 2 +-
11111 clutter/cogl/cogl/cogl-texture-private.h | 11 +++++++++++
11112 clutter/cogl/cogl/cogl-texture.c | 21 +++++++++++++++++----
11113 8 files changed, 40 insertions(+), 8 deletions(-)
11115 commit 5ea8c5bd122a6d630b1aaebf7047e00346db6a39
11116 Author: Neil Roberts <neil@linux.intel.com>
11117 Date: Fri Jun 11 13:44:27 2010 +0100
11119 Add COGL_{OBJECT,HANDLE}_DEFINE_WITH_CODE
11121 This macro is similar to COGL_HANDLE_DEFINE_WITH_CODE except that it
11122 allows a snippet of code to be inserted into the _get_type()
11123 function. This is similar to how G_DEFINE_TYPE_WITH_CODE
11124 works. COGL_HANDLE_DEFINE is now just a wrapper around
11125 COGL_HANDLE_DEFINE_WITH_CODE.
11127 clutter/cogl/cogl/cogl-object-private.h | 17 +++++++++++++----
11128 1 file changed, 13 insertions(+), 4 deletions(-)
11130 commit 97225a96a6f7032273c225e525678d3dc9433cc8
11131 Author: Neil Roberts <neil@linux.intel.com>
11132 Date: Thu Jun 3 15:06:47 2010 +0100
11134 Add _cogl_texture_2d_externally_modified
11136 _cogl_texture_2d_externally_modified is a function specific to the
11137 CoglTexture2D texture backend that should be called whenever the
11138 contents of the texture are modified without the backend knowing about
11139 it. It simply marks the mipmap tree as invalid.
11141 clutter/cogl/cogl/cogl-texture-2d-private.h | 11 +++++++++++
11142 clutter/cogl/cogl/cogl-texture-2d.c | 9 +++++++++
11143 2 files changed, 20 insertions(+)
11145 commit 7e149c5ca93e4de3194cc3344eba7fb183dfbeb3
11146 Author: Neil Roberts <neil@linux.intel.com>
11147 Date: Wed Jun 2 15:01:18 2010 +0100
11149 cogl: Fix the include path in driver/*/Makefile.am
11151 The include path for the winsys and driver folder was given relative
11152 to $(srcdir) so it would end up relative to the driver folder which is
11153 wrong. It is now specified as $(srcdir)/../../winsys to get the right
11154 location. The driver folder is removed because it is actually just
11155 $(srcdir) and that is already included.
11157 clutter/cogl/cogl/driver/gl/Makefile.am | 3 +--
11158 clutter/cogl/cogl/driver/gles/Makefile.am | 3 +--
11159 2 files changed, 2 insertions(+), 4 deletions(-)
11161 commit a871ac669f68c5932cf5af575e12b2660e1a335d
11162 Author: Robert Bragg <robert@linux.intel.com>
11163 Date: Tue Jun 8 22:54:26 2010 +0100
11165 test-shader: guard GLES2 specific changes with COGL_HAS_GLES2
11167 Previously we were using an internal only HAVE_COGL_GLES2 define to
11168 guard GLES 2 specific changes so for instance the precision modifiers
11169 weren't being emitted in the shader source.
11171 http://bugzilla.o-hand.com/show_bug.cgi?id=2178
11173 tests/interactive/test-shader.c | 12 ++++++------
11174 1 file changed, 6 insertions(+), 6 deletions(-)
11176 commit 60cad4bf0b4a52d6727ce7986965e972db0b4f89
11177 Author: Robert Bragg <robert@linux.intel.com>
11178 Date: Tue Jun 8 18:38:25 2010 +0100
11180 gles2: don't disable clip planes for GLES2
11182 GLES2 doesn't provide user clip planes (you would have to use a vertex +
11183 fragment shader to achieve the same kind of result) so we make sure not
11184 to call glEnable/Disable with any of the GL_CLIP_PLANE0..3 defines.
11186 http://bugzilla.o-hand.com/show_bug.cgi?id=2177
11188 clutter/cogl/cogl/cogl-clip-stack.c | 3 ++-
11189 1 file changed, 2 insertions(+), 1 deletion(-)
11191 commit 00bb189e71374ddcd1437fc5913f89ada9f39f23
11192 Author: Robert Bragg <robert@linux.intel.com>
11193 Date: Tue Jun 22 11:21:09 2010 +0100
11195 material: fix a typo in _cogl_material_journal_unref
11197 The function had a line like:
11199 CoglMaterial *material =
11200 material = _cogl_material_pointer_from_handle (material_handle);
11202 where the duplicate "material =" wasn't intended, so this patch removes
11205 clutter/cogl/cogl/cogl-material.c | 2 +-
11206 1 file changed, 1 insertion(+), 1 deletion(-)
11208 commit db1434ab718f04c098afe9d60419a6b98805778e
11209 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11210 Date: Tue Jun 22 08:00:40 2010 +0100
11212 json: Bump up the requirement of json-glib
11214 We're actually using a symbol (the JSON_NODE_HOLDS macro) that was
11215 defined in json-glib 0.10, so we need to bump up the dependency.
11218 configure.ac | 4 ++--
11219 2 files changed, 3 insertions(+), 3 deletions(-)
11221 commit 8a9890e1387ccb1228384657bb8d889fe12accd3
11222 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11223 Date: Tue Jun 22 07:58:49 2010 +0100
11225 json: Backport JSON_NODE_HOLDS macros
11227 Unbreak the compilation with the internal copy of json-glib.
11229 clutter/json/json-types.h | 6 ++++++
11230 1 file changed, 6 insertions(+)
11232 commit 1eb7f5758211aaac44efd159bafc44d6de8dd87d
11233 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11234 Date: Mon Jun 21 18:56:16 2010 +0100
11236 x11: Use the _clutter symbols for xsettings_* API
11238 Instead of using the bare xsettings_* API; this maintains consistency.
11240 clutter/x11/clutter-backend-x11.c | 4 ++--
11241 1 file changed, 2 insertions(+), 2 deletions(-)
11243 commit f3adc600fc7f11338b5e213b5ad049ca069531e4
11244 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11245 Date: Mon Jun 21 18:01:57 2010 +0100
11247 backend: Undeprecated clutter_backend_get_resolution()
11249 Since the Settings:font-dpi property is exposed as 1024 * real_dpi in
11250 order to make the setting as neutral as possible (and allow XSETTINGS
11251 to use it natively) we need a simple API returning the DPI using a
11252 floating point value.
11254 clutter/clutter-backend.c | 14 +++++++++++---
11255 clutter/clutter-backend.h | 3 ++-
11256 2 files changed, 13 insertions(+), 4 deletions(-)
11258 commit 19de6d9e5d3acd29667960d35f1d58fdfa301055
11259 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11260 Date: Mon Jun 21 17:58:26 2010 +0100
11262 Deprecate the Backend settings
11264 The Settings instance is the preferred way of accessing the settings.
11266 clutter/clutter-backend.h | 9 ++++++---
11267 1 file changed, 6 insertions(+), 3 deletions(-)
11269 commit e95a0c194f9cc7e3852ddff4b24006cc64231033
11270 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11271 Date: Mon Jun 21 17:57:57 2010 +0100
11273 Remove default settings from backends
11275 The defaults are set in the Settings instance.
11277 clutter/egl/clutter-backend-egl.c | 4 ----
11278 clutter/win32/clutter-backend-win32.c | 3 ++-
11279 2 files changed, 2 insertions(+), 5 deletions(-)
11281 commit cd8548fd6fd7807fea1dcbe3752d1b32bd998246
11282 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11283 Date: Mon Jun 21 17:57:11 2010 +0100
11285 docs: Add Settings to the API reference
11287 And document properties.
11289 clutter/clutter-settings.c | 120 +++++++++++++++++++++++++++++
11290 doc/reference/clutter/clutter-docs.xml.in | 1 +
11291 doc/reference/clutter/clutter.types | 1 +
11292 3 files changed, 122 insertions(+)
11294 commit b470d6930d8995b2e5d1353486394c12fc55187e
11295 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11296 Date: Mon Jun 21 16:10:49 2010 +0100
11298 settings: freeze notification on XSETTINGS notify
11300 clutter/x11/clutter-backend-x11.c | 4 ++++
11301 1 file changed, 4 insertions(+)
11303 commit 98c3c84c004c65ca97f1b9118554bc8e694e0e5f
11304 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11305 Date: Mon Jun 21 15:43:31 2010 +0100
11307 x11: Add the XSETTINGS machinery
11309 Use the XSETTINGS machinery to get notification from foreign
11310 environments about settings that might interest Clutter itself - namely:
11311 the default font name, the font DPI, and the Xft font options that can
11312 be mapped on cairo_font_options_t.
11314 clutter/x11/Makefile.am | 6 +
11315 clutter/x11/clutter-backend-x11.c | 87 ++++-
11316 clutter/x11/clutter-backend-x11.h | 4 +
11317 clutter/x11/clutter-settings-x11.h | 24 ++
11318 clutter/x11/xsettings/xsettings-client.c | 609 ++++++++++++++++++++++++++++++
11319 clutter/x11/xsettings/xsettings-client.h | 79 ++++
11320 clutter/x11/xsettings/xsettings-common.c | 265 +++++++++++++
11321 clutter/x11/xsettings/xsettings-common.h | 132 +++++++
11322 8 files changed, 1199 insertions(+), 7 deletions(-)
11324 commit 437dcad86ae273d9b9a4b159cb8be42706733575
11325 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11326 Date: Mon Jun 21 15:42:20 2010 +0100
11328 settings: Migrate Backend settings to a new object
11330 Instead of storing settings inside the Backend instance we should use a
11331 separate public object.
11333 clutter/Makefile.am | 2 +
11334 clutter/clutter-backend.c | 136 ++++++++-------
11335 clutter/clutter-backend.h | 1 +
11336 clutter/clutter-private.h | 3 +
11337 clutter/clutter-settings.c | 401 ++++++++++++++++++++++++++++++++++++++++++++
11338 clutter/clutter-settings.h | 24 +++
11339 clutter/clutter.h | 1 +
11340 7 files changed, 512 insertions(+), 56 deletions(-)
11342 commit e4e6a6dfe5c011c317ec882fab59b04feddb6eeb
11343 Author: Robert Bragg <robert@linux.intel.com>
11344 Date: Fri Jun 18 13:59:00 2010 +0100
11346 configure.ac only explicitly add -lGL if no pkgconfig file
11348 When configuring the glx flavour we were always explicitly adding -lGL
11349 to the linker flags even when a pkg-config file was found which should
11350 take care of that option for us.
11352 configure.ac | 8 +++++---
11353 1 file changed, 5 insertions(+), 3 deletions(-)
11355 commit c767feecbbe75dd1da20e93612dfbbfbc4ffdf33
11356 Author: Robert Bragg <robert@linux.intel.com>
11357 Date: Fri Jun 18 13:35:09 2010 +0100
11359 configure.ac: Use pkg-config for gles1/2 if available
11361 When building for gles1/2 we now always try and look for a libglesv1_cm
11362 or libglesv2 .pc file with details about where to find the library and
11365 configure.ac | 141 ++++++++++++++++++++++++++++++++--------------------------
11366 1 file changed, 77 insertions(+), 64 deletions(-)
11368 commit d45ac12628489f3adf2210a7ec9f08f7a2cb4cf9
11369 Author: Robert Bragg <robert@linux.intel.com>
11370 Date: Fri Jun 18 04:38:43 2010 +0100
11372 egl: Consolidates eglx and eglnative into one "egl" winsys
11374 This remove quite a lot of redundant code by consolidating the eglx and
11375 eglnative window system backends.
11377 clutter/Makefile.am | 2 +-
11378 clutter/cogl/cogl/Makefile.am | 4 +-
11379 clutter/cogl/cogl/winsys/cogl-egl.c | 41 ++
11380 clutter/cogl/cogl/winsys/cogl-eglnative.c | 35 --
11381 clutter/cogl/cogl/winsys/cogl-eglx.c | 41 --
11382 clutter/egl/Makefile.am | 42 ++
11383 clutter/egl/clutter-backend-egl.c | 807 +++++++++++++++++++++++++++
11384 clutter/egl/clutter-backend-egl.h | 116 ++++
11385 clutter/egl/clutter-egl-headers.h | 38 ++
11386 clutter/egl/clutter-egl.h | 76 +++
11387 clutter/egl/clutter-event-tslib.c | 297 ++++++++++
11388 clutter/egl/clutter-stage-egl.c | 366 +++++++++++++
11389 clutter/egl/clutter-stage-egl.h | 55 ++
11390 clutter/eglnative/Makefile.am | 29 -
11391 clutter/eglnative/clutter-backend-egl.c | 817 ---------------------------
11392 clutter/eglnative/clutter-backend-egl.h | 110 ----
11393 clutter/eglnative/clutter-egl-headers.h | 33 --
11394 clutter/eglnative/clutter-egl.h | 48 --
11395 clutter/eglnative/clutter-event-tslib.c | 297 ----------
11396 clutter/eglnative/clutter-stage-egl.c | 366 -------------
11397 clutter/eglnative/clutter-stage-egl.h | 41 --
11398 clutter/eglx/Makefile.am | 30 -
11399 clutter/eglx/clutter-backend-egl.c | 823 ----------------------------
11400 clutter/eglx/clutter-backend-egl.h | 116 ----
11401 clutter/eglx/clutter-egl-headers.h | 38 --
11402 clutter/eglx/clutter-eglx.h | 54 --
11403 clutter/eglx/clutter-stage-egl.c | 366 -------------
11404 clutter/eglx/clutter-stage-egl.h | 42 --
11405 configure.ac | 9 +-
11406 doc/reference/clutter/Makefile.am | 12 +-
11407 doc/reference/clutter/clutter-docs.xml.in | 3 +-
11408 doc/reference/clutter/clutter-sections.txt | 7 +-
11409 32 files changed, 1851 insertions(+), 3310 deletions(-)
11411 commit 46bed23302a56eec8cb873670396927d2739ce71
11412 Author: Robert Bragg <robert@linux.intel.com>
11413 Date: Fri Jun 18 00:29:12 2010 +0100
11415 tslib: Add USE_TSLIB conditional for clutter-event-tslib.c
11417 This adds an automake USE_TSLIB condition to decide when we should
11418 compile clutter-event-tslib.c. This is in preparation for consolidating
11419 the eglx and eglnative backends.
11421 clutter/eglnative/Makefile.am | 6 +++++-
11422 configure.ac | 2 ++
11423 2 files changed, 7 insertions(+), 1 deletion(-)
11425 commit 5b6800bf63043fa047357656179d8767c77dce0c
11426 Author: Robert Bragg <robert@linux.intel.com>
11427 Date: Fri Jun 18 00:25:57 2010 +0100
11429 egl: rename clutter-event-egl.c -> clutter-event-tslib.c
11431 clutter-event-egl had nothing to do with EGL, it's code for opening
11432 tslib devices and creating a GSource for touch screen events. It just
11433 happens that this only ever gets used with the eglnative backend.
11435 clutter/eglnative/Makefile.am | 2 +-
11436 clutter/eglnative/clutter-event-egl.c | 297 -------------------------------
11437 clutter/eglnative/clutter-event-tslib.c | 297 +++++++++++++++++++++++++++++++
11438 3 files changed, 298 insertions(+), 298 deletions(-)
11440 commit ad9006e561c399cf3b5045de7aaac5e6e9684c5c
11441 Author: Robert Bragg <robert@linux.intel.com>
11442 Date: Fri Jun 18 00:18:02 2010 +0100
11444 clutter event egl: fixes lots of compiler warnings
11446 The way the #ifdef HAVE_TSLIB guards were spread around it meant there
11447 were lots of warnings about unused variables when building without
11450 clutter/eglnative/clutter-event-egl.c | 25 +++++++++++++++----------
11451 1 file changed, 15 insertions(+), 10 deletions(-)
11453 commit cd82b704e9e7b5b96cbdb470f933ae8e1edae46d
11454 Author: Robert Bragg <robert@linux.intel.com>
11455 Date: Thu Jun 17 23:12:34 2010 +0100
11457 egl: support creating OpenGL contexts
11459 Right before we create the EGL context, we check if we were built with
11460 OpenGL or OpenGLES support and it was OpenGL then we call eglBindAPI
11461 (EGL_OPENGL_API); This also explicitly requests a EGL_RENDERABLE_TYPE
11462 supporting the EGL_OPENGL_BIT.
11464 This will let us add a new ./configure flavour that combines OpenGL and
11465 EGL instead of OpenGL and GLX.
11467 clutter/eglx/clutter-backend-egl.c | 8 +++++++-
11468 1 file changed, 7 insertions(+), 1 deletion(-)
11470 commit a84ecf3919cde7142de97c29a0f840c85491d84f
11471 Author: Robert Bragg <robert@linux.intel.com>
11472 Date: Thu Jun 17 22:26:12 2010 +0100
11474 egl: Unify the eglx and eglnative backends
11476 Without actually consolidating the two backends this patch brings their
11477 code within a cats whisker of each other in preparation for
11480 clutter/eglnative/clutter-backend-egl.c | 637 ++++++++++++++++++++++++-------
11481 clutter/eglnative/clutter-backend-egl.h | 41 +-
11482 clutter/eglnative/clutter-stage-egl.c | 262 ++++++++++++-
11483 clutter/eglnative/clutter-stage-egl.h | 3 +
11484 clutter/eglx/clutter-backend-egl.c | 396 ++++++++++++++++---
11485 clutter/eglx/clutter-backend-egl.h | 51 ++-
11486 clutter/eglx/clutter-stage-egl.c | 156 +++++++-
11487 7 files changed, 1310 insertions(+), 236 deletions(-)
11489 commit 53bf95466b938951ccb47a67f4d74a1441fd4799
11490 Author: Robert Bragg <robert@linux.intel.com>
11491 Date: Thu Jun 17 23:23:12 2010 +0100
11493 build: Adds a new opengl-egl-xlib build flavour
11495 With this patch if you ./configure clutter using
11496 --with-flavour=opengl-egl-xlib then it will use EGL + OpenGL instead of
11497 the default GLX and OpenGL.
11499 These days upstream driver work is more focused on improving EGL than it
11500 is GLX so likewise we want to make sure Clutter has good support for
11503 configure.ac | 25 ++++++++++++++++++++++++-
11504 1 file changed, 24 insertions(+), 1 deletion(-)
11506 commit bf9d5f394997c0ff9d7b4a3671ac04499d0c3fb2
11507 Author: Robert Bragg <robert@linux.intel.com>
11508 Date: Fri Jun 18 01:25:46 2010 +0100
11510 build: distinguish CLUTTER_WINSYS and CLUTTER_SONAME_INFIX
11512 This adds a separate variable name "CLUTTER_SONAME_INFIX" to define the
11513 infix for the clutter library that gets linked. Currently the WINSYS
11514 corresponds to the directory we enter when building to compile the
11515 window system and input support, but it is desirable to be able to
11516 define multiple flavours that use the same WINSYS but should result in
11517 different library names.
11519 For example we are planning to combine the eglx and eglnative window
11520 systems into one "egl" winsys but we will need to preserve the current
11521 library names for the eglx and eglnative flavours.
11523 Makefile.am | 4 ++--
11524 clutter.pc.in | 3 ++-
11525 clutter/Makefile.am | 16 ++++++++--------
11526 configure.ac | 9 ++++++++-
11527 doc/reference/clutter/Makefile.am | 2 +-
11528 tests/conform/Makefile.am | 2 +-
11529 tests/interactive/Makefile.am | 2 +-
11530 tests/micro-bench/Makefile.am | 2 +-
11531 8 files changed, 24 insertions(+), 16 deletions(-)
11533 commit 4bd44738fd80cbd43c8e08b2a9da8dce4fec5bab
11534 Author: Robert Bragg <robert@linux.intel.com>
11535 Date: Fri Jun 18 01:56:23 2010 +0100
11537 configure.ac: avoid some duplication
11539 When we check the flavour we now just set boolean variables for the
11546 SUPPORT_EGL_POWERVR_X11=1
11547 SUPPORT_EGL_POWERVR_NULL=1
11549 This lets us avoid some duplication and also some error prone tests for
11550 lists of flavours used, for example, to determine when we need to check
11553 configure.ac | 108 ++++++++++++++++++++++++++++++++++------------------------
11554 1 file changed, 64 insertions(+), 44 deletions(-)
11556 commit 25ed304567561bf95baab1c77cda8b06d01b97eb
11557 Author: Robert Bragg <robert@linux.intel.com>
11558 Date: Fri Jun 18 01:13:33 2010 +0100
11560 configure.ac: distinguish CLUTTER_FLAVOUR and CLUTTER_WINSYS
11562 It's desirable to have a separation between the "flavour" and the
11563 "winsys". The flavour is a concept internal to the configure script and
11564 is a convenient name to represent the users choice of window system,
11565 opengl driver and input backend. The CLUTTER_WINSYS currently defines
11566 the subdirectory under clutter/ that should be compiled to handle the
11567 window system and input.
11569 With a separation we could add a flavour with no correspondence to which
11570 clutter/subdirectory needs to be built.
11572 configure.ac | 18 ++++++++++++++----
11573 1 file changed, 14 insertions(+), 4 deletions(-)
11575 commit c3e43a7e473023c327e91094cbe5b9d0a103ec21
11576 Author: Robert Bragg <robert@linux.intel.com>
11577 Date: Fri Jun 18 01:07:59 2010 +0100
11579 configure.ac: move the special handling of the fruity flavour
11581 After checking the flavour option the user gives we were checking for
11582 the fruity flavour to override the glesversion. Now that the glsl
11583 checking has been moved this can instead just wait until the AS_CASE
11584 that handles all the flavour configuration.
11586 configure.ac | 5 ++---
11587 1 file changed, 2 insertions(+), 3 deletions(-)
11589 commit e3293abcd473d8942acfce9eafb2877e2f44ee49
11590 Author: Robert Bragg <robert@linux.intel.com>
11591 Date: Fri Jun 18 01:02:38 2010 +0100
11593 configure.ac: move gles checks after the flavour checks
11595 The flavour AS_CASE should define whether a flavour uses the gl or gles
11596 COGL_DRIVER and so we shouldn't need to have an expanding list of
11597 tests to gate when we check for a gles driver because if we move the
11598 checks for gles after the flavour checks we can just look at
11601 configure.ac | 177 +++++++++++++++++++++++++++++-----------------------------
11602 1 file changed, 89 insertions(+), 88 deletions(-)
11604 commit c151fa2efd8a794c0feab319d05d06796c6f4b3e
11605 Author: Robert Bragg <robert@linux.intel.com>
11606 Date: Fri Jun 18 01:02:38 2010 +0100
11608 configure.ac: don't have so many XYX_{LIBS,CFLAGS} vars
11610 This removes EGL_{LIBS,CFLAGS}, GLX_{LIBS,CFLAGS}, OSX_{LIBS,CFLAGS},
11611 WIN32_{LIBS,CFLAGS}, and GLES_{LIBS,CFLAGS} and instead we just append
11612 to FLAVOUR_{LIBS,CFLAGS}.
11614 This makes more of the file relocatable because there were previously
11615 dependencies on the order that some variables were setup in.
11617 configure.ac | 37 ++++++++++++++++++++-----------------
11618 1 file changed, 20 insertions(+), 17 deletions(-)
11620 commit e2dcd7e852c2bda2a6bf72c7c3f777c16ff9c89b
11621 Author: Neil Roberts <neil@linux.intel.com>
11622 Date: Fri Jun 18 15:19:59 2010 +0100
11624 clutter-stage: Use g_array_free instead of g_array_unref
11626 g_array_unref was only added in GLib 2.22 so we should really update
11627 the requirements in the configure script if we want to use that
11628 function. However the array doesn't appear to have any extra reference
11629 taken on it anywhere so it should be safe to use g_array_free instead.
11631 clutter/clutter-state.c | 2 +-
11632 1 file changed, 1 insertion(+), 1 deletion(-)
11634 commit 5a73e20a15ea0b84a1788a70e23d8814eb4519af
11635 Author: Neil Roberts <neil@linux.intel.com>
11636 Date: Fri Jun 18 15:25:51 2010 +0100
11638 cogl-context: Use the function pointer for glActiveUnit
11640 Under WGL, any functions that were defined after GL 1.1 are not
11641 directly exported in the DLL so we need to reference them via the
11642 function pointers. A new call to glActiveUnit was missed in
11645 clutter/cogl/cogl/cogl-context.c | 4 ++++
11646 1 file changed, 4 insertions(+)
11648 commit 9cc90333473e33d590242891a463165e5e80890f
11649 Author: Neil Roberts <neil@linux.intel.com>
11650 Date: Fri Jun 18 15:33:03 2010 +0100
11652 cogl-material: Don't use the symbol 'near'
11654 The window headers contain the line
11658 so it's not possible to use the symbol 'near' in code that's portable
11659 to Windows. This replaces it with 'near_val'.
11661 I think the define is meant to improve compatibility with code written
11662 for Windows 3.1 where near would be a keyword to make it a smaller
11665 clutter/cogl/cogl/cogl-material.c | 20 ++++++++++----------
11666 clutter/cogl/cogl/cogl-material.h | 16 ++++++++--------
11667 2 files changed, 18 insertions(+), 18 deletions(-)
11669 commit 0411ba7d3235508554035406dc747df19e8deffb
11670 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11671 Date: Thu Jun 17 17:35:00 2010 +0100
11673 actor: Parse actions, constraints and effects members
11675 ClutterActor should allow attaching actions, constraints and effects
11676 just like it allows behaviours, e.g.:
11682 "type" : "ClutterAlignConstraint",
11683 "source" : "stage",
11684 "align-axis" : "x-axis",
11688 "type" : "ClutterAlignConstraint",
11689 "source" : "stage",
11690 "align-axis" : "y-axis",
11703 "type" : "ClutterDragAction",
11705 { "name" : "drag-end", "handler" : "on_drag_end" }
11712 In order to do so, we use the Scriptable interface implementation and
11713 add three new custom properties accepting an array; then we parse each
11714 member of the array as a new object.
11716 clutter/clutter-actor.c | 86 ++++++++++++++++++++++++++++--
11717 tests/data/test-script-named-object.json | 36 ++++++++++---
11718 2 files changed, 111 insertions(+), 11 deletions(-)
11720 commit a75c02a5d688a85608b628a89bdd4949e3b53faa
11721 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11722 Date: Thu Jun 17 17:33:10 2010 +0100
11724 constraints: Allow Align and Bind sources to be NULL
11726 Since constructing AlignConstraint and BindConstraint instances could be
11727 deferred (think ClutterScript) we need to make their :source properties
11728 setters accept NULL. This does not break the constraints because they
11729 need to handle that condition in case they actor to which they are
11730 applied is destroyed and somebody is holding a reference on them anyway.
11732 clutter/clutter-align-constraint.c | 27 ++++++++++++++++-----------
11733 clutter/clutter-bind-constraint.c | 28 ++++++++++++++++------------
11734 2 files changed, 32 insertions(+), 23 deletions(-)
11736 commit a4dbcf0c32e8143dba4f7dbd4f1191c3225af413
11737 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11738 Date: Thu Jun 17 16:41:44 2010 +0100
11740 script-parser: Expose extracting the id from a node
11742 The get_id_from_node() internal function should be exposed inside
11743 Clutter (as a private function) because it can be useful to other
11744 custom parsing code. The code is pretty trivial, but it would be
11745 pointless to re-implement it.
11747 clutter/clutter-script-parser.c | 10 +++++-----
11748 clutter/clutter-script-private.h | 2 ++
11749 2 files changed, 7 insertions(+), 5 deletions(-)
11751 commit c85d535a090e1fbe5e6efe32036c4e13a04890cb
11752 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11753 Date: Thu Jun 17 12:32:24 2010 +0100
11755 actor: Disable the layout cycle warning with debug disabled
11757 If Clutter has been configured with --enable-debug set to 'no' then we
11758 hide most of the warnings.
11760 clutter/clutter-actor.c | 2 ++
11761 1 file changed, 2 insertions(+)
11763 commit 77c63e0237efd6fe91f33aca6e3bd4903d57aee5
11764 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11765 Date: Thu Jun 17 12:02:28 2010 +0100
11767 bind-constraint: Add accessor methods
11769 ClutterBindConstraint should have accessor methods for its properties,
11770 to allow direct manipulation instead of going through GObject's API.
11772 clutter/clutter-bind-constraint.c | 213 ++++++++++++++++++++--------
11773 clutter/clutter-bind-constraint.h | 16 ++-
11774 doc/reference/clutter/clutter-sections.txt | 6 +
11775 3 files changed, 172 insertions(+), 63 deletions(-)
11777 commit 52d2e7d25de2be9b8acd7dba800fafff690af1ab
11778 Author: Øyvind Kolås <pippin@linux.intel.com>
11779 Date: Wed Jun 16 17:33:48 2010 +0100
11781 state: add a duration property
11783 Adding a duration property to ClutterState allows the json parsing
11784 to parse the default transition duration with the generic code paths.
11786 clutter/clutter-state.c | 20 ++++++++++++++++++++
11787 1 file changed, 20 insertions(+)
11789 commit 351b6c0543390a3e1289aec7cf14058ffc4eb6af
11790 Author: Øyvind Kolås <pippin@linux.intel.com>
11791 Date: Wed Jun 16 17:44:06 2010 +0100
11793 state: avoid walking off empty list
11795 When removing the last key in a list, the last part of the for statement
11796 could cause dereferencing (NULL)->next and thus segfaulting.
11798 clutter/clutter-state.c | 2 +-
11799 1 file changed, 1 insertion(+), 1 deletion(-)
11801 commit 35c6179a8e01ca02ee3239ec8e4a0379e41ada09
11802 Author: Øyvind Kolås <pippin@linux.intel.com>
11803 Date: Wed Jun 16 17:43:44 2010 +0100
11805 animator: avoid walking off empty list
11807 When removing the last key in a list, the last part of the for statement
11808 could cause dereferencing (NULL)->next and thus segfaulting.
11810 clutter/clutter-animator.c | 2 +-
11811 1 file changed, 1 insertion(+), 1 deletion(-)
11813 commit 698cce8276eeff945980f16ebe3ac585bd71a9b7
11814 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11815 Date: Wed Jun 16 17:17:27 2010 +0100
11817 shader-effect: Add a size check
11819 Similar to the one in commit 2a354d9650bb8215dd75a90b947fb82734c35b78
11820 that went into clutter_value_set_shader_*. We end up in the same
11821 situation, but it's better to fail from within ClutterShaderEffect.
11823 clutter/clutter-shader-effect.c | 4 ++++
11824 1 file changed, 4 insertions(+)
11826 commit 2a354d9650bb8215dd75a90b947fb82734c35b78
11827 Author: Richard Hughes <richard@hughsie.com>
11828 Date: Wed Jun 16 16:19:48 2010 +0100
11830 shader-types: Check the size of the values
11832 Emit a critical error if the user tries to send more data than
11833 the static shader GValues can hold.
11835 This fixes the random memory corruption you get when specifying
11838 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
11840 clutter/clutter-shader-types.c | 3 +++
11841 1 file changed, 3 insertions(+)
11843 commit 2d99f77e3b0027c83b9b2068d65b39d18dbfdbd3
11844 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11845 Date: Wed Jun 16 13:58:41 2010 +0100
11847 cairo-texture: Disable :sync-size
11849 The :sync-size property of ClutterTexture should be set to FALSE by
11850 default by ClutterCairoTexture. The preferred size of the
11851 ClutterCairoTexture is already the size of the internal Cairo surface,
11852 and we override the preferred width/height getters to that effect.
11854 The :sync-size property is also responsible of changing the size of
11855 the Texture actor when changing the texture handle - but since we
11856 encourage that to happen during the CairoTexture allocation, we get a
11857 queue_relayout() invocation (and a warning) when we change the size
11858 of the Cairo image surface.
11860 Since GObject doesn't make it easy to override the default value of the
11861 :sync-size property in sub-classes, we should simply call the setter
11862 function during the ClutterCairoTexture instance initialization.
11864 We should also change one of the interactive tests using a CairoTexture
11865 to rebuild the contents of the actor in response to an allocation.
11867 clutter/clutter-cairo-texture.c | 8 +++++
11868 tests/interactive/test-bin-layout.c | 66 ++++++++++++++++++++++++++++++-----
11869 2 files changed, 65 insertions(+), 9 deletions(-)
11871 commit 72fa820dbdc9edee264015146715d98d7728a8a5
11872 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11873 Date: Wed Jun 16 12:53:02 2010 +0100
11875 cairo-texture: Clean up style
11877 clutter/clutter-cairo-texture.c | 34 ++++++++++++++++++----------------
11878 1 file changed, 18 insertions(+), 16 deletions(-)
11880 commit 859d1f0792177d8d5cc589e64d6dbad04074e0c4
11881 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11882 Date: Wed Jun 16 12:47:56 2010 +0100
11884 align-constraint: Publish the properties accessors
11886 The accessor methods for the AlignConstraint properties should be
11889 clutter/clutter-align-constraint.c | 221 +++++++++++++++++++++-------
11890 clutter/clutter-align-constraint.h | 16 +-
11891 doc/reference/clutter/clutter-sections.txt | 6 +
11892 3 files changed, 183 insertions(+), 60 deletions(-)
11894 commit 72f8bb454a1dbaa4a3295d329bae4d69d9bf5281
11895 Author: Richard Hughes <richard@hughsie.com>
11896 Date: Tue Jun 15 22:36:19 2010 +0100
11898 build: Fix a compiler warning when using make dist
11900 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
11902 clutter/cogl/cogl/Makefile.am | 1 +
11903 1 file changed, 1 insertion(+)
11905 commit 56315d92bd9e961450746d9f9c973f937be20aa6
11906 Author: Robert Bragg <robert@linux.intel.com>
11907 Date: Wed Jun 9 02:42:01 2010 +0100
11909 stage-glx: Never promote clipped redraws to full redraws.
11911 When clipped redraws were first supported in Clutter a heuristic was
11912 added to promote tall clipped redraws into full redraws due to a concern
11913 that using glXCopySubBuffer for tall rectangles would block the GPU for
11914 too long waiting for the vtrace to be in a suitable position so that
11915 tearing isn't seen. We've so far been unable to measure any impact from
11916 this blocking even with full height windows so we are removing the
11917 arbitrary threshold of 300px that was originally "plucked out of thin
11920 http://bugzilla.o-hand.com/show_bug.cgi?id=2136
11922 clutter/glx/clutter-stage-glx.c | 10 ++--------
11923 1 file changed, 2 insertions(+), 8 deletions(-)
11925 commit 5382e8722b8194320feb7c18065b2831e4ebe752
11926 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11927 Date: Tue Jun 15 16:51:55 2010 +0100
11929 Split out the ignored test files
11931 .gitignore | 196 +-----------------------------------------
11932 tests/conform/.gitignore | 113 ++++++++++++++++++++++++
11933 tests/interactive/.gitignore | 69 +++++++++++++++
11934 tests/micro-bench/.gitignore | 4 +
11935 4 files changed, 188 insertions(+), 194 deletions(-)
11937 commit 6d132e45ff05da2e5604d6cce59ff324617eaea4
11938 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11939 Date: Tue Jun 15 16:46:59 2010 +0100
11941 Add cogl-depth-test to the Git ignore file
11944 1 file changed, 1 insertion(+)
11946 commit 7164da7467b0b2570d1e90c40844a322335f30ec
11947 Author: Emmanuele Bassi <ebassi@linux.intel.com>
11948 Date: Tue Jun 15 16:42:30 2010 +0100
11950 Set the initial value of a variable
11952 Fixes a compiler warning.
11954 clutter/cogl/cogl/cogl-primitives.c | 2 +-
11955 1 file changed, 1 insertion(+), 1 deletion(-)
11957 commit e312f7ee4a6ee5a4ee1c95ada289746e2372fc45
11958 Author: Robert Bragg <robert@linux.intel.com>
11959 Date: Mon Jun 14 23:14:15 2010 +0100
11961 material: Adds arbfp compile counter
11963 This adds a uprof counter to track how many ARBfp programs get compiled
11966 clutter/cogl/cogl/cogl-material.c | 7 +++++++
11967 1 file changed, 7 insertions(+)
11969 commit 305721d0e8f2c2bad83787740628b2444f895a6f
11970 Author: Robert Bragg <robert@linux.intel.com>
11971 Date: Thu Jun 10 19:03:57 2010 +0100
11973 material: Support sparse ARBfp program generation
11975 We don't need to generate a new ARBfp program for every material created
11976 if we can find an ancestor whos state will result in the same program
11979 The more code we can have adopt the coding pattern of deriving their
11980 materials from other similar materials using cogl_material_copy() the
11981 more likely this metric will be good enough on its own to minimize the
11982 set of arbfp programs necessary to support a given application.
11984 clutter/cogl/cogl/cogl-material-private.h | 21 +-
11985 clutter/cogl/cogl/cogl-material.c | 356 ++++++++++++++++++++++++-----
11986 2 files changed, 316 insertions(+), 61 deletions(-)
11988 commit 2fe58f5000fc36ed8c37481f85ab1ec975ed0a9a
11989 Author: Robert Bragg <robert@linux.intel.com>
11990 Date: Mon Jun 14 22:20:27 2010 +0100
11992 material: free any layer cache in material_set_parent
11994 Previously in _cogl_material_pre_change_notify we manually freed the
11995 layer caches of a material if we caused a reparent, but it makes more
11996 sense to have _cogl_material_set_parent do this directly instead.
11998 clutter/cogl/cogl/cogl-material.c | 23 +++++------------------
11999 1 file changed, 5 insertions(+), 18 deletions(-)
12001 commit dc0cb7959885c0eaf43008c0065ed99bf10d5df2
12002 Author: Robert Bragg <robert@linux.intel.com>
12003 Date: Thu May 27 20:04:49 2010 +0100
12005 Adds an internal weak material mechanism
12007 This adds a _cogl_material_weak_copy() function that can be used to
12008 create materials that don't count as strong dependants on their parents.
12009 This means the parent can be modified without worrying about how it will
12010 affect weak materials. The material age of the parent can potentially be
12011 queried to determine if a weak material might need to be re-created.
12013 clutter/cogl/cogl/cogl-material-private.h | 6 ++
12014 clutter/cogl/cogl/cogl-material.c | 167 ++++++++++++++++++++---------
12015 2 files changed, 123 insertions(+), 50 deletions(-)
12017 commit b5bd76cde176ef88efd3b4f3107e44f3aff2591a
12018 Author: Robert Bragg <robert@linux.intel.com>
12019 Date: Thu May 27 15:19:15 2010 +0100
12021 material: Adds a simple material age getter
12023 When we add support for weak materials it's expected that Clutter will
12024 want to attach them as private data to other materials and it needs a
12025 mechanism to determine when a weak material should be re-created because
12026 its parent has changed somehow.
12028 This adds the concept of a material age (internal only currently) which
12029 increments whenever a material is modified. Clutter can then save the
12030 age of the material which its weak materials are derived from and later
12031 determine when the weak material may be invalid.
12033 clutter/cogl/cogl/cogl-material-private.h | 10 ++++++++++
12034 clutter/cogl/cogl/cogl-material.c | 19 +++++++++++++++++++
12035 2 files changed, 29 insertions(+)
12037 commit 634bcb34f98725deadea7777f0ab41071d009ecb
12038 Author: Robert Bragg <robert@linux.intel.com>
12039 Date: Thu May 27 15:18:15 2010 +0100
12041 primitives: we were memsetting the wrong wrap mode overrides pointer
12043 In _cogl_texture_quad_multiple_primitives we weren't memsetting the
12044 CoglMaterialWrapModeOverrides structure we were memsetting
12045 &state.wrap_mode_overrides where state.wrap_mode_overrides is just a
12046 pointer that might potentially later point to the
12047 CoglMaterialWrapModeOverrides structure.
12049 clutter/cogl/cogl/cogl-primitives.c | 2 +-
12050 1 file changed, 1 insertion(+), 1 deletion(-)
12052 commit 2d6925f243e9e9d8faa66aa63917a32db7293e3b
12053 Author: Robert Bragg <robert@linux.intel.com>
12054 Date: Wed May 26 14:13:37 2010 +0100
12056 material: generalize how we compare simple material properties
12058 In _cogl_material_equal we were repeating the same code pattern to
12059 compare several of the state groups so this just adds
12060 simple_property_equal function that's now used instead.
12062 clutter/cogl/cogl/cogl-material.c | 134 +++++++++++++++++--------------------
12063 1 file changed, 62 insertions(+), 72 deletions(-)
12065 commit c434f1fc48390a6e2c963656b039ebc3df0991af
12066 Author: Robert Bragg <robert@linux.intel.com>
12067 Date: Wed May 26 11:33:32 2010 +0100
12069 material: Make CoglMaterial responsible for depth state
12071 This redirects the legacy depth testing APIs through CoglMaterial and
12072 adds a new experimental cogl_material_ API for handling the depth
12075 This adds the following new functions:
12076 cogl_material_set_depth_test_enabled
12077 cogl_material_get_depth_test_enabled
12078 cogl_material_set_depth_writing_enabled
12079 cogl_material_get_depth_writing_enabled
12080 cogl_material_set_depth_test_function
12081 cogl_material_get_depth_test_function
12082 cogl_material_set_depth_range
12083 cogl_material_get_depth_range
12085 As with other experimental Cogl API you need to define
12086 COGL_ENABLE_EXPERIMENTAL_API to access them and their stability isn't
12089 clutter/cogl/cogl/cogl-context.c | 8 +
12090 clutter/cogl/cogl/cogl-context.h | 8 +
12091 clutter/cogl/cogl/cogl-material-private.h | 19 +-
12092 clutter/cogl/cogl/cogl-material.c | 323 ++++++++++++++++++++++++--
12093 clutter/cogl/cogl/cogl-material.h | 207 +++++++++++++++++
12094 clutter/cogl/cogl/cogl-types.h | 25 +-
12095 clutter/cogl/cogl/cogl.c | 28 ++-
12096 clutter/cogl/cogl/cogl.h | 6 +
12097 tests/conform/Makefile.am | 1 +
12098 tests/conform/test-cogl-depth-test.c | 354 +++++++++++++++++++++++++++++
12099 tests/conform/test-conform-main.c | 1 +
12100 11 files changed, 952 insertions(+), 28 deletions(-)
12102 commit ff4d3e048b11ed1fc609c53e5e00595602eaf373
12103 Author: Robert Bragg <robert@linux.intel.com>
12104 Date: Wed May 26 03:07:17 2010 +0100
12106 cogl docs: Improve documentation for cogl_ortho
12108 cogl_ortho is one of those APIs whos style was, for better or worse,
12109 copied from OpenGL and for some inexplicable reason the near and far
12110 arguments are inconsistent with the left, right, top, bottom arguments
12111 because they don't take z coordinates they take a "distance" which
12112 should be negative for a plane behind the viewer.
12114 This updates the documentation to explain this.
12116 clutter/cogl/cogl/cogl.h | 21 +++++++++++++++++----
12117 doc/reference/cogl/Makefile.am | 6 ++++--
12118 doc/reference/cogl/cogl_ortho.png | Bin 0 -> 12650 bytes
12119 3 files changed, 21 insertions(+), 6 deletions(-)
12121 commit e8275538e5a06a267d7e7e062103736dfdc3ac53
12122 Author: Robert Bragg <robert@linux.intel.com>
12123 Date: Wed May 19 01:02:16 2010 +0100
12125 primitives: no longer assume _get_layers list remains valid
12127 The internal CoglMaterialLayer pointers associated with a material may
12128 change whenever layer properties are modified so it's no longer ok to
12129 assume that a list of layers returned by cogl_material_get_layers
12130 remains valid if the layers have been changed.
12132 clutter/cogl/cogl/cogl-primitives.c | 1 +
12133 1 file changed, 1 insertion(+)
12135 commit 487c0b1ae9f9378eb0419e44c1d96c92df687a2d
12136 Author: Robert Bragg <robert@linux.intel.com>
12137 Date: Wed May 19 00:36:31 2010 +0100
12139 material: Adds simple breadcrumb debugging mechanism
12141 Since it can sometimes be awkward to figure out where a particular
12142 material came from when debugging, this adds a breadcrumb mechanism that
12143 lets you associate a const string with a material that may give a clue
12146 clutter/cogl/cogl/cogl-material-private.h | 14 ++++++++++++++
12147 clutter/cogl/cogl/cogl-material.c | 23 ++++++++++++++++++++++-
12148 2 files changed, 36 insertions(+), 1 deletion(-)
12150 commit ad0aab939dd74592eef0a2882bd7457baed68151
12151 Author: Robert Bragg <robert@linux.intel.com>
12152 Date: Tue May 18 23:38:33 2010 +0100
12154 material: remove override options from _cogl_material_equal
12156 As a follow on to using cogl_material_copy instead of flush options this
12157 patch now removes the ability to pass flush options to
12158 _cogl_material_equal which is the final reference to the
12159 CoglMaterialFlushOptions mechanism.
12161 clutter/cogl/cogl/cogl-journal.c | 4 +-
12162 clutter/cogl/cogl/cogl-material-private.h | 2 -
12163 clutter/cogl/cogl/cogl-material.c | 60 +++++++----------------------
12164 3 files changed, 14 insertions(+), 52 deletions(-)
12166 commit 02b7f51e800661de4bf3e0daeb8d8c51e88dc153
12167 Author: Robert Bragg <robert@linux.intel.com>
12168 Date: Tue May 18 22:42:49 2010 +0100
12170 cogl: remove _cogl_material_flush_gl_state flush options
12172 Since cogl_material_copy should now be cheap to use we can simplify
12173 how we handle fallbacks and wrap mode overrides etc by simply copying
12174 the original material and making our override changes on the new
12175 material. This avoids the need for a sideband state structure that has
12176 been growing in size and makes flushing material state more complex.
12178 Note the plan is to eventually use weak materials for these override
12179 materials and attach these as private data to the original materials so
12180 we aren't making so many one-shot materials.
12182 clutter/cogl/cogl/cogl-context.c | 2 +-
12183 clutter/cogl/cogl/cogl-journal-private.h | 1 -
12184 clutter/cogl/cogl/cogl-journal.c | 68 ++++++++++++++++++-----------
12185 clutter/cogl/cogl/cogl-material-private.h | 6 ++-
12186 clutter/cogl/cogl/cogl-material.c | 38 ++--------------
12187 clutter/cogl/cogl/cogl-path.c | 24 ++++++----
12188 clutter/cogl/cogl/cogl-primitives.c | 60 ++++++++++++++++---------
12189 clutter/cogl/cogl/cogl-vertex-buffer.c | 45 ++++++++++++++++++-
12190 clutter/cogl/cogl/cogl.c | 4 +-
12191 9 files changed, 153 insertions(+), 95 deletions(-)
12193 commit 365605cf42fca1beb9b70acd58d23ee4bc4cd208
12194 Author: Robert Bragg <robert@linux.intel.com>
12195 Date: Thu Apr 8 12:21:04 2010 +0100
12197 CoglMaterial: Implements sparse materials design
12199 This is a complete overhaul of the data structures used to manage
12200 CoglMaterial state.
12202 We have these requirements that were aiming to meet:
12203 (Note: the references to "renderlists" correspond to the effort to
12204 support scenegraph level shuffling of Clutter actor primitives so we can
12205 minimize GPU state changes)
12208 We wanted a design that allows sparse descriptions of state so it scales
12209 well as we make CoglMaterial responsible for more and more state. It
12210 needs to scale well in terms of memory usage and the cost of operations
12211 we need to apply to materials such as comparing, copying and flushing
12212 their state. I.e. we would rather have these things scale by the number
12213 of real changes a material represents not by how much overall state
12214 CoglMaterial becomes responsible for.
12217 As we add support for renderlists in Clutter we will need to be able to
12218 get an immutable handle for a given material's current state so that we
12219 can retain a record of a primitive with its associated material without
12220 worrying that changes to the original material will invalidate that
12223 No more flush override options:
12224 We want to get rid of the flush overrides mechanism we currently use to
12225 deal with texture fallbacks, wrap mode changes and to handle the use of
12226 highlevel CoglTextures that need to be resolved into lowlevel textures
12227 before flushing the material state.
12229 The flush options structure has been expanding in size and the structure
12230 is logged with every journal entry so it is not an approach that scales
12231 well at all. It also makes flushing material state that much more
12235 Again for renderlists we need a way to create materials derived from
12236 other materials but without the strict requirement that modifications to
12237 the original material wont affect the derived ("weak") material. The
12238 only requirement is that its possible to later check if the original
12239 material has been changed.
12241 A summary of the new design:
12243 A CoglMaterial now basically represents a diff against its parent.
12244 Each material has a single parent and a mask of state that it changes.
12246 Each group of state (such as the blending state) has an "authority"
12247 which is found by walking up from a given material through its ancestors
12248 checking the difference mask until a match for that group is found.
12250 There is only one root node to the graph of all materials, which is the
12251 default material first created when Cogl is being initialized.
12253 All the groups of state are divided into two types, such that
12254 infrequently changed state belongs in a separate "BigState" structure
12255 that is only allocated and attached to a material when necessary.
12257 CoglMaterialLayers are another sparse structure. Like CoglMaterials they
12258 represent a diff against their parent and all the layers are part of
12259 another graph with the "default_layer_0" layer being the root node that
12260 Cogl creates during initialization.
12262 Copying a material is now basically just a case of slice allocating a
12263 CoglMaterial, setting the parent to be the source being copied and
12264 zeroing the mask of changes.
12266 Flush overrides should now be handled by simply relying on the cheapness
12267 of copying a material and making changes to it. (This will be done in a
12270 Weak material support will be added in a follow on commit.
12272 clutter/cogl/cogl/cogl-atlas-texture.c | 10 +
12273 clutter/cogl/cogl/cogl-context.c | 23 +-
12274 clutter/cogl/cogl/cogl-context.h | 21 +-
12275 clutter/cogl/cogl/cogl-debug.c | 4 +-
12276 clutter/cogl/cogl/cogl-debug.h | 3 +-
12277 clutter/cogl/cogl/cogl-internal.h | 9 +-
12278 clutter/cogl/cogl/cogl-journal.c | 7 +-
12279 clutter/cogl/cogl/cogl-material-private.h | 606 ++-
12280 clutter/cogl/cogl/cogl-material.c | 6220 +++++++++++++++++++++--------
12281 clutter/cogl/cogl/cogl-material.h | 6 +-
12282 clutter/cogl/cogl/cogl-path.c | 7 +-
12283 clutter/cogl/cogl/cogl-primitives.c | 29 +-
12284 clutter/cogl/cogl/cogl-vertex-buffer.c | 21 +-
12285 clutter/cogl/cogl/cogl.c | 8 -
12286 14 files changed, 5024 insertions(+), 1950 deletions(-)
12288 commit 5f9c7d36571219a2038fe9237847894e0b718bbc
12289 Author: Robert Bragg <robert@linux.intel.com>
12290 Date: Tue Jun 15 14:26:37 2010 +0100
12292 material: fix #ifdef guard around use of _TEXTURE_RECTANGLE
12294 We were incorrectly guarding the use of GL_TEXTURE_RECTANGLE_ARB with
12295 ifdef ARB_texture_rectangle instead of ifdef GL_ARB_texture_rectangle
12296 which broke test-cogl-texture-rectangle.
12298 clutter/cogl/cogl/cogl-material.c | 2 +-
12299 1 file changed, 1 insertion(+), 1 deletion(-)
12301 commit a1035389c00bc44b94358d33e9bebb555328b9ac
12302 Author: Robert Bragg <robert@linux.intel.com>
12303 Date: Thu Jun 10 14:39:20 2010 +0100
12305 blend-strings: removes the AUTO_COMPOSITE function enum
12307 This was mistakenly added some time ago because at some point when we
12308 were discussing how to handle premultiplied alpha in Clutter/Cogl we
12309 were considering having a magic "just do the right thing" option which
12310 was later abandoned.
12312 clutter/cogl/cogl/cogl-blend-string.c | 2 --
12313 clutter/cogl/cogl/cogl-blend-string.h | 1 -
12314 clutter/cogl/cogl/cogl-material.c | 3 ---
12315 3 files changed, 6 deletions(-)
12317 commit 249ad97c8fd55b05d4377dad4f9b5e072d161b2b
12318 Author: Robert Bragg <robert@linux.intel.com>
12319 Date: Thu Jun 10 14:17:42 2010 +0100
12321 cogl-color: add cogl_color_init_from_xyz funcs
12323 This is to try and improve API consistency. Simple cogl structures that
12324 don't derive from CoglObject and which can be allocated on the stack,
12325 such as CoglColor and CoglMatrix should all have "_init" or
12326 "_init_from" functions to initialize all the structure members. (As
12327 opposed to a cogl_xyz_new() function for CoglObjects). CoglColor
12328 previously used the naming scheme "_set_from" for these initializers but
12329 "_set" is typically reserved for setting individual properties of a
12332 This adds three _init functions:
12333 cogl_color_init_from_4ub
12334 cogl_color_init_from_4f
12335 cogl_color_init_from_4fv
12337 The _set_from functions are now deprecated but only with a gtk-doc
12338 annotation for now. This is because the cogl_color_set_from API is quite
12339 widely used already and so were giving a grace period before enabling a
12340 GCC deprecated warning just because otherwise the MX maintainers will
12341 complain to me that I've made their build logs look messy.
12343 clutter/cogl/cogl/cogl-color.c | 68 ++++++++++++++++++++++++++++++----------
12344 clutter/cogl/cogl/cogl-color.h | 61 ++++++++++++++++++++++++++++++++---
12345 2 files changed, 108 insertions(+), 21 deletions(-)
12347 commit 500baa415789ea0b6277070c67ece54d0e6418ff
12348 Author: Robert Bragg <robert@linux.intel.com>
12349 Date: Thu Jun 10 14:07:40 2010 +0100
12351 cogl-color: add private _cogl_color_get_rgba_4ubv API
12353 The journal logs colors as 4bytes into a vertex array and since we are
12354 planning to make CoglMaterial track its color using a CoglColor instead
12355 of a byte array this convenience will be useful for re-implementing
12356 _cogl_material_get_colorubv.
12358 clutter/cogl/cogl/cogl-color-private.h | 40 ++++++++++++++++++++++++++++++++
12359 clutter/cogl/cogl/cogl-color.c | 7 ++++++
12360 2 files changed, 47 insertions(+)
12362 commit 272cf6d943688453d19c5b695077903a5002fd17
12363 Author: Johan Bilien <jobi@via.ecp.fr>
12364 Date: Mon Jun 14 19:34:24 2010 +0000
12366 build: Do not include built sources in the distribution
12368 allows to run make distcheck without first running make
12370 http://bugzilla.openedhand.com/show_bug.cgi?id=2171
12372 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
12374 clutter/Makefile.am | 21 ++++++++++++++++-----
12375 1 file changed, 16 insertions(+), 5 deletions(-)
12377 commit 2cee8b648e82382b37595fd583cfd2dd16b5bb2f
12378 Author: Øyvind Kolås <pippin@linux.intel.com>
12379 Date: Mon Jun 14 16:57:44 2010 +0100
12381 state: consistently use clutter_state_get_state where possible
12383 The previous commit reimplemented logic for creating states, this - and
12384 other parts of the code should be using clutter_state_get_state.
12386 clutter/clutter-state.c | 45 +++++++++++++--------------------------------
12387 1 file changed, 13 insertions(+), 32 deletions(-)
12389 commit d5c93f6d550980f75534fdaa8f24db50f490e874
12390 Author: Øyvind Kolås <pippin@linux.intel.com>
12391 Date: Mon Jun 14 15:45:07 2010 +0100
12393 state: make null source state encounterd in json treated as wildcard
12395 To be properly useful the state machine needs to be able to specify the
12396 default transitions to a target state with no specified source state.
12398 clutter/clutter-state.c | 21 ++++++++++++++++++++-
12399 1 file changed, 20 insertions(+), 1 deletion(-)
12401 commit 66de8656e99695c1afc0cf735b5fb6ade9300e37
12402 Author: Øyvind Kolås <pippin@linux.intel.com>
12403 Date: Tue May 25 11:54:15 2010 +0100
12405 test-state: move press/release callbacks to stage avoiding grab
12407 tests/interactive/test-state.c | 10 ++++------
12408 1 file changed, 4 insertions(+), 6 deletions(-)
12410 commit b8b10ef4db0e6a8e63865d4b358516addc5796e7
12411 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12412 Date: Mon Jun 14 14:05:49 2010 +0100
12414 docs: Clarify the scope of Text:single-line-mode
12416 Only editable text actors can be in single-line mode.
12418 clutter/clutter-text.c | 6 +++++-
12419 1 file changed, 5 insertions(+), 1 deletion(-)
12421 commit 21820d50ca1b8e4e4d8b6078d3d6ecb191e17c0e
12422 Author: Kristian Høgsberg <hoegsberg@gmail.com>
12423 Date: Mon Jun 14 12:59:42 2010 +0100
12425 Don't add GL libs for EGL X11 backend
12427 Configure uses the GL .pc file to add GL includes and libs for the eglx
12430 http://bugzilla.openedhand.com/show_bug.cgi?id=2104
12432 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
12434 configure.ac | 3 ---
12435 1 file changed, 3 deletions(-)
12437 commit 38da6b4a0eacbe0c7e40bc5d237bf31030fcc57d
12438 Author: Neil Roberts <neil@linux.intel.com>
12439 Date: Mon Jun 14 11:59:33 2010 +0100
12441 clutter-text: Round the layout width to nearest integer not down
12443 When converting the floating point allocation width to an integer
12444 multiple of PANGO_SCALE to give to the PangoLayout it can sometimes
12445 end up slightly short of the allocated size due to rounding
12446 errors. This can cause some of the lines to be wrapped differently
12447 when a non-integer-aligned position is used (such as when animating
12448 text). It works better to round the number to the nearest integer by
12449 adding 0.5 instead of letting the default float cast truncate it
12452 http://bugzilla.openedhand.com/show_bug.cgi?id=2170
12454 clutter/clutter-text.c | 4 ++--
12455 1 file changed, 2 insertions(+), 2 deletions(-)
12457 commit f97d16cd2d01c7f4d44f5b6ab719878d1a5989e2
12458 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12459 Date: Sat Jun 12 17:45:54 2010 +0100
12461 drag-action: Remove the press event button
12463 Both ::drag-begin and ::drag-end have a "button" argument - even though
12464 we assume internally, and externally, that dragging can only be the
12465 result of a primary button operation.
12467 clutter/clutter-drag-action.c | 19 +++++++------------
12468 clutter/clutter-drag-action.h | 2 --
12469 clutter/clutter-marshal.list | 2 +-
12470 tests/interactive/test-drag.c | 2 --
12471 tests/interactive/test-scrolling.c | 1 -
12472 5 files changed, 8 insertions(+), 18 deletions(-)
12474 commit b8b2a51d444f2a90a9428e26ae4e293deb7fed0d
12475 Merge: b2c905f 7343c66
12476 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12477 Date: Fri Jun 11 18:12:54 2010 +0100
12479 Merge branch 'wip/deform-effect'
12481 * wip/deform-effect:
12482 docs: Add DeformEffect and PageTurnEffect to the API reference
12483 effect: Add PageTurnEffect
12484 effect: Add DeformEffect
12485 offscreen-effect: Traslate the modelview with the offsets
12486 docs: Fix Effect subclassing section
12488 commit b2c905ff506b9be53e6c14c2d1bc909b97130e76
12489 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12490 Date: Fri Jun 11 15:49:46 2010 +0100
12492 Hide the marshallers
12494 The marshallers we use for the signals are declared in a private header,
12495 and it stands to reason that they should also be hidden in the shared
12496 object by using the common '_' prefix. We are also using some direct
12497 g_cclosure_marshal_* symbol from GLib, instead of consistently use the
12498 clutter_marshal_* symbol.
12500 clutter/Makefile.am | 2 +-
12501 clutter/clutter-actor.c | 46 +++++++++++++++---------------
12502 clutter/clutter-alpha.c | 2 +-
12503 clutter/clutter-animation.c | 5 ++--
12504 clutter/clutter-backend.c | 4 +--
12505 clutter/clutter-behaviour-path.c | 2 +-
12506 clutter/clutter-behaviour.c | 5 ++--
12507 clutter/clutter-binding-pool.c | 8 +++---
12508 clutter/clutter-click-action.c | 2 +-
12509 clutter/clutter-container.c | 6 ++--
12510 clutter/clutter-device-manager.c | 4 +--
12511 clutter/clutter-drag-action.c | 6 ++--
12512 clutter/clutter-layout-manager.c | 2 +-
12513 clutter/clutter-media.c | 8 ++++--
12514 clutter/clutter-model.c | 10 +++----
12515 clutter/clutter-score.c | 10 +++----
12516 clutter/clutter-stage-manager.c | 4 +--
12517 clutter/clutter-stage.c | 10 +++----
12518 clutter/clutter-state.c | 2 +-
12519 clutter/clutter-text.c | 10 +++----
12520 clutter/clutter-texture.c | 6 ++--
12521 clutter/clutter-timeline.c | 10 +++----
12522 clutter/x11/clutter-x11-texture-pixmap.c | 4 +--
12523 23 files changed, 86 insertions(+), 82 deletions(-)
12525 commit ded9322a7ab13dc0ab2d5470164909d764eaa436
12526 Author: Neil Roberts <neil@linux.intel.com>
12527 Date: Fri Jun 11 14:47:30 2010 +0100
12529 cogl/winsys/cogl-eglx: Use the right egl header on 1.1
12531 Commit b0cc98fdceb introduced a #include for the egl header in
12532 cogl-eglx.c The header name is different under GLES 1.1 so it broke
12535 clutter/cogl/cogl/winsys/cogl-eglx.c | 4 ++++
12536 1 file changed, 4 insertions(+)
12538 commit 64e6cf69d74f9501914bf1f0a6738d897d83aaa5
12539 Author: Neil Roberts <neil@linux.intel.com>
12540 Date: Fri Jun 11 14:37:56 2010 +0100
12542 cogl-program: Add cogl_program_uniform_1i to GLES
12544 The GLES 1.1 backend was missing a stub for cogl_program_uniform_1i.
12546 clutter/cogl/cogl/driver/gles/cogl-program.c | 6 ++++++
12547 1 file changed, 6 insertions(+)
12549 commit 181b46933a16f7649d2c50b928d10e765ad0a522
12550 Author: Neil Roberts <neil@linux.intel.com>
12551 Date: Fri Jun 11 14:36:38 2010 +0100
12553 cogl-gles2: Prefix internal GLES 2 wrapper symbols with _
12555 Some internal symbols used for the GLES 2 wrapper were accidentally
12556 being exported. This prepends an underscore to them so they won't
12557 appear in the shared library.
12559 .../cogl/cogl/driver/gles/cogl-context-driver.c | 2 +-
12560 .../driver/gles/cogl-fixed-fragment-shader.glsl | 30 +--
12561 .../cogl/driver/gles/cogl-fixed-vertex-shader.glsl | 24 +--
12562 clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 201 ++++++++++----------
12563 clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h | 192 +++++++++----------
12564 .../cogl/cogl/driver/gles/cogl-texture-driver.c | 2 +-
12565 6 files changed, 226 insertions(+), 225 deletions(-)
12567 commit e00ed20805c136fe63d0f7abc7602f1c9fe2b7bb
12568 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12569 Date: Fri Jun 11 15:23:46 2010 +0100
12571 click-action: Use clutter_actor_contains()
12573 Instead of an internal copy.
12575 clutter/clutter-click-action.c | 14 ++------------
12576 1 file changed, 2 insertions(+), 12 deletions(-)
12578 commit f3f3b5674293f76decc831f2e11b9efba654bb75
12579 Author: Dan Winship <danw@gnome.org>
12580 Date: Thu Jun 10 08:24:55 2010 -0400
12582 actor: add clutter_actor_contains()
12584 It is often useful to determine if one actor is an ancestor of
12585 another. Add a method to do that.
12587 http://bugzilla.openedhand.com/show_bug.cgi?id=2162
12589 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
12591 clutter/clutter-actor.c | 25 +++++++++++++++++++++++++
12592 clutter/clutter-actor.h | 2 ++
12593 doc/reference/clutter/clutter-sections.txt | 1 +
12594 3 files changed, 28 insertions(+)
12596 commit d816acd8348a84bf3f0e9f065fab80688a76350d
12597 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12598 Date: Fri Jun 11 14:47:48 2010 +0100
12600 shader-effect: Allow creating vertex shaders
12602 By default, ShaderEffect creates a fragment shader; in order to be able
12603 to deprecate ClutterShader we need a way for ShaderEffect sub-classes to
12604 create a vertex shader if needed - By using a write-only, constructor
12607 ClutterShader has, internally, a ClutterShaderType enumeration that can
12608 be used exactly for this. We just need to expose it and create a GObject
12609 property for ClutterShaderEffect.
12611 clutter/clutter-shader-effect.c | 70 ++++++++++++++++++++++++++--
12612 clutter/clutter-shader.c | 5 --
12613 clutter/clutter-types.h | 14 ++++++
12614 doc/reference/clutter/clutter-sections.txt | 1 +
12615 4 files changed, 82 insertions(+), 8 deletions(-)
12617 commit 0f41948c8202215950ed636ac1d9ee663b4254fd
12618 Author: Neil Roberts <neil@linux.intel.com>
12619 Date: Thu Apr 22 14:33:47 2010 +0100
12621 cogl-clip-stack: Always use the scissor when clipping
12623 Whenever a path or a rectangle is added to the clip stack it now also
12624 stores a screen space bounding box in the entry. Then when the clip
12625 stack is flushed the bounding box is first used to set up the
12626 scissor. That way when we eventually come to use the stencil buffer
12627 the clear will be affected by the scissor so we don't have to clear
12630 clutter/cogl/cogl/cogl-clip-stack.c | 179 +++++++++++++++++++++++------------
12631 clutter/cogl/cogl/cogl-path.c | 4 +
12632 2 files changed, 124 insertions(+), 59 deletions(-)
12634 commit e74387f36ff7a8fa654ac37fa21fbbfbcc01689a
12635 Author: Neil Roberts <neil@linux.intel.com>
12636 Date: Thu Apr 22 14:13:52 2010 +0100
12638 cogl-path: Export _cogl_path_get_bounds
12640 _cogl_path_get_bounds is no longer static and is exported in
12641 cogl-path-private.h so that it can be used in the clip stack code. The
12642 old version of the function returned x/y and width/height. However
12643 this was mostly used to call cogl_rectangle which takes x1/y1
12644 x2/y2. The function has been changed to just directly return the
12645 second form because it is more useful. Anywhere that was previously
12646 using the function now just directly looks at path->path_nodes_min and
12647 path->path_nodes_max instead.
12649 clutter/cogl/cogl/cogl-path-private.h | 7 ++++
12650 clutter/cogl/cogl/cogl-path.c | 72 ++++++++++++++++++---------------
12651 2 files changed, 46 insertions(+), 33 deletions(-)
12653 commit 0bc16c90add35e79a9d564379cc4793ab47d9b76
12654 Author: Neil Roberts <neil@linux.intel.com>
12655 Date: Thu Apr 22 13:48:49 2010 +0100
12657 cogl-clip-state: Export transform_point internally to Cogl
12659 The transform_point function takes a modelview matrix, projection
12660 matrix and a viewport and performs all three transformations on a
12661 point to give a Cogl window coordinate. This is useful in a number of
12662 places in Cogl so this patch moves it to cogl.c and adds it to
12665 clutter/cogl/cogl/cogl-clip-state.c | 45 +++--------------------------------
12666 clutter/cogl/cogl/cogl-internal.h | 7 ++++++
12667 clutter/cogl/cogl/cogl.c | 39 ++++++++++++++++++++++++++++++
12668 3 files changed, 49 insertions(+), 42 deletions(-)
12670 commit 67812d6649d27ec6a8f6a1c9277b686fc3b67475
12671 Author: Sunil Sadasivan <sunil@kakai.com>
12672 Date: Thu May 13 00:59:06 2010 -0700
12674 cogl_texture_get_data() copies using wrong width size.
12676 For sliced 2D textures, _cogl_texture_2d_sliced_get_data() uses the
12677 bitmap width, instead of the rowstride, when memcpy()ing into the
12680 Signed-off-by: Robert Bragg <robert@linux.intel.com>
12682 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 2 +-
12683 1 file changed, 1 insertion(+), 1 deletion(-)
12685 commit e562ac20dffde1989c1c66d00e92a52e1d1d293f
12686 Author: Damien Lespiau <damien.lespiau@intel.com>
12687 Date: Sun Jun 6 23:03:26 2010 +0100
12689 cogl-color: Provide setters for all the channels
12691 We only had getters for the red, green, blue and alpha channels of a
12692 color. This meant that, if you wanted to change, say, the alpha
12693 component of a color, one would need to query the red, green and blue
12694 channels and use set_from_4ub() or set_from_4f().
12696 Instead of this, just provide some setters for CoglColor, using the same
12697 naming scheme than the existing getters.
12699 clutter/cogl/cogl/cogl-color.c | 84 ++++++++++++++++++
12700 clutter/cogl/cogl/cogl-color.h | 156 ++++++++++++++++++++++++++++++++++
12701 doc/reference/cogl/cogl-sections.txt | 18 ++++
12702 3 files changed, 258 insertions(+)
12704 commit 55be1a23c30c1705dbbb1d8d6f7b24056ce57e48
12705 Author: Damien Lespiau <damien.lespiau@intel.com>
12706 Date: Sun Jun 6 22:57:02 2010 +0100
12708 cogl-color: Add cogl_color_unpremultiply()
12710 For some operations on pre-multiplied colors (say, replace the alpha
12711 value), you need to unpremultiply the color.
12713 This patch provides the counterpart to cogl_color_premultiply().
12715 clutter/cogl/cogl/cogl-color.c | 11 +++++++++++
12716 clutter/cogl/cogl/cogl-color.h | 13 +++++++++++++
12717 doc/reference/cogl/cogl-sections.txt | 1 +
12718 3 files changed, 25 insertions(+)
12720 commit 396914176ff459ce09587ac75db7bc55a5de9910
12721 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12722 Date: Wed May 26 16:32:23 2010 +0100
12724 cogl: Initialize the framebuffer bits on state flush
12726 The place where we actually change the framebuffer is
12727 _cogl_framebuffer_flush_state(), so if we changed to a new frame buffer
12728 we need to initialize the color bits there.
12730 http://bugzilla.openedhand.com/show_bug.cgi?id=2094
12732 clutter/cogl/cogl/cogl-framebuffer.c | 7 +++++--
12733 1 file changed, 5 insertions(+), 2 deletions(-)
12735 commit 15881e0f24294db68ba1c3ead63246fc46c1c418
12736 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12737 Date: Wed May 26 17:14:53 2010 +0100
12739 cogl-framebuffer: Use the FBO extension for color sizes
12741 OpenGL 3.0 deprecated querying of the GL_{RED,GREEN,BLUE}_BITS
12742 constants, and the FBO extension provides a mechanism to query for the
12743 color buffer sizes which *should* work even with the default
12744 framebuffer. Unfortunately, this doesn't seem to hold for Mesa - so we
12745 just use this for the offscreen CoglFramebuffer type, and we fall back
12746 to glGetIntegerv() for the onscreen one.
12748 http://bugzilla.openedhand.com/show_bug.cgi?id=2094
12750 clutter/cogl/cogl/cogl-debug.c | 4 +-
12751 clutter/cogl/cogl/cogl-framebuffer.c | 78 +++++++++++++++++++-
12752 .../cogl/cogl/driver/gl/cogl-feature-functions.h | 5 ++
12753 .../cogl/cogl/driver/gles/cogl-feature-functions.h | 5 ++
12754 4 files changed, 87 insertions(+), 5 deletions(-)
12756 commit 3daafd4711416cf6f15376fcc97834b1e97fedc8
12757 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12758 Date: Wed May 26 16:31:18 2010 +0100
12760 cogl: Hide cogl_framebuffer_get_*_bits()
12762 These accessors should be private, for the time being.
12764 http://bugzilla.openedhand.com/show_bug.cgi?id=2094
12766 clutter/cogl/cogl/cogl-framebuffer.c | 8 ++++----
12767 clutter/cogl/cogl/cogl.c | 8 ++++----
12768 clutter/cogl/cogl/cogl.h | 24 ++++++++++++------------
12769 3 files changed, 20 insertions(+), 20 deletions(-)
12771 commit 7343c66482f2a7a94b442a640a16d5107be65fc2
12772 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12773 Date: Thu Jun 10 18:51:22 2010 +0100
12775 docs: Add DeformEffect and PageTurnEffect to the API reference
12777 doc/reference/clutter/clutter-docs.xml.in | 2 ++
12778 doc/reference/clutter/clutter-sections.txt | 40 ++++++++++++++++++++++++++++
12779 doc/reference/clutter/clutter.types | 2 ++
12780 3 files changed, 44 insertions(+)
12782 commit 44f300b3a242eb722cc1c82129e5e86daa3eb65d
12783 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12784 Date: Thu Jun 10 16:56:16 2010 +0100
12786 effect: Add PageTurnEffect
12788 A simple deformation effect that simulates a page curl.
12790 Ported from MxDeformPageTurn inside the Mx toolkit, written by
12793 clutter/Makefile.am | 2 +
12794 clutter/clutter-page-turn-effect.c | 417 ++++++++++++++++++++++++++++++++++++
12795 clutter/clutter-page-turn-effect.h | 71 ++++++
12796 clutter/clutter.h | 1 +
12797 tests/interactive/test-drag.c | 25 +++
12798 5 files changed, 516 insertions(+)
12800 commit c2081a076c3fdd376d2cd97c11f811e4a6549926
12801 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12802 Date: Wed Jun 9 17:52:06 2010 +0100
12804 effect: Add DeformEffect
12806 DeformEffect is an abstract class that should be used to write effects
12807 that change the geometry of an actor before submitting it to the GPU.
12809 Just like the ShaderEffect class, DeformEffect renders the actor to
12810 which it has been applied into an FBO; then it creates a mesh and stores
12811 it inside a VBO. Sub-classes can control vertex attributes like
12812 position, texel coordinates and the color.
12814 clutter/Makefile.am | 2 +
12815 clutter/clutter-deform-effect.c | 739 +++++++++++++++++++++++++++++++++++++++
12816 clutter/clutter-deform-effect.h | 111 ++++++
12817 clutter/clutter.h | 1 +
12818 4 files changed, 853 insertions(+)
12820 commit fa381cc36194fbefd26717b1b3031018d5a1400e
12821 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12822 Date: Thu Jun 10 17:35:56 2010 +0100
12824 offscreen-effect: Traslate the modelview with the offsets
12826 Instead of using the stage offsets when painting we can simply traslate
12827 the current modelview. This allows sub-classes to fully override the
12828 paint_target() virtual function without chaining up.
12830 clutter/clutter-offscreen-effect.c | 12 +++++++-----
12831 1 file changed, 7 insertions(+), 5 deletions(-)
12833 commit 8d22fea31c1df87904a82112ef3e917b70d56120
12834 Author: Emmanuele Bassi <ebassi@linux.intel.com>
12835 Date: Thu Jun 10 17:34:48 2010 +0100
12837 docs: Fix Effect subclassing section
12839 It still mentions the long since removed "prepare" function.
12841 clutter/clutter-effect.c | 22 +++++-----------------
12842 1 file changed, 5 insertions(+), 17 deletions(-)
12844 commit dc09fca2649d11d7c080b3c859b2996e1911f9f5
12845 Author: Neil Roberts <neil@linux.intel.com>
12846 Date: Wed Jun 9 13:53:34 2010 +0100
12848 cogl-material: Fix the function which sets the enable blend flag
12850 This function had two problems. Firstly it would clear the enable
12851 blend flag before calling pre_change_notify so that if blending was
12852 previously enabled the journal would end up being flushed while the
12853 flag was still cleared. Secondly it would call the pre change notify
12854 whenever blending is needed regardless of whether it was already
12857 This was causing problems in test-depth.
12859 clutter/cogl/cogl/cogl-material.c | 11 ++++++++---
12860 1 file changed, 8 insertions(+), 3 deletions(-)
12862 commit b1f7d2fea8835c7731d9b999ce080f740a6b4b9b
12863 Author: Robert Bragg <robert@linux.intel.com>
12864 Date: Mon Apr 26 10:01:43 2010 +0100
12866 material: Avoid redundant glBindTexture calls
12868 This adds a _cogl_bind_gl_texture_transient function that should be used
12869 instead of glBindTexture so we can have a consistent cache of the
12870 textures bound to each texture unit so we can avoid some redundant
12873 clutter/cogl/cogl/cogl-atlas-texture.c | 10 +-
12874 clutter/cogl/cogl/cogl-material-private.h | 28 +++++
12875 clutter/cogl/cogl/cogl-material.c | 112 ++++++++++++++++++--
12876 clutter/cogl/cogl/cogl-sub-texture.c | 6 +-
12877 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 55 +++++++---
12878 clutter/cogl/cogl/cogl-texture-2d.c | 32 ++++--
12879 clutter/cogl/cogl/cogl-texture-driver.h | 2 +
12880 clutter/cogl/cogl/cogl-texture-private.h | 19 ++++
12881 clutter/cogl/cogl/cogl-texture.c | 23 ++++
12882 clutter/cogl/cogl/driver/gl/cogl-texture-driver.c | 11 +-
12883 .../cogl/cogl/driver/gles/cogl-texture-driver.c | 9 +-
12884 clutter/glx/clutter-glx-texture-pixmap.c | 8 +-
12885 12 files changed, 272 insertions(+), 43 deletions(-)
12887 commit ce6e80315e17f2e671e2709268f580add757f596
12888 Author: Robert Bragg <robert@linux.intel.com>
12889 Date: Mon Apr 26 10:01:43 2010 +0100
12891 material: Adds backend abstraction for fragment processing
12893 As part of an effort to improve the architecture of CoglMaterial
12894 internally this overhauls how we flush layer state to OpenGL by adding a
12895 formal backend abstraction for fragment processing and further
12896 formalizing the CoglTextureUnit abstraction.
12898 There are three backends: "glsl", "arbfp" and "fixed". The fixed backend
12899 uses the OpenGL fixed function APIs to setup the fragment processing,
12900 the arbfp backend uses code generation to handle fragment processing
12901 using an ARBfp program, and the GLSL backend is currently only there as
12902 a formality to handle user programs associated with a material. (i.e.
12903 the glsl backend doesn't yet support code generation)
12905 The GLSL backend has highest precedence, then arbfp and finally the
12906 fixed. If a backend can't support some particular CoglMaterial feature
12907 then it will fallback to the next backend.
12909 This adds three new COGL_DEBUG options:
12910 * "disable-texturing" as expected should disable all texturing
12911 * "disable-arbfp" always make the arbfp backend fallback
12912 * "disable-glsl" always make the glsl backend fallback
12913 * "show-source" show code generated by the arbfp/glsl backends
12915 clutter/cogl/cogl/cogl-buffer.c | 2 -
12916 clutter/cogl/cogl/cogl-context.c | 38 +-
12917 clutter/cogl/cogl/cogl-context.h | 22 +-
12918 clutter/cogl/cogl/cogl-debug.c | 10 +-
12919 clutter/cogl/cogl/cogl-debug.h | 6 +-
12920 clutter/cogl/cogl/cogl-internal.h | 15 -
12921 clutter/cogl/cogl/cogl-journal.c | 11 +-
12922 clutter/cogl/cogl/cogl-material-private.h | 234 +-
12923 clutter/cogl/cogl/cogl-material.c | 2674 ++++++++++++++------
12924 clutter/cogl/cogl/cogl-path.c | 27 +-
12925 clutter/cogl/cogl/cogl-pixel-buffer.c | 2 -
12926 clutter/cogl/cogl/cogl-primitives.c | 33 +-
12927 clutter/cogl/cogl/cogl-vertex-buffer.c | 36 +-
12928 clutter/cogl/cogl/cogl.c | 109 +-
12929 clutter/cogl/cogl/driver/gl/cogl-context-driver.h | 2 +
12930 .../cogl/cogl/driver/gl/cogl-feature-functions.h | 57 +-
12931 clutter/cogl/cogl/driver/gl/cogl-program.c | 106 +-
12932 clutter/cogl/cogl/driver/gl/cogl-program.h | 2 +-
12933 clutter/cogl/cogl/driver/gl/cogl-shader.c | 26 +-
12934 clutter/cogl/cogl/driver/gles/cogl-program.c | 15 +-
12935 20 files changed, 2398 insertions(+), 1029 deletions(-)
12937 commit 8cee3c867095aacdec152842f01dc2fca1fc43aa
12938 Author: Neil Roberts <neil@linux.intel.com>
12939 Date: Wed Jun 9 14:42:18 2010 +0100
12941 cogl-atlas-texture: Flush the journal before starting blit not after
12943 _cogl_atlas_texture_blit_begin binds a texture to use as the
12944 destination and it expects it to stay bound until
12945 _cogl_atlas_texture_end_blit is called. However there was a call to
12946 _cogl_journal_flush directly after setting up the blit state which
12947 could cause the wrong texture to be bound. This just moves the flush
12948 to before the call to _cogl_atlas_texture_blit_begin.
12950 This was breaking test-cogl-sub-texture.
12952 clutter/cogl/cogl/cogl-atlas-texture.c | 4 ++--
12953 1 file changed, 2 insertions(+), 2 deletions(-)
12955 commit 413e631f488da0ec5ab44ac8d2314a89ff4a48a2
12956 Author: Robert Bragg <robert@linux.intel.com>
12957 Date: Fri Jun 4 16:42:30 2010 +0100
12959 atlas: fix some journal flushing issues
12961 1) Always flush when migrating textures out of an atlas because although
12962 it's true that the original texture data will remain valid in the
12963 original texture we can't assume that journal entries have resolved the
12964 GL texture that will be used. This is only true if a layer0_override has
12967 2) Don't flush at the point of creating a new atlas simply flush
12968 immediately before reorganizing an atlas. This means we are now assuming
12969 that we will never see recursion due to atlas textures being modified
12970 during a journal flush. This means it's the responsibility of the
12971 primitives code to _ensure_mipmaps for example not the responsibility of
12972 _cogl_material_flush_gl_state.
12974 clutter/cogl/cogl/cogl-atlas-texture.c | 39 ++++++++++++++------------------
12975 1 file changed, 17 insertions(+), 22 deletions(-)
12977 commit d407bb520fe886742ace030d12a9d647b640069b
12978 Author: Robert Bragg <robert@linux.intel.com>
12979 Date: Fri Jun 4 17:06:32 2010 +0100
12981 primitives: make sure to update texture storage before drawing
12983 We want to make sure that the material state flushing code will never
12984 result in changes to the texture storage for that material. So for
12985 example mipmaps need to be ensured by the primitives code.
12987 Changes to the texture storage will invalidate the texture coordinates
12988 in the journal and we want to avoid a recursion of journal flushing.
12990 clutter/cogl/cogl/cogl-material.c | 2 --
12991 clutter/cogl/cogl/cogl-primitives.c | 58 +++++++++++++++++++++++++++++---
12992 clutter/cogl/cogl/cogl-vertex-buffer.c | 7 ++++
12993 3 files changed, 60 insertions(+), 7 deletions(-)
12995 commit 4f0a4b85213d1cbb0d3f6a4707449f788af94c47
12996 Author: Robert Bragg <robert@linux.intel.com>
12997 Date: Mon Apr 26 16:30:25 2010 +0100
12999 test-cogl-tex-foreign: save and restore GL state correctly
13001 This test breaks out into raw OpenGL to create a foreign texture so it
13002 needs to be careful not to trample on any state that may be cached by
13005 tests/interactive/test-cogl-tex-foreign.c | 16 +++++++++++++++-
13006 1 file changed, 15 insertions(+), 1 deletion(-)
13008 commit 3907825d059407362023f7409a7c0e8992244ac3
13009 Author: Robert Bragg <robert@linux.intel.com>
13010 Date: Mon Apr 26 16:27:59 2010 +0100
13012 test-cogl-texture-rectangle: save restore GL state correctly
13014 This test breaks out into raw OpenGL to create a RECTANGLE texture so it
13015 needs to be careful not to trample on any state that may be cached by
13018 tests/conform/test-cogl-texture-rectangle.c | 23 +++++++++++++++++++++++
13019 1 file changed, 23 insertions(+)
13021 commit 2f8d4fc180d2162d610fd8fffb8f66b18b0e8faf
13022 Author: Robert Bragg <robert@linux.intel.com>
13023 Date: Mon Apr 26 09:55:50 2010 +0100
13025 matrix: add cogl_matrix_equal API
13027 This adds a way to compare two CoglMatrix structures to see if they
13028 represent the same transformations. memcmp can't be used because a
13029 CoglMatrix contains private flags and padding.
13031 clutter/cogl/cogl/cogl-matrix.c | 45 +++++++++++++++++++++++++++++++++++++++
13032 clutter/cogl/cogl/cogl-matrix.h | 15 +++++++++++++
13033 2 files changed, 60 insertions(+)
13035 commit 9815d75ebd38fdcb56bb618c46ef8822397b420d
13036 Author: Damien Lespiau <damien.lespiau@intel.com>
13037 Date: Wed Nov 18 00:26:09 2009 +0000
13039 cogl-material: Use fragment programs instead of texture env combiners
13041 THIS IS A WORK IN PROGRESS
13043 Mesa is building a big shader when using ARB_texture_env_combine. The
13044 idea is to bypass that computation, do it ourselves and cache the
13045 compiled program in a CoglMaterial.
13047 For now that feature can be enabled by setting the COGL_PIPELINE
13048 environment variable to "arbfp". COGL_SHOW_FP_SOURCE can be set to a non
13049 empty string to dump the fragment program source too.
13052 * fog (really easy, using OPTION)
13053 * support tex env combiner operands, DOT3, ADD_SIGNED, INTERPOLATE
13054 combine modes (need refactoring the generation of temporary
13055 variables) (not too hard)
13056 * alpha testing for GLES 2.0?
13058 clutter/cogl/cogl/cogl-material-private.h | 11 +
13059 clutter/cogl/cogl/cogl-material.c | 354 ++++++++++++++++++++++++++++-
13060 2 files changed, 363 insertions(+), 2 deletions(-)
13062 commit df44c2e9e499eff0e29148d4e46328621d5fde6a
13063 Author: Damien Lespiau <damien.lespiau@intel.com>
13064 Date: Sat Nov 14 14:59:59 2009 +0000
13066 cogl: Introduce private feature flags and check for ARB_fp
13068 The Cogl context has now a feature_flags_private enum that will allow us
13069 to query and use OpenGL features without exposing them in the public
13072 The ARB_fragment_program extension is the first user of those flags.
13073 Looking for this extension only happens in the gl driver as the gles
13074 drivers will not expose them.
13076 One can use _cogl_features_available_private() to check for the
13077 availability of such private features.
13079 While at it, reindent cogl-internal.h as described in CODING_STYLE.
13081 clutter/cogl/cogl/cogl-context.c | 1 +
13082 clutter/cogl/cogl/cogl-context.h | 5 ++-
13083 clutter/cogl/cogl/cogl-feature-private.h | 3 ++
13084 clutter/cogl/cogl/cogl-internal.h | 8 ++++
13085 clutter/cogl/cogl/cogl.c | 11 +++++
13086 clutter/cogl/cogl/driver/gl/cogl-context-driver.c | 2 +-
13087 clutter/cogl/cogl/driver/gl/cogl-context-driver.h | 2 +-
13088 .../cogl/cogl/driver/gl/cogl-feature-functions.h | 42 +++++++++++++++++---
13089 clutter/cogl/cogl/driver/gl/cogl.c | 25 +++++++-----
13090 .../cogl/cogl/driver/gles/cogl-context-driver.c | 2 +-
13091 .../cogl/cogl/driver/gles/cogl-context-driver.h | 2 +-
13092 .../cogl/cogl/driver/gles/cogl-feature-functions.h | 6 ++-
13093 clutter/cogl/cogl/driver/gles/cogl.c | 8 ++--
13094 13 files changed, 91 insertions(+), 26 deletions(-)
13096 commit 037f7a29d160a60224799dccaf082b523f3f2634
13097 Author: Neil Roberts <neil@linux.intel.com>
13098 Date: Wed Jun 9 12:18:53 2010 +0100
13100 test-cogl-texture-rectangle: Fix the size allocated for reading data
13102 The test was only allocating enough space for 256 rows of pixels but
13103 it was then reading 384 so it would randomly fail.
13105 tests/conform/test-cogl-texture-rectangle.c | 2 +-
13106 1 file changed, 1 insertion(+), 1 deletion(-)
13108 commit 91a359c44e66eaeea8747748e949b6416a694d0d
13109 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13110 Date: Wed Jun 9 11:53:58 2010 +0100
13112 Always have a valid font map
13114 Every time we request a CoglPangoFontMap, either internally or
13115 externally, we should have one available.
13117 Reviewed-by: Neil Roberts <neil@linux.intel.com>
13119 clutter/clutter-main.c | 77 ++++++++++++++++++++++++++++--------------------
13120 1 file changed, 45 insertions(+), 32 deletions(-)
13122 commit 5929468599ce7a05b8e5cda6b500ce338465344e
13123 Author: Johan Bilien <jobi@via.ecp.fr>
13124 Date: Tue Jun 8 15:22:29 2010 -0400
13126 Create the pango context in clutter_set_font_flags
13128 if it wasn't already. Allows honoring CLUTTER_FONT_MIPMAPPING.
13130 http://bugzilla.openedhand.com/show_bug.cgi?id=2161
13132 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
13134 clutter/clutter-main.c | 10 ++++++----
13135 1 file changed, 6 insertions(+), 4 deletions(-)
13137 commit 30296a3307b68ce64a2111a07abc9944547b8cdb
13138 Author: Robert Bragg <robert@linux.intel.com>
13139 Date: Thu Jun 3 20:03:20 2010 +0100
13141 backend-glx: Avoid vblank waits/glFinish calls when throttling blits
13143 If we have the GLX_SGI_video_sync extension then it's possible to always
13144 keep track for the video sync counter each time we call glXSwapBuffers
13145 or do a sub stage blit. This then allows us to avoid waiting before
13146 issuing a blit if we can see that the counter has already progressed.
13148 Also since we expect that glXCopySubBuffer is synchronized to the vblank
13149 we don't need to use glFinish () in conjunction with the vblank wait
13150 since the vblank wait's only purpose is to add a delay.
13152 clutter/glx/clutter-backend-glx.c | 2 +
13153 clutter/glx/clutter-backend-glx.h | 2 +
13154 clutter/glx/clutter-stage-glx.c | 97 +++++++++++++++++++++++++++----------
13155 3 files changed, 75 insertions(+), 26 deletions(-)
13157 commit 1b31ac465dc63b2a2639c63267d2a351dd6ea8ea
13158 Author: Robert Bragg <robert@linux.intel.com>
13159 Date: Thu Jun 3 23:12:08 2010 +0100
13161 backend-glx: only check for GLX_SGI_video_sync for direct contexts
13163 The GLX_SGI_video_sync spec explicitly says that it's only supported for
13164 direct contexts so we don't setup up the function pointers if
13165 glXIsDirect () returns GL_FALSE.
13167 clutter/glx/clutter-backend-glx.c | 6 +++++-
13168 1 file changed, 5 insertions(+), 1 deletion(-)
13170 commit f37de23dec316e1d4ed616c890339bfd3b4cbfa4
13171 Author: Robert Bragg <robert@linux.intel.com>
13172 Date: Thu Jun 3 20:03:20 2010 +0100
13174 backend-glx: Make sure to throttle sub region blits
13176 Neither glXCopySubBuffer or glBlitFramebuffer are integrated with the
13177 swap interval of a framebuffer so that means when we do partial stage
13178 updates (as Mutter does in response to window damage) then the blits
13179 aren't throttled which means applications that throw lots of damage
13180 events at the compositor can effectively cause Clutter to run flat out
13181 taking up all the system resources issuing more blits than can even be
13184 This patch now makes sure we use the GLX_SGI_video_sync or a
13185 DRM_VBLANK_RELATIVE ioctl to throttle blits to the vblank frequency as
13186 we do when using glXSwapBuffers.
13188 clutter/glx/clutter-backend-glx.c | 20 +++++++----
13189 clutter/glx/clutter-stage-glx.c | 69 +++++++++++++++++--------------------
13190 2 files changed, 46 insertions(+), 43 deletions(-)
13192 commit 630a2c5edcd572ea77d0a52026115fc01e5ec14a
13193 Author: Adel Gadllah <adel.gadllah@gmail.com>
13194 Date: Sat Jun 5 12:51:32 2010 +0200
13196 backend-glx: Provide copy_sub_buffer fallback
13198 Currently glXCopySubBufferMESA is used for sub stage redraws, but in case
13199 a driver does not support GLX_MESA_copy_sub_buffer we fall back to redrawing
13200 the complete stage which isn't really optimal.
13202 So instead to directly fallback to complete redraws try using GL_EXT_framebuffer_blit
13203 to do the BACK to FRONT buffer copies.
13205 http://bugzilla.openedhand.com/show_bug.cgi?id=2128
13207 clutter/glx/clutter-backend-glx.c | 35 +++++++++++++++++++++++++++++++++++
13208 clutter/glx/clutter-backend-glx.h | 17 +++++++++++++++++
13209 clutter/glx/clutter-stage-glx.c | 30 ++++++++++++++----------------
13210 3 files changed, 66 insertions(+), 16 deletions(-)
13212 commit ac3e0150edd8da7dceb2933309fc5e4f15f1e38a
13213 Author: Neil Roberts <neil@linux.intel.com>
13214 Date: Tue Jun 8 17:26:26 2010 +0100
13216 cogl-gles2-wrapper: Fix some cases using the wrong texture unit
13218 At two places in cogl_wrap_prepare_for_draw it was trying to loop over
13219 the texture units to flush some state. However it was retrieving the
13220 texture unit pointer using w->active_texture_unit instead of the loop
13221 index so it would end up with the wrong state.
13223 Also in glEnableClientState it was using the active unit instead of
13224 the client active unit.
13226 clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 7 +++----
13227 1 file changed, 3 insertions(+), 4 deletions(-)
13229 commit 00675f42aab932b2a2cb7d128d282625f681e449
13230 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13231 Date: Tue Jun 8 11:19:28 2010 +0100
13233 texture-async: Fix path fallback code
13235 And error out in case of load failure.
13237 tests/interactive/test-texture-async.c | 14 +++++++++++---
13238 1 file changed, 11 insertions(+), 3 deletions(-)
13240 commit 759ea5ce45c84d7d3e9f1dca2a7a854adcb0384a
13241 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13242 Date: Mon Jun 7 23:26:03 2010 +0100
13244 Post-release bump to 1.3.5
13246 configure.ac | 2 +-
13247 1 file changed, 1 insertion(+), 1 deletion(-)
13249 commit bd3b8c2349a47e537a48cc3e6d7bc4c54584af5f
13250 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13251 Date: Mon Jun 7 23:19:02 2010 +0100
13255 NEWS | 38 ++++++++++++++++++++++++++++++++++++++
13256 configure.ac | 4 ++--
13257 2 files changed, 40 insertions(+), 2 deletions(-)
13259 commit 4c22f122e19226ee6338c49fca0da1de50894582
13260 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13261 Date: Mon Jun 7 22:45:34 2010 +0100
13263 script: Support layout manager properties
13265 Layout properties work similarly to child properties, with the added
13266 headache that they require the 3-tuple:
13268 ( layout manager, container, actor )
13270 to be valid in order to be inspected, parsed and applied. This means
13271 using the newly added back-pointer from the container to the layout
13272 manager and then rejigging a bit how the ScriptParser handles the
13273 unresolved properties.
13275 Similarly to the child properties, which use the "child::" prefix, the
13276 layout manager properties use the "layout::" prefix and are defined with
13277 the child of a container holding a layout manager.
13280 clutter/clutter-script-parser.c | 160 ++++++++++++++++++++++++++-
13281 clutter/clutter-script-private.h | 1 +
13282 tests/conform/test-conform-main.c | 1 +
13283 tests/conform/test-script-parser.c | 51 +++++++++
13284 tests/data/Makefile.am | 1 +
13285 tests/data/test-script-layout-property.json | 16 +++
13286 7 files changed, 225 insertions(+), 6 deletions(-)
13288 commit ab76584965ce342017052183e3d70553065ff094
13289 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13290 Date: Mon Jun 7 21:34:36 2010 +0100
13292 layout-manager: Implement set_container()
13294 Store a back pointer of the layout manager inside the container using
13295 the GObject instance data. This introduces a change in the implementation
13296 of ClutterLayoutManager, though it's still binary compatible.
13299 clutter/clutter-bin-layout.c | 4 ++++
13300 clutter/clutter-box-layout.c | 4 ++++
13301 clutter/clutter-fixed-layout.c | 5 +++++
13302 clutter/clutter-flow-layout.c | 4 ++++
13303 clutter/clutter-layout-manager.c | 15 +++++++++++++++
13304 clutter/clutter-private.h | 3 +++
13305 7 files changed, 41 insertions(+)
13307 commit 8583986e16f46c707f8416ac740eaede7f200549
13308 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13309 Date: Mon Jun 7 15:45:24 2010 +0100
13311 blur-effect: Fix loop unrolling
13313 The box blur shader was not sampling all the points for producing the
13316 clutter/clutter-blur-effect.c | 7 ++++---
13317 tests/interactive/test-rotate.c | 13 ++++++++++---
13318 2 files changed, 14 insertions(+), 6 deletions(-)
13320 commit eb3017df7e80d4a202355274f4d5077281cdc373
13321 Author: Damien Lespiau <damien.lespiau@intel.com>
13322 Date: Sat Jun 5 21:05:23 2010 +0100
13324 doc: Some fixes for the Cogl documentation
13326 • 3 general fixes (typos, copy/paste),
13327 • ignore cogl-object-private.h,
13328 • cogl_fixed_atani() was in reality cogl_fixed_atan(), fixed in commit
13330 • Fix the cogl-vector section: sections must have a </SECTION> tag at
13331 the end. Also the cogl-vector section was added in the middle of the
13332 cogl-buffer one. Let's shiffle it out and add that </SECTION> tag.
13334 clutter/cogl/cogl/cogl-types.h | 6 +++---
13335 doc/reference/cogl/Makefile.am | 1 +
13336 doc/reference/cogl/cogl-sections.txt | 13 +++++++------
13337 3 files changed, 11 insertions(+), 9 deletions(-)
13339 commit 9a6a2a96dd17d3376ab72fc518300be9caf27e6b
13340 Author: Damien Lespiau <damien.lespiau@intel.com>
13341 Date: Mon May 31 21:04:53 2010 +0100
13343 animator,state: Mark variadic functions that ends with NULL
13345 GCC can catch errors when it knows that a variadic function must be
13346 ended with NULL. Let's use the glib macro encapsulating the GCC
13347 attribute to clutter_animator_set() and clutter_state_set().
13349 clutter/clutter-animator.h | 2 +-
13350 clutter/clutter-state.h | 2 +-
13351 2 files changed, 2 insertions(+), 2 deletions(-)
13353 commit f0ded315e43758f1fc1a16a132c63c873d5b5710
13354 Author: Colin Walters <walters@verbum.org>
13355 Date: Thu Jun 3 23:34:09 2010 -0400
13357 g_source_set_name on custom sources (if available)
13359 Call g_source_set_name, if the versio of GLib is new enough.
13360 This aids debugging, using e.g. SystemTap. See
13361 https://bugzilla.gnome.org/show_bug.cgi?id=620511
13362 for more information
13364 http://bugzilla.openedhand.com/show_bug.cgi?id=2151
13366 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
13368 clutter/clutter-frame-source.c | 4 ++++
13369 clutter/clutter-master-clock.c | 3 +++
13370 clutter/clutter-timeout-pool.c | 4 ++++
13371 clutter/x11/clutter-event-x11.c | 4 ++++
13372 4 files changed, 15 insertions(+)
13374 commit e9c4dfff9064406e1d8d7e8685850a6068ebf7fe
13375 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13376 Date: Mon Jun 7 10:52:32 2010 +0100
13378 Add test-cogl-object to the ignore file
13381 1 file changed, 1 insertion(+)
13383 commit cef4c8de769fd76dbcfb9f219b6ee1f2154b13e5
13384 Author: Damien Lespiau <damien.lespiau@intel.com>
13385 Date: Fri Jun 4 17:17:45 2010 +0100
13387 build: Don't distribute clutter-version.h and cogl-defines.h
13389 As with a351ff2af earlier, distributing headers generated at configure
13390 time conflicts with out of tree builds as the distributed headers will
13391 be included first instead of including the generated ones.
13393 clutter/Makefile.am | 5 +++--
13394 clutter/cogl/cogl/Makefile.am | 2 +-
13395 2 files changed, 4 insertions(+), 3 deletions(-)
13397 commit f6078eca83e37a8a7c14c5a96b5d716344301a2f
13398 Author: Robert Bragg <robert@linux.intel.com>
13399 Date: Tue Jun 1 19:27:07 2010 +0100
13401 cogl-object-private.h: white space cleanup
13403 simply replaces tabs with spaces
13405 clutter/cogl/cogl/cogl-object-private.h | 101 ++++++++++++++++---------------
13406 1 file changed, 51 insertions(+), 50 deletions(-)
13408 commit 457faaffb7092d56dcee37383a778fae431b6dac
13409 Author: Robert Bragg <robert@linux.intel.com>
13410 Date: Tue Jun 1 17:27:59 2010 +0100
13412 conform: Adds a test-cogl-object conformance test
13414 This tests the new cogl_object_get/set_user_data API
13416 tests/conform/Makefile.am | 1 +
13417 tests/conform/test-cogl-object.c | 86 +++++++++++++++++++++++++++++++++++++
13418 tests/conform/test-conform-main.c | 1 +
13419 3 files changed, 88 insertions(+)
13421 commit 2ce0cf3861edf89240ec9a393dee8998f7b6b100
13422 Author: Robert Bragg <robert@linux.intel.com>
13423 Date: Tue Jun 1 18:06:47 2010 +0100
13425 CoglObject: Adds a COGL_OBJECT macro for casting
13427 This adds a convenience COGL_OBJECT macro for casting CoglObject
13428 subclasses to (CoglObject *) pointers.
13430 clutter/cogl/cogl/cogl-object.h | 2 ++
13431 1 file changed, 2 insertions(+)
13433 commit e7c800dacc23c5b264a2c1e22d6ac44298670b07
13434 Author: Robert Bragg <robert@linux.intel.com>
13435 Date: Thu May 27 22:24:56 2010 +0100
13437 CoglObject: Adds cogl_object_{get,set}_user_data
13439 This provides a mechanism for associating private data with any
13440 CoglObject. We expect Clutter will use this to associate weak materials
13441 with normal materials.
13443 clutter/cogl/cogl/Makefile.am | 3 +
13444 clutter/cogl/cogl/cogl-handle.h | 2 +-
13445 clutter/cogl/cogl/cogl-object-private.h | 205 ++++++++++++++++++++++++++
13446 clutter/cogl/cogl/cogl-object.c | 246 +++++++++++++++++++++++++++++++
13447 clutter/cogl/cogl/cogl-object.h | 245 ++++++++++++------------------
13448 clutter/cogl/cogl/cogl-util.c | 61 --------
13449 clutter/cogl/cogl/cogl.h | 1 +
13450 doc/reference/cogl/cogl-sections.txt | 6 +
13451 8 files changed, 554 insertions(+), 215 deletions(-)
13453 commit d131602a6dbd43ccf527346a7703a3639ad36b79
13454 Author: Robert Bragg <robert@linux.intel.com>
13455 Date: Tue Jun 1 17:53:42 2010 +0100
13457 cogl-path: Adds missing cogl_is_path prototype
13459 This adds a missing cogl_is_path prototype to the public cogl-path.h
13462 clutter/cogl/cogl/cogl-path.h | 12 ++++++++++++
13463 doc/reference/cogl/cogl-sections.txt | 1 +
13464 2 files changed, 13 insertions(+)
13466 commit eca26340504161b660e8a7848a8c852552cd8eac
13467 Author: Robert Bragg <robert@linux.intel.com>
13468 Date: Tue Jun 1 17:34:59 2010 +0100
13470 cogl-path: Renames cogl_path_get/set cogl_get/set_path
13472 These aren't path methods so aren't consistent with the
13473 cogl_object_method naming style we are aiming for.
13475 clutter/cogl/cogl/cogl-clip-state.c | 2 +-
13476 clutter/cogl/cogl/cogl-path.c | 47 +++++++++++++++++-----------------
13477 clutter/cogl/cogl/cogl-path.h | 8 +++---
13478 doc/reference/cogl/cogl-sections.txt | 4 +--
13479 tests/conform/test-cogl-path.c | 16 ++++++------
13480 5 files changed, 39 insertions(+), 38 deletions(-)
13482 commit 781a413362013bb8a49d668e44ff9a8c4dc31d30
13483 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13484 Date: Thu Jun 3 15:20:17 2010 +0100
13486 test-drag: Add desaturation effect
13488 Use a desaturation effect on the drag handle.
13490 tests/interactive/test-drag.c | 11 ++++++++---
13491 1 file changed, 8 insertions(+), 3 deletions(-)
13493 commit 582f2ced5fe3eca78f6c9e04543bc622b5858196
13494 Author: Damien Lespiau <damien.lespiau@intel.com>
13495 Date: Thu Jun 3 13:48:53 2010 +0100
13497 build: Fix out of tree gtk-doc generation
13499 Various headers are build in builddirs (clutter-marshal.h, mkenums
13500 headers and cogl-define.h) so we need to add the corresponding include
13501 paths for gtk-doc to build its scanner.
13503 doc/reference/clutter/Makefile.am | 2 +-
13504 1 file changed, 1 insertion(+), 1 deletion(-)
13506 commit a351ff2afc1ac44f71fabc1219e928d2214f7bf8
13507 Author: Damien Lespiau <damien.lespiau@intel.com>
13508 Date: Thu Jun 3 11:59:48 2010 +0100
13510 build: Do not distribute clutter-json.h
13512 clutter-jon.h is generated at configure time, we should not distribute it.
13514 This caused a build issue when compiling from a tarballs and out of tree
13515 builds as we ended up with two clutter-json.h one in $(top_srcdir)/json
13516 and the other in $(top_builddir)/json and picked up the wrong one
13517 ($(top_srcdir)/json is included first in the include search path).
13519 clutter/Makefile.am | 4 +++-
13520 1 file changed, 3 insertions(+), 1 deletion(-)
13522 commit 23084b9768ee10502ef01f0c34ae7f2c64888c2b
13523 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13524 Date: Thu Jun 3 14:34:41 2010 +0100
13526 docs: Effects fixes for the API reference
13528 clutter/clutter-blur-effect.c | 2 +-
13529 clutter/clutter-colorize-effect.c | 4 ++--
13530 clutter/clutter-desaturate-effect.c | 2 +-
13531 clutter/clutter-effect.c | 2 +-
13532 clutter/clutter-effect.h | 1 -
13533 clutter/clutter-shader-effect.c | 4 ++--
13534 clutter/clutter-shader-effect.h | 2 +-
13535 doc/reference/clutter/clutter-docs.xml.in | 21 +++++++++------------
13536 doc/reference/clutter/clutter-sections.txt | 12 ++++++++----
13537 9 files changed, 25 insertions(+), 25 deletions(-)
13539 commit aef2f805a67cde24746a5d4e90299f877c748e86
13540 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13541 Date: Thu Jun 3 14:08:59 2010 +0100
13543 effects: Fix stacking of offscreen-based effects
13545 Stacking multiple effects sub-classing ClutterOffscreenEffect requires
13546 a small fix in the code that computes the screen coordinates of the
13547 actor to position the FBO correctly with regards to the stage.
13549 clutter/clutter-offscreen-effect.c | 12 ++++++++++++
13550 tests/interactive/test-rotate.c | 1 +
13551 2 files changed, 13 insertions(+)
13553 commit 8ef4d9fe21b8f1ef4d9bad3d8317239ab59e2714
13554 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13555 Date: Tue Jun 1 14:45:55 2010 +0100
13557 actor: Add "effects" to the animatable metas
13559 Since ClutterEffect is an ActorMeta it should be possible to animate the
13560 properties of named effects using the @effects syntax, just like it
13561 happens for actions and constraints.
13563 clutter/clutter-actor.c | 6 +++++-
13564 tests/interactive/test-rotate.c | 13 ++++++++-----
13565 2 files changed, 13 insertions(+), 6 deletions(-)
13567 commit 0e9a1dee6dde18e7fe6d92960987baa933826937
13568 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13569 Date: Mon May 17 12:55:46 2010 +0100
13571 shader-effect: Simplify setting the shader source
13573 Sub-classes of ShaderEffect currently have to get the handle for the
13574 Cogl shader and call cogl_shader_source(); this makes it awkward to
13575 implement a ShaderEffect, and it exposes handles and Cogl API that we
13576 might want to change in the future.
13578 We should provide a ClutterShaderEffect method that allows to (safely)
13579 set the shader source at the right time for sub-classes to use.
13581 clutter/clutter-blur-effect.c | 13 +---
13582 clutter/clutter-colorize-effect.c | 15 ++---
13583 clutter/clutter-desaturate-effect.c | 15 +----
13584 clutter/clutter-shader-effect.c | 116 +++++++++++++++++++----------------
13585 clutter/clutter-shader-effect.h | 25 ++++----
13586 5 files changed, 82 insertions(+), 102 deletions(-)
13588 commit f2caafa127a42f5b10454407d52eb6b8bd64876d
13589 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13590 Date: Wed Apr 21 11:30:06 2010 +0100
13592 docs: Add Effects API to the reference
13594 doc/reference/clutter/clutter-docs.xml.in | 12 ++++
13595 doc/reference/clutter/clutter-sections.txt | 105 ++++++++++++++++++++++++++++
13596 doc/reference/clutter/clutter.types | 6 ++
13597 3 files changed, 123 insertions(+)
13599 commit a3e8e0025a9aed83091d28a8f4fe63cfb81bfd07
13600 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13601 Date: Fri Apr 16 12:33:20 2010 +0100
13603 effect: Rework the OffscreenEffect painting
13605 The OffscreenEffect should set up the off screen draw buffer so that it
13606 has the same projection and modelview as if it where on screen; we
13607 achieve that by setting up the viewport to be the same size of the stage
13608 but with an initial offset given by the left-most vertex of the actor.
13610 When we paint the texture attached to the FBO we then set up the
13611 modelview matrix of the on screen draw buffer so that it's the same as
13612 the stage one: this way, the texture will be painted in screen
13613 coordinates and it will occupy the same area as the actor would have
13616 clutter/clutter-offscreen-effect.c | 304 ++++++++++++++++++++++++++----------
13617 clutter/clutter-offscreen-effect.h | 14 +-
13618 2 files changed, 230 insertions(+), 88 deletions(-)
13620 commit b4f8ba0f737212b9a7b734ab7fcd015f7def9161
13621 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13622 Date: Wed Apr 14 00:40:24 2010 +0100
13624 effect: Add ColorizeEffect
13626 A copy of DesaturateEffect that converts to grayscale and applies a
13627 user-defined tint to the render target.
13629 clutter/Makefile.am | 2 +
13630 clutter/clutter-colorize-effect.c | 290 +++++++++++++++++++++++++++++++++++++
13631 clutter/clutter-colorize-effect.h | 62 ++++++++
13632 clutter/clutter.h | 1 +
13633 4 files changed, 355 insertions(+)
13635 commit 73a773d37ab3c2ba6772acf6347a82d75a601901
13636 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13637 Date: Fri Apr 9 16:14:21 2010 +0100
13639 effect: Add DesaturateEffect
13641 A simple shader-based effect that desaturates an actor and its contents
13642 based on a controllable factor.
13644 clutter/Makefile.am | 2 +
13645 clutter/clutter-desaturate-effect.c | 309 +++++++++++++++++++++++++++++++++++
13646 clutter/clutter-desaturate-effect.h | 60 +++++++
13647 clutter/clutter.h | 1 +
13648 tests/interactive/test-rotate.c | 2 +-
13649 5 files changed, 373 insertions(+), 1 deletion(-)
13651 commit 5a5b21446c33d131885832c0b65a2227ad5c6955
13652 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13653 Date: Thu Apr 8 18:46:54 2010 +0100
13655 effect: Add BlurEffect
13657 A simple, GLSL shader-based blur effect.
13659 The blur shader is taken straight from the test-shader.c interactive
13660 test case. It's a fairly clunky, inefficient and visually incorrect
13661 implementation of a box blur, but it's all we have right now until I
13662 figure out a way to do multi-pass shading with the current API.
13664 clutter/Makefile.am | 2 +
13665 clutter/clutter-blur-effect.c | 244 +++++++++++++++++++++++++++++++++++++++++
13666 clutter/clutter-blur-effect.h | 56 ++++++++++
13667 clutter/clutter.h | 1 +
13668 4 files changed, 303 insertions(+)
13670 commit c260da79e318d64927ee6fad0cf6bd2e6971d097
13671 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13672 Date: Tue Apr 13 16:40:31 2010 +0100
13674 effect: Add ShaderEffect
13676 The ShaderEffect class is an abstract base type for shader-based
13677 effects. GLSL-based effects should be implemented by sub-classing
13678 ShaderEffect and overriding ActorMeta::set_actor() to set the source
13679 code of the shader, and Effect::pre_paint() to update the uniform
13682 The ShaderEffect has a generic API for sub-classes to set the values
13683 of the uniforms defined by their shaders, and it uses the shader
13684 types we defined for ClutterShader, to avoid re-inventing the wheel
13687 clutter/Makefile.am | 2 +
13688 clutter/clutter-shader-effect.c | 759 +++++++++++++++++++++++++++++++++++++++
13689 clutter/clutter-shader-effect.h | 101 ++++++
13690 clutter/clutter.h | 1 +
13691 4 files changed, 863 insertions(+)
13693 commit c3ab32ae6887a222472f4fc9025437ab91d0bbce
13694 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13695 Date: Mon May 17 11:39:27 2010 +0100
13697 effect: Add OffscreenEffect
13699 The OffscreenEffect class is meant to be used to implement Effect
13700 sub-classes that create an offscreen framebuffer and redirect the
13701 actor's paint sequence there. The OffscreenEffect is useful for
13702 effects using fragment shaders.
13704 Any shader-based effect being applied to an actor through an offscreen
13705 buffer should be used before painting the resulting target material and
13706 not for every actor. This means that doing:
13708 pre_paint: cogl_program_use(program)
13709 set up offscreen buffer
13710 paint: [ actors ] → offscreen buffer → target material
13711 post_paint: paint target material
13712 cogl_program_use(null)
13714 Is not correct. Unfortunately, we cannot really do:
13716 post_paint: cogl_program_use(program)
13717 paint target material
13718 cogl_program_use(null)
13720 Because the OffscreenEffect::post_paint() implementation also pops the
13721 offscreen buffer and re-instates the previous framebuffer:
13723 post_paint: cogl_program_use(program)
13724 change frame buffer ← ouch!
13725 paint target material
13726 cogl_program_use(null)
13728 One way to fix it is to allow using the shader right before painting
13729 the target material - which means adding a new virtual inside the
13730 OffscreenEffect class vtable in additions to the ones defined by the
13731 parent Effect class.
13733 The newly-added paint_target() virtual allows the correct sequence of
13734 actions by adding an entry point for sub-classes to wrap the "paint
13735 target material" operation with custom code, in order to implement the
13736 case above correctly as:
13738 post_paint: change frame buffer
13739 cogl_program_use(program)
13740 paint target material
13741 cogl_program_use(null)
13743 The added upside is that sub-classes of OffscreenEffect involving
13744 shaders really just need to override the prepare() and paint_target()
13745 virtuals, since the pre_paint() and post_paint() do all that's needed.
13747 clutter/Makefile.am | 2 +
13748 clutter/clutter-offscreen-effect.c | 336 ++++++++++++++++++++++++++++++++++++
13749 clutter/clutter-offscreen-effect.h | 96 +++++++++++
13750 clutter/clutter.h | 1 +
13751 4 files changed, 435 insertions(+)
13753 commit a86f1b45bbdd1d00b1257ef80c5c60154871bfda
13754 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13755 Date: Thu Apr 8 10:55:15 2010 +0100
13757 Add the ClutterEffect abstract class
13759 ClutterEffect is an abstract class that should be used to apply effects
13762 The ClutterEffect class just defines what an effect should implement; it
13763 could be defined as an interface, but we might want to add some default
13764 behavior dependent on the internal state at a later point.
13766 The effect API applies to any actor, so we need to provide a way to
13767 assign an effect to an actor, and let ClutterActor call the Effect
13768 methods during the paint sequence.
13770 Once an effect is attached to an actor we will perform the paint in this
13773 • Effect::pre_paint()
13774 • Actor::paint signal emission
13775 • Effect::post_paint()
13777 Since an effect might collide with the Shader class, we either allow a
13778 shader or an effect for the time being.
13780 clutter/Makefile.am | 6 +-
13781 clutter/clutter-actor.c | 322 ++++++++++++++++++++++++++++++++++++---
13782 clutter/clutter-actor.h | 5 +-
13783 clutter/clutter-effect.c | 232 ++++++++++++++++++++++++++++
13784 clutter/clutter-effect.h | 110 +++++++++++++
13785 clutter/clutter-private.h | 4 +
13786 clutter/clutter.h | 1 +
13787 tests/interactive/test-rotate.c | 4 +-
13788 8 files changed, 654 insertions(+), 30 deletions(-)
13790 commit 5ffbcbe9ee7d0b74bc5048fafd2ea15ee0486a58
13791 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13792 Date: Mon Apr 19 12:32:15 2010 +0100
13794 actor: Reset the modelview matrix
13796 When getting the relative modelview matrix we need to reset it to the
13797 stage's initial state or, at least, initialize it to the identity
13798 matrix, instead of assuming we have an empty stack.
13800 clutter/clutter-actor.c | 47 +++++++++++++++++++++++++++++++++++++++++++++--
13801 1 file changed, 45 insertions(+), 2 deletions(-)
13803 commit 6eba218807b0401c0e12e045ea08cdcfe057350d
13804 Author: Damien Lespiau <damien.lespiau@intel.com>
13805 Date: Thu Jun 3 11:33:54 2010 +0100
13807 build: Distribute cogl-object.h
13809 cogl-object.h is a new public header. Include it in the right list of
13810 source files to have it distributed.
13812 clutter/cogl/cogl/Makefile.am | 1 +
13813 1 file changed, 1 insertion(+)
13815 commit 91220c4b46fe75b21b4ebd99a63fd796f6fc56b0
13816 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13817 Date: Tue Jun 1 14:14:41 2010 +0100
13819 docs: Miscellaneous fixes to silence gtk-doc
13821 clutter/clutter-texture.c | 3 ++-
13822 clutter/cogl/cogl/cogl.h | 29 ++++++++++++++--------------
13823 doc/reference/clutter/clutter-sections.txt | 6 ++++++
13824 3 files changed, 22 insertions(+), 16 deletions(-)
13826 commit 311db34d08a52408f1efec74c9de43f9d153219f
13827 Author: Robert Bragg <robert@linux.intel.com>
13828 Date: Fri May 28 01:01:28 2010 +0100
13830 clip_stack: Remove use of CoglHandle in the CoglClipStack API
13832 This replaces the use of CoglHandle with strongly type CoglClipStack *
13833 pointers instead. The only function not converted for now is
13834 cogl_is_clip_stack which will be done in a later commit.
13836 clutter/cogl/cogl/cogl-clip-stack.c | 64 +++++++++++++++--------------------
13837 clutter/cogl/cogl/cogl-clip-stack.h | 26 +++++++-------
13838 2 files changed, 41 insertions(+), 49 deletions(-)
13840 commit 29da1d0d3e0d1f3c9a9a965b2b9290faa6d0c3db
13841 Author: Robert Bragg <robert@linux.intel.com>
13842 Date: Fri May 28 00:51:40 2010 +0100
13844 bitmap: Remove use of CoglHandle in the CoglBitmap API
13846 This replaces the use of CoglHandle with strongly type CoglBitmap *
13847 pointers instead. The only function not converted for now is
13848 cogl_is_bitmap which will be done in a later commit.
13850 clutter/cogl/cogl/cogl-bitmap-private.h | 4 ++--
13851 clutter/cogl/cogl/cogl-bitmap.c | 6 +++---
13852 clutter/cogl/cogl/cogl-bitmap.h | 8 +++++---
13853 3 files changed, 10 insertions(+), 8 deletions(-)
13855 commit f3f268b0cdc9e8113b0dee9eb28eca309823f544
13856 Author: Robert Bragg <robert@linux.intel.com>
13857 Date: Fri May 28 00:35:47 2010 +0100
13859 path: Remove use of CoglHandle in the CoglPath API
13861 This replaces the use of CoglHandle with strongly type CoglPath *
13862 pointers instead. The only function not converted for now is
13863 cogl_is_path which will be done in a later commit.
13865 clutter/cogl/cogl/cogl-path-private.h | 5 ++--
13866 clutter/cogl/cogl/cogl-path.c | 52 +++++++++++++++------------------
13867 clutter/cogl/cogl/cogl-path.h | 41 ++++++++++++++------------
13868 clutter/cogl/cogl/cogl.c | 10 +++----
13869 4 files changed, 53 insertions(+), 55 deletions(-)
13871 commit 250d82cd3fdf4cfa2b8cc5ad93cc4577a1daa2e3
13872 Author: Robert Bragg <robert@linux.intel.com>
13873 Date: Tue Jun 1 11:50:02 2010 +0100
13875 cogl: avoid ‘_cogl_xyz_handle_new’ defined but not used warnings
13877 This patch makes it so that only the backwards compatibility
13878 COGL_HANDLE_DEFINE macro defines a _cogl_xyz_handle_new function. The
13879 new COGL_OBJECT_DEFINE macro only defines a _cogl_xyz_object_new
13882 clutter/cogl/cogl/cogl-object.h | 18 ++++++++++--------
13883 1 file changed, 10 insertions(+), 8 deletions(-)
13885 commit 43564f05a6cc76995ff540b6cb24badd4f1d1710
13886 Author: Damien Lespiau <damien.lespiau@intel.com>
13887 Date: Thu May 27 13:30:07 2010 +0100
13889 analysis: Fix some CoglFixed API
13891 2 functions where not correctly defined/documented, use the actual
13892 symbol name instead.
13894 clutter/cogl/cogl/cogl-fixed.h | 6 +++---
13895 1 file changed, 3 insertions(+), 3 deletions(-)
13897 commit 653a8a78744a6be0ccc69ec7413d6d55cc3940e8
13898 Author: Damien Lespiau <damien.lespiau@intel.com>
13899 Date: Thu May 27 13:28:43 2010 +0100
13901 analysis: Use static functions when possible
13903 It's best to ensure the functions only used in one compilation unit are
13904 marked as static so GCC can inline them if it feels like it.
13906 clutter/clutter-bezier.c | 2 +-
13907 clutter/cogl/cogl/cogl-clip-stack.c | 2 +-
13908 clutter/cogl/cogl/cogl-clip-state.c | 2 +-
13909 3 files changed, 3 insertions(+), 3 deletions(-)
13911 commit 3161e92818366aedc106329675a7dd9ac2bffd10
13912 Author: Damien Lespiau <damien.lespiau@intel.com>
13913 Date: Thu May 27 12:18:29 2010 +0100
13915 analysis: Make all function declarations be protoypes
13917 It's valid C to declare a function omitting it prototype, but it seems
13918 to be a good practise to always declare a function with its
13919 corresponding prototype.
13921 clutter/clutter-bezier.c | 2 +-
13922 clutter/cogl/cogl/cogl-context.c | 4 ++--
13923 tests/interactive/test-cogl-primitives.c | 14 +++++++-------
13924 tests/interactive/test-project.c | 4 ++--
13925 tests/micro-bench/test-text-perf.c | 2 +-
13926 5 files changed, 13 insertions(+), 13 deletions(-)
13928 commit 83b7801e496f13ad7ecd615ce8fcd09c1fef44d4
13929 Author: Damien Lespiau <damien.lespiau@intel.com>
13930 Date: Thu May 27 09:23:26 2010 +0100
13932 analysis: Fix the "key-press-event" callback signature
13934 We were returning FALSE in a function declared as returning a gpointer.
13935 Turns out that the function should return a gboolea instead.
13937 tests/interactive/test-clip.c | 2 +-
13938 1 file changed, 1 insertion(+), 1 deletion(-)
13940 commit ec59af290cfd6813ff4df37994067de5cea2f1c4
13941 Author: Damien Lespiau <damien.lespiau@intel.com>
13942 Date: Thu May 27 09:07:11 2010 +0100
13944 analysis: None used in pointer context
13946 While this is totally fine (None is 0L and, in the pointer context, will
13947 be converted in the right internal NULL representation, which could be a
13948 value with some bits to 1), I believe it's clearer to use NULL instead
13949 of None when we talk about pointers.
13951 clutter/glx/clutter-backend-glx.c | 16 ++++++++--------
13952 clutter/x11/clutter-backend-x11.c | 2 +-
13953 tests/interactive/test-pixmap.c | 2 +-
13954 3 files changed, 10 insertions(+), 10 deletions(-)
13956 commit 52a78a7220650f4d8b1da75ff942cfede1248d20
13957 Author: Damien Lespiau <damien.lespiau@intel.com>
13958 Date: Thu May 27 08:28:29 2010 +0100
13960 analysis: FALSE/0 used in pointer context
13962 While this is totally fine (0 in the pointer context will be converted
13963 in the right internal NULL representation, which could be a value with
13964 some bits to 1), I believe it's clearer to use NULL in the pointer
13967 It seems that, in most case, it's more an overlook than a deliberate
13968 choice to use FALSE/0 as NULL, eg. copying a _COGL_GET_CONTEXT (ctx, 0)
13969 or a g_return_val_if_fail (cond, 0) from a function returning a
13972 clutter/clutter-actor.c | 2 +-
13973 clutter/clutter-backend.c | 4 ++--
13974 clutter/clutter-path.c | 2 +-
13975 clutter/clutter-script-parser.c | 2 +-
13976 clutter/clutter-script.c | 4 ++--
13977 clutter/clutter-shader-types.c | 6 +++---
13978 clutter/cogl/cogl/cogl-buffer.c | 2 +-
13979 clutter/cogl/cogl/cogl-journal.c | 2 +-
13980 clutter/cogl/cogl/cogl-path.c | 4 ++--
13981 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 2 +-
13982 clutter/cogl/cogl/cogl-vertex-buffer.c | 14 +++++++-------
13983 clutter/cogl/cogl/driver/gl/cogl-program.c | 2 +-
13984 clutter/x11/clutter-x11-texture-pixmap.c | 8 ++++----
13985 13 files changed, 27 insertions(+), 27 deletions(-)
13987 commit 9d428278f7b073f4221113026a18aaf4a6e25420
13988 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13989 Date: Sun May 30 15:24:18 2010 +0100
13991 Update git ignore file
13994 1 file changed, 1 insertion(+)
13996 commit e2fc489f0849d0295297d5702b815d853ff35135
13997 Author: Robert Bragg <robert@linux.intel.com>
13998 Date: Thu May 27 23:40:40 2010 +0100
14000 buffer: Remove use of CoglHandle in the CoglBuffer API
14002 This replaces the use of CoglHandle with strongly type CoglBuffer *
14003 pointers instead. The only function not converted for now is
14004 cogl_is_buffer which will be done in a later commit.
14006 clutter/cogl/cogl/cogl-buffer-private.h | 1 -
14007 clutter/cogl/cogl/cogl-buffer.c | 62 +++++++++++++------------------
14008 clutter/cogl/cogl/cogl-buffer.h | 58 +++++++++++++++--------------
14009 3 files changed, 55 insertions(+), 66 deletions(-)
14011 commit a8c8cbee5139427f4daf222e2f3b98276d1507b5
14012 Author: Robert Bragg <robert@linux.intel.com>
14013 Date: Thu May 27 23:31:40 2010 +0100
14015 Start eradicating the CoglHandle typedef
14017 CoglHandle is a common source of complaints and confusion because people
14018 expect a "handle" to be some form of integer type with some indirection
14019 to lookup the corresponding objects as opposed to a direct pointer.
14021 This patch starts by renaming CoglHandle to CoglObject * and creating
14022 corresponding cogl_object_ APIs to replace the cogl_handle ones.
14024 The next step though is to remove all use of CoglHandle in the Cogl APIs
14025 and replace with strongly typed pointer types such as CoglMaterial * or
14026 CoglTexture * etc also all occurrences of COGL_INVALID_HANDLE can just
14029 After this we will consider switching to GTypeInstance internally so we
14030 can have inheritance for our types and hopefully improve how we handle
14033 Note all these changes will be done in a way that maintains the API and
14036 clutter/cogl/cogl/cogl-handle.h | 140 ++----------------------------
14037 clutter/cogl/cogl/cogl-object.h | 183 +++++++++++++++++++++++++++++++++++++++
14038 clutter/cogl/cogl/cogl-types.h | 21 +++++
14039 clutter/cogl/cogl/cogl-util.c | 43 ++++++---
14040 4 files changed, 244 insertions(+), 143 deletions(-)
14042 commit a4fc5074faa3cda9d1c920ac94fe46e310a4ee2d
14043 Author: Neil Roberts <neil@linux.intel.com>
14044 Date: Fri May 28 18:12:53 2010 +0100
14046 cogl-texture-2d: Regenerate the mipmaps when the texture is modified
14048 When the texture is modified by cogl_texture_set_region, it wasn't
14049 setting mipmaps_dirty so it would never update the mipmaps.
14051 clutter/cogl/cogl/cogl-texture-2d.c | 2 ++
14052 1 file changed, 2 insertions(+)
14054 commit d0c743787d9f430e50fdda9df1c3ad4462e79cad
14055 Author: Robert Bragg <robert@linux.intel.com>
14056 Date: Fri May 28 17:11:31 2010 +0100
14058 texture: don't use a static bool to gate warning
14060 in create_pick_material we were using a static boolean to gate when we
14061 show a warning, but that would mean if the problem recurs between
14062 different textures then the warning will only be shown once. We now have
14063 a private bitfield flag instead, just so we don't spew millions of
14064 warnings if the problem is recurring.
14066 clutter/clutter-texture.c | 9 ++++++---
14067 1 file changed, 6 insertions(+), 3 deletions(-)
14069 commit 589c8d957934dfa7413395df9cdd153a379402d0
14070 Author: Robert Bragg <robert@linux.intel.com>
14071 Date: Fri Sep 25 19:14:40 2009 +0100
14073 [texture] Support picking textures according to their alpha channel
14075 This adds a boolean "pick-with-alpha" property to ClutterTexture and when
14076 true, it will use the textures alpha channel to define the actors shape when
14079 Users should be aware that it's a bit more expensive to pick textures like
14080 this (so probably best not to blindly enable it on *all* your textures)
14081 since it implies rasterizing the texture during picking whereas we would
14082 otherwise just send a solid filled quad to the GPU. It will also interrupt
14083 the internal batching of geometry for pick renders which can otherwise often
14084 be done in a single draw call.
14086 clutter/clutter-texture.c | 243 ++++++++++++++++++++++++++++++----
14087 clutter/clutter-texture.h | 4 +
14088 tests/conform/Makefile.am | 1 +
14089 tests/conform/test-clutter-texture.c | 89 +++++++++++++
14090 tests/conform/test-conform-main.c | 1 +
14091 5 files changed, 312 insertions(+), 26 deletions(-)
14093 commit 8ded6663fb7e0155acb72dedbea6d490856ee156
14094 Author: Robert Bragg <robert@linux.intel.com>
14095 Date: Fri Sep 25 19:04:13 2009 +0100
14097 [material] fix _set_alpha_test_function: missing a glEnable(GL_ALPHA_TEST)
14099 Since the default alpha test function of GL_ALWAYS is equivalent to
14100 GL_ALPHA_TEST being disabled we don't need to worry about Enabling/Disabling
14101 it when flushing material state, instead it's enough to leave it always
14102 enabled. We will assume that any driver worth its salt wont incur any
14103 additional cost for glEnable (GL_ALPHA_TEST) + GL_ALWAYS vs
14104 glDisable (GL_ALPHA_TEST).
14106 This patch simply calls glEnable (GL_ALPHA_TEST) in cogl_create_context
14108 clutter/cogl/cogl/cogl-context.c | 6 ++++++
14109 1 file changed, 6 insertions(+)
14111 commit 3f64f57830b835d31c2cbce61eb854d9d055ccdd
14112 Author: Robert Bragg <robert@linux.intel.com>
14113 Date: Wed Sep 23 19:04:03 2009 +0100
14115 [texture] remove redundant if (paint_opacity == 0) bailout
14117 clutter_texture_paint shouldn't need to optimize the case where
14118 paint_opacity == 0 and bailout, since we've been doing this optimization for
14119 all actors in clutter_actor_paint for a while now.
14121 clutter/clutter-texture.c | 8 --------
14122 1 file changed, 8 deletions(-)
14124 commit dfe6eb1e5116603f7702e06058550def56df12ad
14125 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14126 Date: Thu May 27 16:32:32 2010 +0100
14128 test-scrolling: Use a better looking bounce easing
14130 tests/interactive/test-scrolling.c | 4 ++--
14131 1 file changed, 2 insertions(+), 2 deletions(-)
14133 commit aa53dccfce2a425d309d7be99cd2cd6e771c92be
14134 Author: Neil Roberts <neil@linux.intel.com>
14135 Date: Thu May 27 14:54:14 2010 +0100
14137 cogl-vertex-buffer: Don't disable any texture coord arrays
14139 The enabled state of the texture coord arrays is cached in the cogl
14140 context so there is no need to disable them when we've finished
14143 clutter/cogl/cogl/cogl-vertex-buffer.c | 8 +++++---
14144 1 file changed, 5 insertions(+), 3 deletions(-)
14146 commit 401892af1188073dc3107832b8e2e908c5c0e79e
14147 Author: Neil Roberts <neil@linux.intel.com>
14148 Date: Thu May 27 14:51:44 2010 +0100
14150 cogl: Record new enabled arrays in _cogl_disable_other_texcoord_arrays
14152 When _cogl_disable_other_texcoord_arrays is called it disables the
14153 neccessary texcoord arrays and then removes the bits for the disabled
14154 arrays in ctx->texcoord_arrays_enabled. However none of the places
14155 that call the function then set any bits in ctx->texcoord_arrays_enabled
14156 so the arrays would never get marked and they would never get disabled
14159 This patch just changes it so that _cogl_disable_other_texcoord_arrays
14160 also sets the corresponding bits in ctx->texcoord_arrays_enabled.
14162 clutter/cogl/cogl/cogl-internal.h | 3 ++-
14163 clutter/cogl/cogl/cogl.c | 1 +
14164 2 files changed, 3 insertions(+), 1 deletion(-)
14166 commit aab411bde4757340d5d38231d85e44136fc121ad
14167 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14168 Date: Thu May 27 12:32:45 2010 +0100
14170 test-scrolling: Animate intermediate positions
14172 Animating intermediate positions in the viewport panning is a neat
14175 tests/interactive/test-scrolling.c | 32 ++++++++++++++++++++++++++++----
14176 1 file changed, 28 insertions(+), 4 deletions(-)
14178 commit b77c0c91d76f56f9c9c032ccec5c04c0ab37aeae
14179 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14180 Date: Thu May 27 12:30:22 2010 +0100
14182 drag-action: Re-use press_button in emit_drag_end()
14184 Since emit_drag_end() can be called from a MOTION event capture we
14185 cannot call clutter_event_get_button(). We should, instead, use the
14186 press_button value because if we're emitting ::drag-end it means we
14187 also emitted ::drag-begin and the value is valid.
14189 clutter/clutter-drag-action.c | 2 +-
14190 1 file changed, 1 insertion(+), 1 deletion(-)
14192 commit 346ebce57385eeee593ee51796274e7fbb9298e6
14193 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14194 Date: Wed May 26 16:09:47 2010 +0100
14196 actor: Add accessors pair for :clip-to-allocation
14198 We should have an accessors pair for the :clip-to-allocation property,
14199 to avoid going through the generic GObject accessors.
14201 clutter/clutter-actor.c | 56 +++++++++++++++++++++++++---
14202 clutter/clutter-actor.h | 3 ++
14203 doc/reference/clutter/clutter-sections.txt | 2 +
14204 tests/interactive/test-scrolling.c | 4 +-
14205 4 files changed, 58 insertions(+), 7 deletions(-)
14207 commit 6ea56f11605005175cdbbd532fd7ebbea80c372c
14208 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14209 Date: Wed May 26 15:58:15 2010 +0100
14211 Add a scrolling interactive example
14213 We can use a container with :clip-to-allocation set to TRUE and a
14214 DragAction to create a panning viewport.
14217 tests/interactive/Makefile.am | 3 +-
14218 tests/interactive/test-scrolling.c | 107 ++++++++++++++++++++++++++++++++++++
14219 3 files changed, 110 insertions(+), 1 deletion(-)
14221 commit 823251c159366a566fbdae7ffff129b61a9acca4
14222 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14223 Date: Wed May 26 14:18:19 2010 +0100
14225 Use ClickAction in test-animation
14227 Instead of using ::button-press-event.
14229 tests/interactive/test-animation.c | 18 +++++++++---------
14230 1 file changed, 9 insertions(+), 9 deletions(-)
14232 commit 5677cf671cbca78361c3a4606790d8dcc6ddbc40
14233 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14234 Date: Wed May 26 14:16:48 2010 +0100
14236 actor: Fix a type check thinko in add_action_with_name()
14238 clutter/clutter-actor.c | 2 +-
14239 1 file changed, 1 insertion(+), 1 deletion(-)
14241 commit 09659ea18d0b534ba9645cbf05ca510aa702ebcf
14242 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14243 Date: Wed May 26 14:09:24 2010 +0100
14245 docs: Description fixes for Action and Constraint
14247 clutter/clutter-action.c | 14 ++++++++------
14248 clutter/clutter-actor-meta.c | 1 +
14249 clutter/clutter-constraint.c | 6 +++++-
14250 3 files changed, 14 insertions(+), 7 deletions(-)
14252 commit 9510cbbad290cc8edd3b602991e57f98989a86ce
14253 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14254 Date: Wed May 26 13:43:42 2010 +0100
14256 state: Minor fixes and documentation additions
14258 Clean up the code a bit, and move common code paths into separate
14259 function. Also, document clutter_state_set() with examples.
14261 clutter/clutter-state.c | 298 ++++++++++++++++++++++++++++++-----------------
14262 1 file changed, 189 insertions(+), 109 deletions(-)
14264 commit 7a299e9b470f3feb9e8cb674815ebfd288d638f5
14265 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14266 Date: Wed May 26 13:40:18 2010 +0100
14268 introspection: Add --pkg atk
14270 We need to tell the introspection scanner all the dependencies we
14271 require, including the pkg-config name to use when compiling the
14272 GIR file into a typelib object.
14274 clutter/Makefile.am | 1 +
14275 1 file changed, 1 insertion(+)
14277 commit e2bbf7f3620899b3283b4d76879d01a599733144
14278 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14279 Date: Tue May 25 13:27:29 2010 +0100
14281 click-action: Handle the event
14283 In case we did handle the event, we should return TRUE from the ::event
14286 clutter/clutter-click-action.c | 2 +-
14287 1 file changed, 1 insertion(+), 1 deletion(-)
14289 commit cfb05bfb097fc5a9b61fed0f855792b6c8064822
14290 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14291 Date: Tue May 25 13:10:38 2010 +0100
14293 docs: Fix DragAction documentation
14295 The ::drag-motion signal does not have a ModifierType argument; also,
14296 there's no need to connect to the ::drag-motion signal any more.
14298 clutter/clutter-drag-action.c | 34 +++++++++++-----------------------
14299 clutter/clutter-drag-action.h | 3 +--
14300 2 files changed, 12 insertions(+), 25 deletions(-)
14302 commit 5a531bd1c9324704bac315bb53e907f9867f5a4e
14303 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14304 Date: Tue May 25 13:03:24 2010 +0100
14306 Fix typo in get_accessible()
14308 clutter/clutter-actor.c | 2 +-
14309 1 file changed, 1 insertion(+), 1 deletion(-)
14311 commit 7bf93e3e84716a486073194e1fc7a87cb483ab8a
14312 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14313 Date: Tue May 25 12:54:59 2010 +0100
14315 actor: Put get_accessible() at the end of the class structure
14317 New virtual functions cannot go wherever they want, if we need to
14320 Also, the coding style should match the rest of ClutterActor and
14321 Clutter's own coding style.
14323 clutter/clutter-actor.c | 29 ++++++++++-------------------
14324 clutter/clutter-actor.h | 8 ++++----
14325 2 files changed, 14 insertions(+), 23 deletions(-)
14327 commit b0c0f24bd22aeb8cbb333b99c44a5631966956f0
14328 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14329 Date: Tue May 25 11:53:59 2010 +0100
14331 docs: Add ClickAction to the API reference
14333 And clean up the reference index.
14335 doc/reference/clutter/clutter-docs.xml.in | 7 +--
14336 doc/reference/clutter/clutter-sections.txt | 20 ++++++++
14337 doc/reference/clutter/clutter.types | 74 ++++++++++++++--------------
14338 3 files changed, 61 insertions(+), 40 deletions(-)
14340 commit 7c627e1e0381082aafc2b8acc1fdc7d149c4b3f5
14341 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14342 Date: Mon May 24 11:30:17 2010 +0100
14344 actor-meta: Disconnect on actor destroy
14346 When destroying an Actor the various ActorMeta instance should already
14347 be disposed - unless something is holding a reference to them, in which
14348 case we should use the ::destroy signal to unset the ActorMeta:actor
14351 clutter/clutter-actor-meta.c | 22 ++++++++++++++++++++++
14352 1 file changed, 22 insertions(+)
14354 commit f6fce05ee94320db0ffbf4eab12e5fd86777ac92
14355 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14356 Date: Mon May 24 10:41:19 2010 +0100
14358 action: Add ClickAction
14360 ClickAction adds "clickable" semantics to an actor. It provides all
14361 the business logic to emit a high-level "clicked" signal from the
14362 various low-level signals inside ClutterActor.
14364 clutter/Makefile.am | 2 +
14365 clutter/clutter-click-action.c | 309 ++++++++++++++++++++++++++++++++++++++++
14366 clutter/clutter-click-action.h | 97 +++++++++++++
14367 clutter/clutter.h | 1 +
14368 4 files changed, 409 insertions(+)
14370 commit 728e2d807102131fa1dedd646016cccb9d4e6128
14371 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14372 Date: Tue May 25 11:01:46 2010 +0100
14374 drag: Add a default drag-motion behaviour
14376 The DragAction should, by default, drag the actor to which it has been
14377 applied, instead of delegating what to do to the developer. If custom
14378 code need to override it, g_signal_stop_emission_by_name() can be called
14379 to stop the default handler to ever running.
14381 clutter/clutter-drag-action.c | 25 +++++++++++++++++++++++++
14382 tests/interactive/test-drag.c | 16 ----------------
14383 2 files changed, 25 insertions(+), 16 deletions(-)
14385 commit d2e91c99351c820787382efc97c3465b5ab1be7f
14386 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14387 Date: Mon May 24 16:57:35 2010 +0100
14389 Post-release version bump to 1.3.3
14391 configure.ac | 4 ++--
14392 1 file changed, 2 insertions(+), 2 deletions(-)
14394 commit cc907a99c9aa03709dd1ee66c461fc6cb6c30e57
14395 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14396 Date: Mon May 24 16:50:36 2010 +0100
14398 Release 1.3.2 (snapshot)
14400 configure.ac | 2 +-
14401 1 file changed, 1 insertion(+), 1 deletion(-)
14403 commit 4dd5088fe29253c7479fbc54d22055994a8dd0e5
14404 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14405 Date: Mon May 24 16:46:38 2010 +0100
14407 docs: Add Actor.get_accessible() to the API reference
14409 doc/reference/clutter/clutter-sections.txt | 1 +
14410 1 file changed, 1 insertion(+)
14412 commit 171282bd0f4d39111185bd12854471de4804072c
14413 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14414 Date: Mon May 24 16:12:47 2010 +0100
14418 NEWS | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
14419 1 file changed, 70 insertions(+)
14421 commit 8f0b70a9eebf760e42d635dfe4b7347d3701debf
14422 Author: Øyvind Kolås <pippin@linux.intel.com>
14423 Date: Mon May 24 15:39:01 2010 +0100
14425 state: replaced test with a more complex one
14427 tests/interactive/test-state.c | 167 ++++++++++++++++++++++++++++++----------
14428 1 file changed, 126 insertions(+), 41 deletions(-)
14430 commit 49a4c623197e8d6a639a98b4aa56922c7b9b3255
14431 Author: Øyvind Kolås <pippin@linux.intel.com>
14432 Date: Mon May 24 16:10:00 2010 +0100
14434 state: fix clutter_state_change (state, "state-name", FALSE)
14436 Properties were not being updated correctly.
14438 clutter/clutter-state.c | 77 ++++++++++++++++++++++++++---------------------
14439 1 file changed, 42 insertions(+), 35 deletions(-)
14441 commit 380e7b8b5d0f3a12e8132a24c637151cc0f07261
14442 Author: Neil Roberts <neil@linux.intel.com>
14443 Date: Mon May 24 12:40:11 2010 +0100
14445 cogl: Use a CoglBitmask to store the list of used texcoord arrays
14447 Instead of directly using a guint32 to store a bitmask for each used
14448 texcoord array, it now stores them in a CoglBitmask. This removes the
14449 limitation of 32 layers (although there are still other places in Cogl
14450 that imply this restriction). To disable texcoord arrays code should
14451 call _cogl_disable_other_texcoord_arrays which takes a bitmask of
14452 texcoord arrays that should not be disabled. There are two extra
14453 bitmasks stored in the CoglContext which are used temporarily for this
14454 function to avoid allocating a new bitmask each time.
14456 http://bugzilla.openedhand.com/show_bug.cgi?id=2132
14458 clutter/cogl/cogl/cogl-context.c | 8 ++++++-
14459 clutter/cogl/cogl/cogl-context.h | 8 ++++++-
14460 clutter/cogl/cogl/cogl-internal.h | 5 +++-
14461 clutter/cogl/cogl/cogl-journal.c | 7 +++---
14462 clutter/cogl/cogl/cogl-path.c | 3 ++-
14463 clutter/cogl/cogl/cogl-primitives.c | 7 +++---
14464 clutter/cogl/cogl/cogl-vertex-buffer.c | 10 ++++----
14465 clutter/cogl/cogl/cogl.c | 41 ++++++++++++++++++--------------
14466 8 files changed, 55 insertions(+), 34 deletions(-)
14468 commit 218efd0b6222abf14b48f467bfd3134e5b952fa2
14469 Author: Neil Roberts <neil@linux.intel.com>
14470 Date: Thu May 20 17:31:42 2010 +0100
14472 cogl: Add an internal CoglBitmask type
14474 This implements a growable array of bits called CoglBitmask. The
14475 CoglBitmask is intended to be cheap if less than 32 bits are used. If
14476 more bits are required it will allocate a GArray. The type is meant to
14477 be allocated on the stack but because it can require additional
14478 resources it also has a destroy function.
14480 http://bugzilla.openedhand.com/show_bug.cgi?id=2132
14482 clutter/cogl/cogl/Makefile.am | 2 +
14483 clutter/cogl/cogl/cogl-bitmask.c | 257 ++++++++++++++++++++++++++++++++++++++
14484 clutter/cogl/cogl/cogl-bitmask.h | 223 +++++++++++++++++++++++++++++++++
14485 3 files changed, 482 insertions(+)
14487 commit 889dcee3844ac0fdfbf19b583e043e1cbb9af4a4
14488 Author: Neil Roberts <neil@linux.intel.com>
14489 Date: Thu May 20 00:40:24 2010 +0100
14491 cogl-material: Fix the count of the number of layers
14493 Previously the counter for the number of layers was only updated
14494 whenever the texture handle for a layer changes. However there are
14495 many other ways for a new layer to be created for example by setting a
14496 layer combine constant. Also by default the texture on a layer is
14497 COGL_INVALID_HANDLE so if the application tries to create an explicit
14498 layer with no texture by calling cogl_material_set_layer with
14499 COGL_INVALID_HANDLE then it also wouldn't update the count.
14501 This patch fixes that by incrementing the count in
14502 cogl_material_get_layer instead. This function is called by all
14503 functions that may end up creating a layer so it seems like the most
14506 http://bugzilla.openedhand.com/show_bug.cgi?id=2132
14508 clutter/cogl/cogl/cogl-material.c | 3 ++-
14509 1 file changed, 2 insertions(+), 1 deletion(-)
14511 commit ae0354e9ba6e59a681e27e46c5a2cf98d33687f0
14512 Author: Neil Roberts <neil@linux.intel.com>
14513 Date: Thu May 20 00:16:49 2010 +0100
14515 cogl-vertex-buffer: Don't disable layers with no texture coords
14517 It should be quite acceptable to use a texture without defining any
14518 texture coords. For example a shader may be in use that is doing
14519 texture lookups without referencing the texture coordinates. Also it
14520 should be possible to replace the vertex colors using a texture layer
14521 without a texture but with a constant layer color.
14523 enable_state_for_drawing_buffer no longer sets any disabled layers in
14524 the overrides. Instead of counting the number of units with texture
14525 coordinates it now keeps them in a mask. This means there can now be
14526 gaps in the list of enabled texture coordinate arrays. To cope with
14527 this, the Cogl context now also stores a mask to track the enabled
14528 arrays. Instead of code manually iterating each enabled array to
14529 disable them, there is now an internal function called
14530 _cogl_disable_texcoord_arrays which disables a given mask.
14532 I think this could also fix potential bugs when a vertex buffer has
14533 gaps in the texture coordinate attributes that it provides. For
14534 example if the vertex buffer only had texture coordinates for layer 2
14535 then the disabling code would not disable the coordinates for layers 0
14536 and 1 even though they are not used. This could cause a crash if the
14537 previous data for those arrays is no longer valid.
14539 http://bugzilla.openedhand.com/show_bug.cgi?id=2132
14541 clutter/cogl/cogl/cogl-context.c | 2 +-
14542 clutter/cogl/cogl/cogl-context.h | 3 ++-
14543 clutter/cogl/cogl/cogl-internal.h | 3 +++
14544 clutter/cogl/cogl/cogl-journal.c | 14 +++++---------
14545 clutter/cogl/cogl/cogl-path.c | 9 ++-------
14546 clutter/cogl/cogl/cogl-primitives.c | 13 ++++---------
14547 clutter/cogl/cogl/cogl-vertex-buffer.c | 21 ++++++--------------
14548 clutter/cogl/cogl/cogl.c | 33 +++++++++++++++++++++++++-------
14549 8 files changed, 49 insertions(+), 49 deletions(-)
14551 commit 70abe3dd8abab74d86b8a3b90753f822a0507d04
14552 Author: Neil Roberts <neil@linux.intel.com>
14553 Date: Wed May 19 23:42:40 2010 +0100
14555 test-cogl-materials: Test invalid layers with a constant color
14557 This adds a test using a layer with no texture but that replaces the
14558 fragment color with the layer constant. This currently causes the test
14561 http://bugzilla.openedhand.com/show_bug.cgi?id=2132
14563 tests/conform/test-cogl-materials.c | 31 ++++++++++++++++++++++++++++++-
14564 1 file changed, 30 insertions(+), 1 deletion(-)
14566 commit ff7ce2c5b290edcd9c44a60eb0bcc9b77f56827d
14567 Author: Neil Roberts <neil@linux.intel.com>
14568 Date: Wed May 19 23:36:18 2010 +0100
14570 test-cogl-materials: Run the 'all layers' test with different prims
14572 The drawing code from test_invalid_texture_layers which draws a
14573 rectangle, a polygon and a vertex buffer has been split out to
14574 separate function. test_using_all_layers now also uses this so that it
14575 will also test the other two primitives. This causes the test to fail
14576 when all of the layers are drawn using a vertex buffer.
14578 http://bugzilla.openedhand.com/show_bug.cgi?id=2132
14580 tests/conform/test-cogl-materials.c | 47 +++++++++++++++++++----------------
14581 1 file changed, 25 insertions(+), 22 deletions(-)
14583 commit a59bd4cfbb08501a9ba6ccf8061ee461b2271a17
14584 Author: Alejandro Piñeiro <apinheiro@igalia.com>
14585 Date: Tue Apr 13 13:23:15 2010 +0200
14587 Implement AtkImplementor on ClutterActor
14589 Implements AtkImplementor interface on ClutterActor, and his method
14590 atk_implementor_ref_accessible.
14593 http://library.gnome.org/devel/atk/stable/AtkObject.html#AtkImplementor
14595 clutter/Makefile.am | 1 +
14596 clutter/clutter-actor.c | 22 +++++++++++++++++++++-
14597 2 files changed, 22 insertions(+), 1 deletion(-)
14599 commit 6a313ec2e2c227448ee83e6610ef78d1d0fe14a0
14600 Author: Alejandro Piñeiro <apinheiro@igalia.com>
14601 Date: Mon Apr 12 20:10:24 2010 +0200
14603 Implemented clutter_actor_get_accessible
14605 Added the implementation for clutter_actor_get_accessible, virtual
14606 ClutterActor function, used to obtain the accessible object of
14609 As it is defined virtual, it would be possible to redefine it, so
14610 any custom clutter actor could implement their accessibility object,
14611 withouth relying totally on a accessibility implementation module.
14613 See gtkiconview as example.
14615 http://bugzilla.openedhand.com/show_bug.cgi?id=2070
14617 clutter/clutter-actor.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
14618 clutter/clutter-actor.h | 10 +++++++++-
14619 2 files changed, 54 insertions(+), 1 deletion(-)
14621 commit fd584e18418166542c0e75b75a263060c8ce4634
14622 Author: Alejandro Piñeiro <apinheiro@igalia.com>
14623 Date: Mon Apr 12 19:34:06 2010 +0200
14625 Added Atk dependency
14627 Added Atk dependency, in order to implement a built-in
14628 accessibility support on Clutter.
14631 configure.ac | 2 +-
14632 2 files changed, 2 insertions(+), 1 deletion(-)
14634 commit 5f6a3d2543ff583c5f4d07c2b1e668f3cfe10841
14635 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14636 Date: Mon May 24 15:34:43 2010 +0100
14638 build: Remove shave files from EXTRA_DIST
14640 We don't use Shave any more, and require automake 1.11 instead.
14642 build/autotools/Makefile.am | 3 ---
14643 1 file changed, 3 deletions(-)
14645 commit 173e497ff4cf32ee6debbd065e25462b2bc4dbb7
14646 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14647 Date: Mon May 24 15:14:09 2010 +0100
14649 state: Use Interval.compute() instead of compute_value()
14651 Use the newly-added compute() variant to avoid creating a GValue only
14652 for getting it copied by g_object_set_property().
14654 clutter/clutter-state.c | 41 ++++++++++++++++++++---------------------
14655 1 file changed, 20 insertions(+), 21 deletions(-)
14657 commit af84d97fca671ba5db0bd912eec665f9318aabc3
14658 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14659 Date: Mon May 24 15:06:14 2010 +0100
14661 interval: Add a pointer variant to compute_value()
14663 ClutterInterval.compute_value() computes the new value given a progress
14664 and copies it to a given GValue. Since most of the time we want to pass
14665 that very same value to another function that copies it again, we should
14666 have a compute_value() variant that stores that computed value inside
14667 ClutterInterval and returns a pointer to it. This way we initialize the
14668 result GValue just once and we never copy it, as long as the Interval
14671 clutter/clutter-interval.c | 73 +++++++++++++++++++++++++---
14672 clutter/clutter-interval.h | 3 ++
14673 doc/reference/clutter/clutter-sections.txt | 3 +-
14674 3 files changed, 70 insertions(+), 9 deletions(-)
14676 commit 489c16c6a6842084c8bd10597b7b0bbcc69ff5af
14677 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14678 Date: Mon May 24 14:20:23 2010 +0100
14680 docs: Align parameter names between header and source code
14682 clutter/clutter-state.c | 131 ++++++++++++++--------------
14683 clutter/clutter-state.h | 34 ++++----
14684 doc/reference/clutter/clutter-sections.txt | 1 +
14685 3 files changed, 85 insertions(+), 81 deletions(-)
14687 commit 07ffa015ab388e5f5fdcb41fc0a2fa92fd98e0bc
14688 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14689 Date: Mon May 24 12:00:43 2010 +0100
14691 docs: Add ClutterState to the API reference
14693 doc/reference/clutter/clutter-docs.xml.in | 1 +
14694 doc/reference/clutter/clutter-sections.txt | 43 ++++++++++++++++++++++++++++
14695 doc/reference/clutter/clutter.types | 1 +
14696 3 files changed, 45 insertions(+)
14698 commit 382bd394b92cd0abcc7cfbfae31dccf162aea7e8
14699 Merge: 254e8d0 9fcbb27
14700 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14701 Date: Mon May 24 10:42:03 2010 +0100
14703 Merge branch 'wip/state-machine'
14705 * wip/state-machine:
14706 Do not use wildcards in test-state
14707 script: Implement State deserialization
14708 state: added a "target-state" property
14709 state: documented data structures
14710 Add State interactive tests to the ignore file
14711 state: Documentation and introspection annotation fixes
14712 state: Minor coding style fixes
14713 state: Clean up the header's documentation
14714 state: Constify StateKey accessors
14715 Do not include clutter.h from a Clutter header file
14716 state-machine: made clutter_state_change take a boolean animate argument
14717 state-machine: use clutter_timeline_get_progress
14718 state-machine: add completed signal
14719 state machine: added state machine
14724 commit 254e8d0fe585bb7de0798dd8063470d2aa1c60a5
14725 Merge: 5e3dc55 9ebd5fd
14726 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14727 Date: Fri May 21 14:38:37 2010 +0100
14729 Merge branch 'wip/framebuffer-bits'
14731 * wip/framebuffer-bits:
14732 Implement accessors for the color bits in a framebuffer
14734 commit 9fcbb274e01e4fb5df2d08fddfdfd3b91fe63e4e
14735 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14736 Date: Fri May 21 14:22:56 2010 +0100
14738 Do not use wildcards in test-state
14740 Use named states, like in a real case.
14742 tests/conform/test-state.c | 6 +++---
14743 tests/data/test-state-1.json | 4 ++--
14744 2 files changed, 5 insertions(+), 5 deletions(-)
14746 commit 6ca425679ea27c7fe2bc8e455b8d55785200841e
14747 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14748 Date: Fri May 21 14:13:14 2010 +0100
14750 script: Implement State deserialization
14752 It should be possible to describe ClutterState transitions using
14753 ClutterScript in a similar way as ClutterAnimator.
14756 clutter/clutter-state.c | 296 ++++++++++++++++++++++++++++++++++---
14757 tests/conform/Makefile.am | 1 +
14758 tests/conform/test-conform-main.c | 1 +
14759 tests/conform/test-state.c | 59 ++++++++
14760 tests/data/Makefile.am | 1 +
14761 tests/data/test-state-1.json | 33 +++++
14762 7 files changed, 375 insertions(+), 17 deletions(-)
14764 commit 5e3dc55666c345a6a17dc3ae082c0ee1de3ae82a
14765 Merge: bb2d088 6567800
14766 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14767 Date: Fri May 21 10:55:09 2010 +0100
14769 Merge branch 'wip/constraints'
14771 * wip/constraints: (24 commits)
14772 Add the Cogl API reference to the fixxref extra directories
14773 Document the internal MetaGroup class
14774 Remove the construct-only flag from ActorMeta:name
14775 doc: Remove gtk-doc annotations from the json-glib copy
14776 doc: Fix parameter documentation
14777 Add named modifiers for Action and Constraint
14778 Remove a redundant animation
14779 Set the stage resizable in test-constraints
14780 Use a 9 grid for the constraints test
14781 Miscellaneous documentation fixes
14782 docs: Document animating action and constraint properties
14783 docs: Document BindConstraint and AlignConstraint
14784 constraint: Rename BindConstraint:bind-axis
14785 constraints: Add AlignConstraint
14786 tests: Add a constraints interactive test
14787 constraint: Add BindConstraint
14788 actor: Implement Animatable
14789 animation: Use the new Animatable API for custom properties
14790 animatable: Add custom properties to Animatable
14791 constraint: Add ClutterConstraint base class
14797 commit d156550633a4fc7580d6e06b726845fb414f7196
14798 Author: Øyvind Kolås <pippin@linux.intel.com>
14799 Date: Fri May 21 10:37:42 2010 +0100
14801 state: added a "target-state" property
14803 When set the ClutterState transitions to the new state.
14805 clutter/clutter-state.c | 87 +++++++++++++++++++++++++++++++++++++++++------
14806 1 file changed, 76 insertions(+), 11 deletions(-)
14808 commit 9c4467707f13e3f6f780d6f88ee1da5929e39f56
14809 Author: Øyvind Kolås <pippin@linux.intel.com>
14810 Date: Thu May 20 23:05:16 2010 +0100
14812 state: documented data structures
14814 clutter/clutter-state.c | 90 +++++++++++++++++++++++++----------------------
14815 1 file changed, 48 insertions(+), 42 deletions(-)
14817 commit 84f165b460bcadf83f4174368e047d5c53f95b24
14818 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14819 Date: Thu May 20 18:58:30 2010 +0100
14821 Add State interactive tests to the ignore file
14824 1 file changed, 2 insertions(+)
14826 commit ae3dc9bd5ebf0ea3350d458c5560e9cd6aff9fe1
14827 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14828 Date: Thu May 20 18:57:27 2010 +0100
14830 state: Documentation and introspection annotation fixes
14832 clutter/clutter-state.c | 179 +++++++++++++++++++++++++++++------------------
14833 1 file changed, 110 insertions(+), 69 deletions(-)
14835 commit c2abb827a36db1d8db0518ea2b144bc971d23ee0
14836 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14837 Date: Thu May 20 18:34:34 2010 +0100
14839 state: Minor coding style fixes
14841 clutter/clutter-state.c | 322 ++++++++++++++++++++++++++++-------------------
14842 1 file changed, 194 insertions(+), 128 deletions(-)
14844 commit 9fafc93c5d241313d70b0451b2529f4fd30acd14
14845 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14846 Date: Thu May 20 17:46:52 2010 +0100
14848 state: Clean up the header's documentation
14850 clutter/clutter-state.h | 28 ++++++++++++++++++++++------
14851 1 file changed, 22 insertions(+), 6 deletions(-)
14853 commit 3f36b4a8419e1dfbaaf1008e636d18c93fe2cb66
14854 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14855 Date: Thu May 20 17:34:36 2010 +0100
14857 state: Constify StateKey accessors
14859 Since the accessors do not modify the StateKey we should constify the
14862 clutter/clutter-state.c | 179 ++++++++++++++++++++++++++++++-----------------
14863 clutter/clutter-state.h | 20 +++---
14864 2 files changed, 126 insertions(+), 73 deletions(-)
14866 commit 5c74f990d6e388aaa7041469dbed7b4cd80242c3
14867 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14868 Date: Thu May 20 17:34:02 2010 +0100
14870 Do not include clutter.h from a Clutter header file
14872 Clutter header files should just include the needed headers.
14874 clutter/clutter-state.c | 10 ++++++++--
14875 clutter/clutter-state.h | 30 ++++++++----------------------
14876 2 files changed, 16 insertions(+), 24 deletions(-)
14878 commit bb2d088cb1c9c1341dc70c4b779bc6ccb57f10e2
14879 Author: Robert Bragg <robert@linux.intel.com>
14880 Date: Thu May 20 14:54:44 2010 +0100
14882 math: Adds an experimental cogl_vector3_* API
14884 This adds a math utility API for handling 3 component, single precision
14885 float vectors with the following; mostly self explanatory functions:
14888 cogl_vector3_init_zero
14890 cogl_vector3_equal_with_epsilon
14893 cogl_vector3_invert
14895 cogl_vector3_subtract
14896 cogl_vector3_multiply_scalar
14897 cogl_vector3_divide_scalar
14898 cogl_vector3_normalize
14899 cogl_vector3_magnitude
14900 cogl_vector3_cross_product
14901 cogl_vector3_dot_product
14902 cogl_vector3_distance
14904 Since the API is experimental you will need to define
14905 COGL_ENABLE_EXPERIMENTAL_API before including cogl.h if you want to use
14908 clutter/cogl/cogl/Makefile.am | 2 +
14909 clutter/cogl/cogl/cogl-vector.c | 284 ++++++++++++++++++++++++++
14910 clutter/cogl/cogl/cogl-vector.h | 367 ++++++++++++++++++++++++++++++++++
14911 clutter/cogl/cogl/cogl.h | 2 +
14912 doc/reference/cogl/cogl-docs.xml.in | 1 +
14913 doc/reference/cogl/cogl-sections.txt | 20 ++
14914 6 files changed, 676 insertions(+)
14916 commit 1dc8c0ff05f683ae6522e27965571742fc1a4dbf
14917 Author: Øyvind Kolås <pippin@linux.intel.com>
14918 Date: Thu May 20 16:13:46 2010 +0100
14920 state-machine: made clutter_state_change take a boolean animate argument
14922 Most of the time this will be TRUE, pass FALSE to change to the target
14925 clutter/clutter-state.c | 102 +++----------------------------
14926 clutter/clutter-state.h | 8 +--
14927 tests/interactive/test-state-animator.c | 6 +-
14928 tests/interactive/test-state.c | 10 +--
14929 4 files changed, 19 insertions(+), 107 deletions(-)
14931 commit 54bd5412706733e9af576ed3998d87cb138846e7
14932 Author: Øyvind Kolås <pippin@linux.intel.com>
14933 Date: Thu May 20 15:41:29 2010 +0100
14935 state-machine: use clutter_timeline_get_progress
14937 clutter/clutter-state.c | 2 +-
14938 1 file changed, 1 insertion(+), 1 deletion(-)
14940 commit 8761b279a715167fc87194c14efe00f10bba2bf9
14941 Author: Øyvind Kolås <pippin@linux.intel.com>
14942 Date: Wed May 12 17:03:25 2010 +0100
14944 state-machine: add completed signal
14946 Added a completed signal to the animator
14948 clutter/clutter-state.c | 54 ++++++++++++++++++++++++++++++++++++----
14949 clutter/clutter-state.h | 6 ++++-
14950 tests/interactive/test-state.c | 7 ++++++
14951 3 files changed, 61 insertions(+), 6 deletions(-)
14953 commit fcdc3a8989dee335bec5788c5fbe785e41acd70b
14954 Author: Øyvind Kolås <pippin@linux.intel.com>
14955 Date: Tue May 11 15:04:34 2010 +0100
14957 state machine: added state machine
14959 clutter/Makefile.am | 2 +
14960 clutter/clutter-state.c | 1310 +++++++++++++++++++++++++++++++
14961 clutter/clutter-state.h | 156 ++++
14962 clutter/clutter.h | 1 +
14963 tests/interactive/Makefile.am | 2 +
14964 tests/interactive/test-state-animator.c | 134 ++++
14965 tests/interactive/test-state.c | 97 +++
14966 7 files changed, 1702 insertions(+)
14968 commit 78325a34db372ddcd0c60197645d208108265119
14969 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14970 Date: Thu May 20 16:19:25 2010 +0100
14972 cookbook: Add a recipe for CairoTexture
14974 The Clutter cookbook has a chapter for textures. It would be useful to
14975 provide a recipe on simple uses of ClutterCairoTexture as part of that.
14977 Some suggested content is attached.
14979 doc/cookbook/clutter-cookbook.xml.in | 151 +++++++++++++++++++++++++++++++++-
14980 1 file changed, 147 insertions(+), 4 deletions(-)
14982 commit 5b2311aed736ac90865f16466d273bf8f9d01a70
14983 Author: Neil Roberts <neil@linux.intel.com>
14984 Date: Thu May 20 12:37:56 2010 +0100
14986 cogl-texture-2d: Optimise _cogl_texture_2d_is_pot
14988 This takes the simple algorithm from here:
14990 http://graphics.stanford.edu/~seander/bithacks.html#DetermineIfPowerOf2
14992 This avoids a loop and is much faster.
14994 clutter/cogl/cogl/cogl-texture-2d.c | 15 +--------------
14995 1 file changed, 1 insertion(+), 14 deletions(-)
14997 commit 65678006a8763361d2b9b00b12a0deee90c1d580
14998 Author: Emmanuele Bassi <ebassi@linux.intel.com>
14999 Date: Thu May 20 12:03:47 2010 +0100
15001 Add the Cogl API reference to the fixxref extra directories
15003 doc/reference/clutter/Makefile.am | 3 ++-
15004 1 file changed, 2 insertions(+), 1 deletion(-)
15006 commit cc4729d42f9e67d826c4af41b8ac8c50197dcb97
15007 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15008 Date: Thu May 20 12:03:10 2010 +0100
15010 Document the internal MetaGroup class
15012 Just because it's an internal class, ClutterMetaGroup should not be left
15015 clutter/clutter-actor-meta.c | 45 ++++++++++++++++++++++++++++++++++++++++++
15016 1 file changed, 45 insertions(+)
15018 commit 1b0be8e3b98ea9c76155eabe27096f2a559eed5c
15019 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15020 Date: Thu May 20 12:02:13 2010 +0100
15022 Remove the construct-only flag from ActorMeta:name
15024 The ClutterActorMeta:name property should be read-write, and be
15025 writeable at any time.
15027 clutter/clutter-actor-meta.c | 12 +-----------
15028 1 file changed, 1 insertion(+), 11 deletions(-)
15030 commit c75a6b1a1d63f5b68a878f1a8724586ad56fd3dd
15031 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15032 Date: Thu May 20 11:45:54 2010 +0100
15034 doc: Remove gtk-doc annotations from the json-glib copy
15036 There's no need to use gtk-doc annotations: the API is internal to
15039 clutter/json/json-array.c | 52 +++++++++++++++++++-------------------
15040 clutter/json/json-generator.c | 18 ++++++-------
15041 clutter/json/json-node.c | 56 ++++++++++++++++++++---------------------
15042 clutter/json/json-object.c | 56 ++++++++++++++++++++---------------------
15043 clutter/json/json-parser.c | 32 +++++++++++------------
15044 5 files changed, 107 insertions(+), 107 deletions(-)
15046 commit 80a8568e0e72db27776f9bdd22cf331ffcd2ba74
15047 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15048 Date: Thu May 20 11:45:25 2010 +0100
15050 doc: Fix parameter documentation
15052 clutter/clutter-actor.c | 2 +-
15053 1 file changed, 1 insertion(+), 1 deletion(-)
15055 commit 7ce26939447327f8d87be5015ddec48b70c5c442
15056 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15057 Date: Thu May 20 11:19:51 2010 +0100
15059 Add named modifiers for Action and Constraint
15061 The ClutterActor API should have modifier methods for adding, removing
15062 and retrieving Actions and Constraints using the ClutterActorMeta:name
15063 property - mostly, for convenience.
15065 clutter/clutter-action.h | 19 ++-
15066 clutter/clutter-actor.c | 182 ++++++++++++++++++++++++++++
15067 clutter/clutter-constraint.h | 19 ++-
15068 doc/reference/clutter/clutter-sections.txt | 6 +
15069 tests/interactive/test-constraints.c | 12 +-
15070 5 files changed, 218 insertions(+), 20 deletions(-)
15072 commit 4dc91339c308395997aee5330a2630c57fa8037c
15073 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15074 Date: Wed May 19 18:23:29 2010 +0100
15076 Remove a redundant animation
15078 tests/interactive/test-constraints.c | 4 ----
15079 1 file changed, 4 deletions(-)
15081 commit 86a773536f9b31db1ac4cd6c74a4e4f790041d8f
15082 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15083 Date: Wed May 19 18:20:27 2010 +0100
15085 Set the stage resizable in test-constraints
15087 To demonstrate that constraints can be used to reposition actors in a
15088 resizable stage, set the :user-resizable property to TRUE, and spend the
15089 next 15 minutes playing with the stage size.
15091 tests/interactive/test-constraints.c | 1 +
15092 1 file changed, 1 insertion(+)
15094 commit 5d1b18669b94afc68389bd75771f21cedd4e0d88
15095 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15096 Date: Wed May 19 18:17:49 2010 +0100
15098 Use a 9 grid for the constraints test
15100 Let's complicate the interactive constraints test a little bit by adding
15101 more actors and animating two constraints at a time.
15103 tests/interactive/test-constraints.c | 156 ++++++++++++++++++++++------------
15104 1 file changed, 102 insertions(+), 54 deletions(-)
15106 commit 6457f66976c68abf1b131841356cebbfa7dad655
15107 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15108 Date: Wed May 19 16:10:05 2010 +0100
15110 Miscellaneous documentation fixes
15112 clutter/clutter-action.c | 2 +-
15113 clutter/clutter-actor-meta.c | 2 +-
15114 clutter/clutter-align-constraint.c | 2 +-
15115 clutter/clutter-animatable.c | 35 +++++++
15116 clutter/clutter-animatable.h | 13 ++-
15117 clutter/clutter-animation.c | 6 +-
15118 clutter/clutter-animator.c | 2 +-
15119 clutter/clutter-bind-constraint.c | 2 +-
15120 clutter/clutter-box-layout.c | 2 +-
15121 clutter/clutter-constraint.c | 12 +++
15122 clutter/clutter-constraint.h | 13 +--
15123 clutter/clutter-drag-action.c | 2 +-
15124 clutter/clutter-event.h | 2 +-
15125 clutter/clutter-media.h | 1 +
15126 clutter/clutter-stage-manager.h | 4 -
15127 configure.ac | 6 +-
15128 doc/reference/clutter/Makefile.am | 1 +
15129 doc/reference/clutter/clutter-docs.xml.in | 11 +++
15130 doc/reference/clutter/clutter-sections.txt | 139 +++++++++++++++++++++++++++-
15131 doc/reference/clutter/clutter.types | 6 ++
15132 20 files changed, 232 insertions(+), 31 deletions(-)
15134 commit ee7ebe096e3b7c0b0ce5dbadedc7674bb480266e
15135 Author: Robert Bragg <robert@linux.intel.com>
15136 Date: Tue Oct 13 15:27:06 2009 +0100
15138 Stubs out _cogl_xlib_handle_event
15140 This stubs out an xlib event handling mechanism for Cogl. The intention
15141 is for Clutter to use this to forward all x11 events to Cogl. As we move
15142 winsys functionality down into Cogl, Cogl will become responsible for
15143 handling a number of X events: ConfigureNotify events for onscreen
15144 framebuffers, swap events and Damage events for cogl_x11_texture_pixmap.
15146 clutter/cogl/cogl/Makefile.am | 6 ++--
15147 clutter/cogl/cogl/cogl-internal.h | 39 ++++++++++++++++++++++++
15148 clutter/cogl/cogl/winsys/cogl-xlib.c | 54 ++++++++++++++++++++++++++++++++++
15149 3 files changed, 97 insertions(+), 2 deletions(-)
15151 commit 52acc71161532126d6c67923befadb18c1836932
15152 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15153 Date: Wed May 19 15:09:47 2010 +0100
15155 docs: Document animating action and constraint properties
15157 Add a refsect for the syntax to be used when animating action and
15158 constraint properties with ClutterAnimation.
15160 clutter/clutter-actor.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++
15161 1 file changed, 59 insertions(+)
15163 commit f2f2e9b7e63fc4087a80a6dfec4a9df7d2f79215
15164 Author: Robert Bragg <robert@linux.intel.com>
15165 Date: Thu Oct 8 12:08:21 2009 +0100
15167 build: expose automake conditionals for cogl winsys
15169 Expose the ./configured window system/backend options to the Cogl
15170 automake files via some new SUPPORT_XYZ conditionals.
15172 clutter/Makefile.am | 4 ++--
15173 clutter/cogl/cogl/Makefile.am | 38 +++++++++++++++++++++++++-------------
15174 configure.ac | 16 +++++++++++++++-
15175 3 files changed, 42 insertions(+), 16 deletions(-)
15177 commit a29d1b799aa09ea7a9b85ceabe76fc511df50618
15178 Author: Robert Bragg <robert@linux.intel.com>
15179 Date: Tue Oct 13 15:27:06 2009 +0100
15181 configure.ac: Adds some COGL_HAS_XYZ_SUPPORT defines
15183 This exposes the ./configured window system/backend options to Cogl via
15184 a set of new COGL_HAS_XYZ_SUPPORT defines:
15186 COGL_HAS_{X11,XLIB,GLX,EGL,EGL_PLATFORM_XYZ,OSX,WIN32,WGL}_SUPPORT
15188 configure.ac | 17 +++++++++++++++++
15189 1 file changed, 17 insertions(+)
15191 commit 9f7e4b2b6412c1733200f50eedaf67b53c19ec54
15192 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15193 Date: Wed May 19 14:46:02 2010 +0100
15195 docs: Document BindConstraint and AlignConstraint
15197 Add the missing gtk-doc annotations for BindConstraint and
15198 AlignConstraint, plus the licensing blurb.
15200 clutter/clutter-align-constraint.c | 78 +++++++++++++++++++++++++++++++++++-
15201 clutter/clutter-align-constraint.h | 42 +++++++++++++++++++
15202 clutter/clutter-bind-constraint.h | 18 +++++++++
15203 3 files changed, 137 insertions(+), 1 deletion(-)
15205 commit e9b93d5676237e94975fb22824827a8f7153da4d
15206 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15207 Date: Wed May 19 14:34:18 2010 +0100
15209 constraint: Rename BindConstraint:bind-axis
15211 We're not binding an axis: we're really binding a coordinate of an actor
15212 to the coordinate of another one.
15214 clutter/clutter-bind-constraint.c | 126 ++++++++++++++++++++++++++--------
15215 clutter/clutter-bind-constraint.h | 38 ++++++++--
15216 tests/interactive/test-constraints.c | 16 +++--
15217 3 files changed, 140 insertions(+), 40 deletions(-)
15219 commit f857457b9d01cbbc5b59609e28b2e6a3fd0c3636
15220 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15221 Date: Wed May 19 13:02:43 2010 +0100
15223 constraints: Add AlignConstraint
15225 AlignConstraint is a simple constraint that keeps an actor's position
15226 aligned to the width or height of another actor, multiplied by an
15229 clutter/Makefile.am | 2 +
15230 clutter/clutter-align-constraint.c | 259 ++++++++++++++++++++++++++++++++++
15231 clutter/clutter-align-constraint.h | 31 ++++
15232 clutter/clutter.h | 1 +
15233 tests/interactive/test-constraints.c | 12 --
15234 5 files changed, 293 insertions(+), 12 deletions(-)
15236 commit 56e8e7d62f782266d510ff52269507a9d7796b93
15237 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15238 Date: Wed May 19 12:27:09 2010 +0100
15240 tests: Add a constraints interactive test
15242 Show how to use constraints and how to animate them.
15245 tests/interactive/Makefile.am | 3 +-
15246 tests/interactive/test-constraints.c | 138 ++++++++++++++++++++++++++++++++++
15247 3 files changed, 141 insertions(+), 1 deletion(-)
15249 commit 769e964424f4de41b7e875b8a08a2bd17fdd2f70
15250 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15251 Date: Wed May 19 12:25:28 2010 +0100
15253 constraint: Add BindConstraint
15255 The BindConstraint object is a constraint that binds the current
15256 position of an actor on a given axis to the actor that has the
15257 constraint applied.
15259 clutter/Makefile.am | 2 +
15260 clutter/clutter-bind-constraint.c | 267 +++++++++++++++++++++++++++++++++++++
15261 clutter/clutter-bind-constraint.h | 32 +++++
15262 clutter/clutter.h | 1 +
15263 4 files changed, 302 insertions(+)
15265 commit 29257af30c08eeb06089aebb460baacbfd78a052
15266 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15267 Date: Wed May 19 12:23:57 2010 +0100
15269 actor: Implement Animatable
15271 By implementing the newly added support for custom animatable
15272 properties, we can allow addressing action and constraint properties
15273 from ClutterAnimation and clutter_actor_animate().
15275 clutter/clutter-actor.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++-
15276 1 file changed, 159 insertions(+), 3 deletions(-)
15278 commit d9a05ac94b453ec2a4e6313aa587d2194e46cfb1
15279 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15280 Date: Wed May 19 12:22:48 2010 +0100
15282 animation: Use the new Animatable API for custom properties
15284 The Animation class should use the Animatable API for custom properties
15285 to override finding a property definition, getting the initial state and
15286 setting the final state of an object.
15288 clutter/clutter-animation.c | 154 ++++++++++++++++++++++++++++++++++---------
15289 1 file changed, 122 insertions(+), 32 deletions(-)
15291 commit 3a1162cbcffd4147f3022b3241101e3269a54169
15292 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15293 Date: Wed May 19 12:21:54 2010 +0100
15295 animatable: Add custom properties to Animatable
15297 Like ClutterScriptable, it would be good to have the Animatable
15298 interface allow defining custom properties that can be animated.
15300 clutter/clutter-animatable.c | 63 ++++++++++++++++++++++++++++++++++++++++++
15301 clutter/clutter-animatable.h | 51 ++++++++++++++++++++++++----------
15302 2 files changed, 100 insertions(+), 14 deletions(-)
15304 commit b842f0ad8edacae353facf33b9ad3d43b02a60af
15305 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15306 Date: Fri May 14 12:13:49 2010 +0100
15308 constraint: Add ClutterConstraint base class
15310 The Constraint base, abstract class should be used to implement Actor
15311 modifiers that affect the way an actor is sized or positioned inside a
15312 fixed layout manager.
15314 clutter/Makefile.am | 2 +
15315 clutter/clutter-actor.c | 138 +++++++++++++++++++++++++++++++++++++++++-
15316 clutter/clutter-constraint.c | 21 +++++++
15317 clutter/clutter-constraint.h | 100 ++++++++++++++++++++++++++++++
15318 clutter/clutter-types.h | 5 +-
15319 clutter/clutter.h | 1 +
15320 6 files changed, 264 insertions(+), 3 deletions(-)
15322 commit b0cc98fdceb7f2ba8bc377c085216cabc6232980
15323 Author: Brian Tarricone <brian@kakai.com>
15324 Date: Thu Mar 25 20:55:31 2010 -0700
15326 eglx: implement cogl_get_proc_address()
15328 http://bugzilla.openedhand.com/show_bug.cgi?id=2124
15330 clutter/cogl/cogl/winsys/cogl-eglx.c | 4 +++-
15331 1 file changed, 3 insertions(+), 1 deletion(-)
15333 commit 36903dfdcc0c549972a95056b6d7e417d207ca24
15334 Author: Neil Roberts <neil@linux.intel.com>
15335 Date: Tue May 18 17:25:25 2010 +0100
15337 eglx: Rename EGLNative{Window,Display}Type back to Native{Window,Display}Type
15339 Commit e2a990d renamed these types to new names from EGL 1.3. However
15340 it still works to use the old names under EGL 1.3 so let's just use
15341 those to keep compatibility.
15343 clutter/eglx/clutter-backend-egl.c | 4 ++--
15344 clutter/eglx/clutter-stage-egl.c | 2 +-
15345 2 files changed, 3 insertions(+), 3 deletions(-)
15347 commit 4b239e1fe89d6f9c20c930f1cad4bdfcca88aa32
15348 Author: Neil Roberts <neil@linux.intel.com>
15349 Date: Tue May 18 17:08:12 2010 +0100
15351 clutter-backend-egl: Chain up in dispose before destroying the context
15353 clutter_backend_egl_dispose now chains up before disposing its own
15354 resources so that ClutterBackendX11 will destroy all of the stages
15355 before we destroy the egl context. Otherwise the actors may try to
15356 make GL calls during destruction which causes a crash.
15358 clutter/eglx/clutter-backend-egl.c | 8 ++++++--
15359 1 file changed, 6 insertions(+), 2 deletions(-)
15361 commit 6c3d1cfab9d21cd638854e0900d8bc17c4ebce9e
15362 Author: Neil Roberts <neil@linux.intel.com>
15363 Date: Tue May 18 16:51:46 2010 +0100
15365 clutter-stage-egl.c: Don't call eglWait*()
15367 According to the docs, eglSwapBuffers performs an implicit glFlush
15368 before swapping so there should be no need to wait.
15370 clutter/eglx/clutter-stage-egl.c | 2 --
15371 1 file changed, 2 deletions(-)
15373 commit 871683abd3699716e04f54b8f4e0693599b19907
15374 Author: Neil Roberts <neil@linux.intel.com>
15375 Date: Tue May 18 15:52:05 2010 +0100
15377 test-cogl-materials: Fix compilation under GLES 2
15379 GLES 2 doesn't have GL_MAX_TEXTURE_UNITS. Instead the cogl backend
15380 uses GL_MAX_TEXTURE_IMAGE_UNITS with a maximum limit of 16. The same
15381 restriction is now used in the test.
15383 tests/conform/test-cogl-materials.c | 10 ++++++++++
15384 1 file changed, 10 insertions(+)
15386 commit c4ae1a55fa88cb01839b939220f7d1bd8a251ace
15387 Author: Brian Tarricone <brian@kakai.com>
15388 Date: Thu Mar 25 19:44:37 2010 -0700
15390 fix case when EGL driver doesn't support EGL_NATIVE_VISUAL_ID
15392 Some EGL drivers, such as the PowerVR simulator (and some proprietary drivers)
15393 return zero when the EGLConfig is queried for the EGL_NATIVE_VISUAL_ID
15394 attribute via eglGetConfigAttrib().
15396 This patch detects and attempts to work around that situation by picking a
15397 visual with the same color depth.
15399 http://bugzilla.openedhand.com/show_bug.cgi?id=2123
15401 clutter/eglx/clutter-backend-egl.c | 37 +++++++++++++++++++++++++++++-------
15402 1 file changed, 30 insertions(+), 7 deletions(-)
15404 commit 26b061c3a80a81ec1fb19f61770ad4f6c3df40c1
15405 Author: Neil Roberts <neil@linux.intel.com>
15406 Date: Wed May 5 17:30:00 2010 +0100
15408 clutter-backend-egl: Create a dummy X window and EGL surface
15410 After the EGL context is created it now also creates an invisible 1x1
15411 window and a corresponding surface so that the context can be
15412 immediately made current. This is similar to changes for the GLX
15413 backend introduced in d2c091e62.
15415 http://bugzilla.openedhand.com/show_bug.cgi?id=2056
15417 clutter/eglx/clutter-backend-egl.c | 80 ++++++++++++++++++++++++++++++++++--
15418 clutter/eglx/clutter-backend-egl.h | 2 +
15419 2 files changed, 78 insertions(+), 4 deletions(-)
15421 commit e2a990dfd54761d147aec8b751ca6f5c29233652
15422 Author: Brian Tarricone <brian@kakai.com>
15423 Date: Thu Mar 25 19:37:26 2010 -0700
15425 update backend to use lazy context/stage creation
15427 http://bugzilla.openedhand.com/show_bug.cgi?id=2056
15429 clutter/eglx/clutter-backend-egl.c | 171 ++++++++++++++++------
15430 clutter/eglx/clutter-backend-egl.h | 3 +-
15431 clutter/eglx/clutter-stage-egl.c | 278 ++++++++++++------------------------
15432 clutter/eglx/clutter-stage-egl.h | 3 +
15433 4 files changed, 229 insertions(+), 226 deletions(-)
15435 commit 07880d8b7426c84ace18cb1dceda6998cfc84f99
15436 Author: Neil Roberts <neil@linux.intel.com>
15437 Date: Tue May 18 13:55:18 2010 +0100
15439 configure: Check the result of AM_PATH_GLIB_2_0
15441 The AM_PATH_GLIB_2_0 doesn't automatically cause the configure script
15442 to fail if the test fails. This wouldn't usually cause any problems
15443 because we later check for the right glib version using
15444 PKG_CHECK_MODULES directly. However AM_PATH_GLIB_2_0 is more thorough
15445 when checking because it also tries to run a program against the
15446 library to read the version. If the macro fails but the pkg-config
15447 check passes then nothing will define GLIB_GENMARSHAL and the build
15448 step will fail in a confusing way.
15450 This adds a check for the result and gives an AC_MSG_ERROR if it
15451 fails. The glib dependencies have been moved out of CLUTTER_DEPS to
15454 http://bugzilla.openedhand.com/show_bug.cgi?id=2127
15456 configure.ac | 10 ++++++----
15457 1 file changed, 6 insertions(+), 4 deletions(-)
15459 commit 354d003860ff28322f01f736555d16079420235b
15460 Author: Øyvind Kolås <pippin@linux.intel.com>
15461 Date: Mon May 17 18:05:19 2010 +0100
15463 animator: fix issue of dropped frames towards end of animations
15465 clutter/clutter-animator.c | 9 ++++++---
15466 1 file changed, 6 insertions(+), 3 deletions(-)
15468 commit c007b7489b240af4fc7b3c24cdf62252757c6aa7
15469 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15470 Date: Mon May 17 14:34:31 2010 +0100
15472 action: Warn if set_name() is called multiple times
15474 clutter/clutter-actor-meta.c | 9 +++++++++
15475 1 file changed, 9 insertions(+)
15477 commit 4fd74e71e640b0762f883a7f7c2f996c54379fee
15478 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15479 Date: Wed May 12 12:00:33 2010 +0100
15481 action: Add DragAction, an action implementing drag capabilities
15483 DragAction is an Action sub-class that provides dragging capabilities to
15484 any actor. DragAction has:
15486 • drag-begin, drag-motion and drag-end signals, relaying the event
15487 information like coordinates, button and modifiers to user code;
15489 • drag-threshold property, for delaying the drag start by a given
15492 • drag-handle property, to allow using other actors as the drag
15495 • drag-axis property, to allow constraining the dragging to a specific
15498 An interactive test demonstrating the various features is also provided.
15501 clutter/Makefile.am | 2 +
15502 clutter/clutter-drag-action.c | 813 +++++++++++++++++++++++++++++++++++++++++
15503 clutter/clutter-drag-action.h | 148 ++++++++
15504 clutter/clutter-marshal.list | 2 +
15505 clutter/clutter.h | 1 +
15506 tests/interactive/Makefile.am | 3 +-
15507 tests/interactive/test-drag.c | 189 ++++++++++
15508 8 files changed, 1158 insertions(+), 1 deletion(-)
15510 commit 0e0db0d6242f84c8fb44ba57ec46d6dff5f265b3
15511 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15512 Date: Tue May 11 17:09:13 2010 +0100
15514 action: Add ClutterAction
15516 ClutterAction is an abstract class that should be used as the ancestor
15517 for objects that change how an actor behaves when dealing with events
15518 coming from user input.
15520 clutter/Makefile.am | 2 +
15521 clutter/clutter-action.c | 61 ++++++++++++++++++
15522 clutter/clutter-action.h | 94 +++++++++++++++++++++++++++
15523 clutter/clutter-actor.c | 160 ++++++++++++++++++++++++++++++++++++++++++++--
15524 clutter/clutter-types.h | 1 +
15525 clutter/clutter.h | 1 +
15526 6 files changed, 312 insertions(+), 7 deletions(-)
15528 commit c075d26fb2abcd53821c816fe1feb20e0578cce1
15529 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15530 Date: Fri May 14 16:42:50 2010 +0100
15532 actor: Add ActorMeta, a base class for actor modifiers
15534 ClutterActorMeta is a base, abstract class that can be used to derive
15535 classes that are attached to a ClutterActor instance in order to modify
15536 the way an actor is painted, sized/positioned or responds to events.
15538 A typed container for ActorMeta instances is also provided to the
15539 sub-classes can be attached to an Actor.
15541 clutter/Makefile.am | 3 +
15542 clutter/clutter-actor-meta-private.h | 42 ++++
15543 clutter/clutter-actor-meta.c | 413 ++++++++++++++++++++++++++++++++++
15544 clutter/clutter-actor-meta.h | 84 +++++++
15545 clutter/clutter-types.h | 4 +
15546 clutter/clutter.h | 1 +
15547 6 files changed, 547 insertions(+)
15549 commit 7caa10160dce6b7d8001421331133c4a00dfde52
15550 Author: Neil Roberts <neil@linux.intel.com>
15551 Date: Wed May 12 18:57:52 2010 +0100
15553 cogl-material: Set the blend equation even if blend funcs are the same
15555 Previously it would only try to set the blend equation if the RGB and
15556 alpha blending functions were different. However it's completely valid
15557 to use a non-standard blending function when the functions are the
15558 same. This patch moves the blending equation to outside the if
15561 clutter/cogl/cogl/cogl-material.c | 28 +++++++++++++---------------
15562 1 file changed, 13 insertions(+), 15 deletions(-)
15564 commit dd9e7853ece631be48ac85e3a984bfb93a127b43
15565 Author: Neil Roberts <neil@linux.intel.com>
15566 Date: Wed May 12 15:19:09 2010 +0100
15568 cogl-material: Set blend constant even if alpha and rgb factors are the same
15570 Previously it would only set the blend constant if glBlendFuncSeparate
15571 was used but it is perfectly acceptable to use the blend constant when
15572 the same factor is used for each. It now sets the blend constant
15573 whenever one of the factors would use the constant.
15575 clutter/cogl/cogl/cogl-material.c | 26 ++++++++++++++++++++++----
15576 1 file changed, 22 insertions(+), 4 deletions(-)
15578 commit 502446ed8dc56ab9dccacbdd68f54306fe4d3558
15579 Author: Neil Roberts <neil@linux.intel.com>
15580 Date: Wed May 12 17:56:25 2010 +0100
15582 cogl-blend-string: Don't split combined blend statements into two
15584 When a single statement is used to specify the factors for both the
15585 RGB and alpha parts it previously split up the statement into
15586 two. This works but it ends up unnecessarily using glBlendFuncSeparate
15587 when glBlendFunc would suffice.
15589 For example, the blend statement
15591 RGBA = ADD(SRC_COLOR*(SRC_COLOR), DST_COLOR*(1-SRC_COLOR))
15593 would get split into the two statements
15595 RGBA = ADD(SRC_COLOR*(SRC_COLOR[RGB]), DST_COLOR*(1-SRC_COLOR[RGB]))
15596 A = ADD(SRC_COLOR*(SRC_COLOR[A]), DST_COLOR*(1-SRC_COLOR[A]))
15598 That translates to:
15600 glBlendFuncSeparate (GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR,
15601 GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
15603 This patch makes it so that arg_to_gl_blend_factor can handle the
15604 combined RGBA mask instead. That way the single statement gets
15605 translated to the equivalent call:
15607 glBlendFunc (GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR);
15609 clutter/cogl/cogl/cogl-material.c | 16 +++++-----------
15610 1 file changed, 5 insertions(+), 11 deletions(-)
15612 commit 47d54930164f3c3478ccba66a01aadd0e72802d0
15613 Author: Chris Lord <chris@linux.intel.com>
15614 Date: Thu May 13 15:51:42 2010 +0100
15616 text: Fix typos that were causing false-positive cache hits
15618 If a cached layout didn't actually match the layout we're looking for,
15619 it would be returned anyway. Remove this return so that it can correctly
15620 continue looking and get a cache miss if appropriate.
15622 http://bugzilla.openedhand.com/show_bug.cgi?id=2109
15624 clutter/clutter-text.c | 4 +---
15625 1 file changed, 1 insertion(+), 3 deletions(-)
15627 commit acea83d7ae088ef3d0422de7cd1d01836c5ef8f4
15628 Author: Neil Roberts <neil@linux.intel.com>
15629 Date: Thu Apr 22 11:58:52 2010 +0100
15631 cogl-path: Use true copy-on-write semantics
15633 Previously a path copy was implemented such that only the array of
15634 path nodes was shared with the source and the rest of the data is
15635 copied. This was so that the copy could avoid a deep copy if the
15636 source path is appended to because the copy keeps track of its own
15637 length. This optimisation is probably not worthwhile because it makes
15638 the copies less cheap. Instead the CoglPath struct now just contains a
15639 single pointer to a new CoglPathData struct which is separately
15640 ref-counted. When the path is modified it will be copied if the ref
15641 count on the data is not 1.
15643 clutter/cogl/cogl/cogl-path-private.h | 20 ++-
15644 clutter/cogl/cogl/cogl-path.c | 249 ++++++++++++++++-----------------
15645 2 files changed, 125 insertions(+), 144 deletions(-)
15647 commit a12a2e591b0ce00b918578abfce832490a8c1d6d
15648 Author: Neil Roberts <neil@linux.intel.com>
15649 Date: Mon May 10 17:43:17 2010 +0100
15651 Add a conformance test for ClutterCairoTexture
15653 This adds a simple test for ClutterCairoTexture that draws two
15654 rectangles to the cairo surface in an idle callback and then verifies
15655 that they appeared at the right colours in the paint callback. If that
15656 succeeds then the second time the idle callback is invoked it will
15657 replace one of the rectangles with a sub region update and the
15658 following paint callback will again verify the rectangles.
15661 tests/conform/Makefile.am | 1 +
15662 tests/conform/test-clutter-cairo-texture.c | 196 ++++++++++++++++++++++++++++
15663 tests/conform/test-conform-main.c | 1 +
15664 4 files changed, 199 insertions(+)
15666 commit 4ef041371ce4ebedfe73e014aecb1f33d22aa8df
15667 Author: Owen W. Taylor <otaylor@fishsoup.net>
15668 Date: Sat May 8 13:38:37 2010 -0400
15670 text: correct caching logic
15672 This patch combines a number of fixes and improvements to the
15673 layout caching logic in ClutterText.
15675 * Fix: The width must always be set on the PangoLayout when painting.
15676 This is necessary because the layout aligns in the width, and
15677 even when we think we are left-aligned, the auto-dir feature
15678 of PangoLayout may result in right-alignment.
15680 * Fix: We should only ever try to reuse a cached layout based
15681 on its logical width if layout.width was -1 when computing
15682 that logical width. If the layout was already ellipsized,
15683 then comparing the logical width to the new width we are
15684 trying to wrap to doesn't make sense. (If "abc" ellipsizes
15685 to a 15-pixel wide "..." for a width of 1 pixel, that doesn't
15686 mean that we should use "..." for a width of 15 pixels. Maybe
15687 "abc" itself is 15 pixels wide.)
15689 * Improvement: rather than looking up cached layouts based on the
15690 input allocation_width/allocation_height, look them up based
15691 on the actual width/height/ellipsize that we pass to create
15692 a layout. This is simpler and improves the chance we'll get
15693 a cache hit when appropriate even if there are small floating
15696 Note because of the first fix this is less aggressive than dd40732
15697 in caching layouts; get_preferred_width() and painting can't share
15698 a layout since get_preferred_width() needs to pass a width of -1
15699 to Pango and painting needs to pass the real width.
15701 The patch has been updated from the clutter-1.2 branch to current
15702 master; using the profiling instrumentation it is possible to verify
15703 with test-text-field that the hit/miss counters go from:
15705 Name Total Per Frame
15706 ---- ----- ---------
15707 Text layout cache hit counter 13 6
15708 Text layout cache miss counter 11 5
15710 before applying the patch, to:
15712 Name Total Per Frame
15713 ---- ----- ---------
15714 Text layout cache miss counter 4 2
15715 Text layout cache hit counter 3 1
15717 after applying the patch.
15719 https://bugzilla.gnome.org/show_bug.cgi?id=618104
15721 http://bugzilla.openedhand.com/show_bug.cgi?id=2109
15723 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
15725 clutter/clutter-text.c | 289 +++++++++++++++++++++++-------------------------
15726 1 file changed, 139 insertions(+), 150 deletions(-)
15728 commit 16680c74f36d64b3fb9e1e3f3985c7e757dafdf3
15729 Author: Neil Roberts <neil@linux.intel.com>
15730 Date: Mon May 10 15:33:05 2010 +0100
15732 Revert "clutter-cairo-texture: Use the new cogl_pixel_buffer API"
15734 This reverts commit 716ec82db8bec57e35d51e8dee5468435fc9e59e.
15736 The Cogl pixel buffer API currently has problems if an atlas texture
15737 is created or the format needs to be converted. The atlas problem
15738 doesn't currently show because the atlas rejects BGR textures anyway
15739 but we may want to change this soon. The problem with format
15740 conversion would happen under GLES because that does not support BGR
15741 textures at all so Cogl has to do the conversion. However it doesn't
15742 currently show either because GLES has no support for buffer objects
15745 It's also questionable whether the patch would give any performance
15746 benefit because Cairo needs read/write access which implies the buffer
15747 can't be put in write-optimised memory.
15751 clutter/clutter-cairo-texture.c
15753 http://bugzilla.openedhand.com/show_bug.cgi?id=1982
15755 clutter/clutter-cairo-texture.c | 204 +++++++++++++++++++++++++--------------
15756 1 file changed, 131 insertions(+), 73 deletions(-)
15758 commit af37a1029ff86d082b55cebef6f59d227ab22da8
15759 Author: Owen W. Taylor <otaylor@fishsoup.net>
15760 Date: Sat May 8 16:58:14 2010 -0400
15762 cogl-framebuffer: Flush journal when creating fbo
15764 Since framebuffer state is not flushed prior to replaying the journal,
15765 the trick of marking the framebuffer dirty prior to calling
15766 glBindFramebuffer() doesn't work... the outstanding journal entries
15767 will get replayed to the newly created framebuffer.
15769 Fix this by flushing the journal as well.
15771 http://bugzilla.openedhand.com/show_bug.cgi?id=2110
15773 Signed-off-by: Robert Bragg <robert@linux.intel.com>
15775 clutter/cogl/cogl/cogl-framebuffer.c | 7 +++++--
15776 1 file changed, 5 insertions(+), 2 deletions(-)
15778 commit b3de036c97c8b527e1993dd8788bdfa6581888ee
15779 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15780 Date: Mon May 10 14:28:21 2010 +0100
15782 Add tests/conform/wrappers to the ignore file
15785 1 file changed, 1 insertion(+)
15787 commit 4c850d39c59bc1d88f527f99485882fa2399afbf
15788 Author: Emmanuele Bassi <ebassi@linux.intel.com>
15789 Date: Sun May 9 00:13:16 2010 +0100
15791 Fix annotation typos
15793 clutter/clutter-animation.c | 6 +++---
15794 1 file changed, 3 insertions(+), 3 deletions(-)
15796 commit 493041c505adb01876599d4dded62f3f8f8b2d02
15797 Author: Neil Roberts <neil@linux.intel.com>
15798 Date: Fri May 7 18:03:39 2010 +0100
15800 clutter-cairo-texture: Fix destroying the old texture
15802 In clutter_cairo_texture_create_region it tries to destroy the old
15803 texture before mapping the PBO by setting the texture on the first
15804 layer of the material to COGL_INVALID_HANDLE. However it was using the
15805 material API incorrectly so it ended up showing a warning and doing
15808 clutter/clutter-cairo-texture.c | 6 +-----
15809 1 file changed, 1 insertion(+), 5 deletions(-)
15811 commit 6228082e14b11301d63443837ffe744e8b340ab3
15812 Author: Robert Bragg <robert@linux.intel.com>
15813 Date: Thu May 6 14:53:50 2010 +0100
15815 conform: Make gtester run a list of wrappers
15817 Instead of asking gtester to run ./test-conformance directly we now tell
15818 it to run a list of wrapper scripts. This results in each test being
15819 spawned in a separate process avoiding leakage of state between tests
15820 which has been a big problem with the conformance tests for quite a
15823 tests/conform/Makefile.am | 38 ++++++++++++++++++++++++--------------
15824 tests/conform/run-tests.sh | 14 ++++++++++++++
15825 tests/conform/test-launcher.sh | 5 +++--
15826 3 files changed, 41 insertions(+), 16 deletions(-)
15828 commit 0120abe5b071ec38a897d55f00d48cfec71b2877
15829 Author: Neil Roberts <neil@linux.intel.com>
15830 Date: Fri May 7 15:58:26 2010 +0100
15832 test-cogl-multitexture: Set linear filters on the two textures
15834 Otherwise it seems that rounding errors will cause the fragments at
15835 the edge of the quad to blend with neighbouring quarters of the
15836 texture which cause the test to fail.
15838 tests/conform/test-cogl-multitexture.c | 9 +++++++++
15839 1 file changed, 9 insertions(+)
15841 commit 21117bb7a9cc4e0341da990f88b798ad2c8e59a0
15842 Author: Neil Roberts <neil@linux.intel.com>
15843 Date: Thu May 6 14:21:53 2010 +0100
15845 test-conform-common: Disconnect all paint handlers on the stage
15847 A few of the tests connected to the paint signal but never
15848 disconnected it. Most of these handlers had a call to g_main_quit in
15849 them which meant that it could sometimes cause subsequent tests to
15850 exit after the first frame is painted. Most of the tests don't
15851 validate any of the results until after a couple of frames have been
15852 rendered so this ended up skipping out the test entirely.
15854 To workaround this the test setup function now disconnects all
15855 handlers for the paint signal on the default stage before the test is
15858 tests/conform/test-conform-common.c | 21 +++++++++++++++++++++
15859 1 file changed, 21 insertions(+)
15861 commit 61ae7c6df72a802a06da934623aa97d71e562b43
15862 Author: Neil Roberts <neil@linux.intel.com>
15863 Date: Thu May 6 14:18:32 2010 +0100
15865 test-cogl-readpixels: Reset the viewport and matrices
15867 The on_paint function for test-cogl-readpixels tries to temporarily
15868 set the projection, modelview and viewport to its own values. However
15869 it was never restoring the saved values so it could affect the results
15870 of subsequent tests.
15872 tests/conform/test-cogl-readpixels.c | 7 +++++++
15873 1 file changed, 7 insertions(+)
15875 commit b9c7051484f062f958b8e3ddc333e3b0c3509acf
15876 Author: Neil Roberts <neil@linux.intel.com>
15877 Date: Thu May 6 14:16:33 2010 +0100
15879 test-cogl-path: Initialise state.frame
15881 state.frame was left unitialized so it would be left to happenstance
15882 which of the first three frames would be used for validating the test.
15884 tests/conform/test-cogl-path.c | 1 +
15885 1 file changed, 1 insertion(+)
15887 commit 0021b4aee0205057c9522a734dc1205e920d38d8
15888 Author: Neil Roberts <neil@linux.intel.com>
15889 Date: Thu May 6 14:15:04 2010 +0100
15891 cogl-clip-stack: Set *stencil_used_p when the stack is empty
15893 If the clip stack is empty then _cogl_clip_stack_flush exits
15894 immediately. This was missing out the assignment of *stencil_used_p at
15895 the bottom of the function. If a path is then used after the clip is
15896 cleared then it would think it needs to merge with the clip so the
15897 stencil would not be cleared correctly.
15899 clutter/cogl/cogl/cogl-clip-stack.c | 5 ++++-
15900 1 file changed, 4 insertions(+), 1 deletion(-)
15902 commit f4ee7dc0e185e7b5348539513a7fb7705a168849
15903 Author: Neil Roberts <neil@linux.intel.com>
15904 Date: Thu Apr 8 00:20:18 2010 +0100
15906 clutter-color: Don't directly read the contents of GValue structs
15908 The code for implementing ClutterColor as GParamSpec and the
15909 color↔string transformation functions were assuming that ClutterColor
15910 owns the data in the GValue struct and directly reading
15911 data[0].v_pointer to get a pointer to the color. However ClutterColor
15912 is actually a boxed type and the format of the data array is meant to
15913 be internal to GObject so it is not safe to poke around in it
15914 directly. This patch changes it to use g_value_get_boxed to get the
15917 Also, boxed types allow a NULL value to be stored and not all of the
15918 code was coping with this. This patch also attempts to fix that.
15920 http://bugzilla.openedhand.com/show_bug.cgi?id=2068
15922 clutter/clutter-color.c | 50 +++++++++++++++++++++++++++++++++--------------
15923 1 file changed, 35 insertions(+), 15 deletions(-)
15925 commit fa1638c0ab5e825830f987ac9ed8d1adcdff3859
15926 Author: Neil Roberts <neil@linux.intel.com>
15927 Date: Thu Apr 8 00:17:48 2010 +0100
15929 clutter-color: Remove the value table
15931 ClutterColor has long had a GTypeValueTable struct around and the
15932 functions defined to be implemented as a fundamental type. However the
15933 struct was never actually used anywhere and ClutterColor is actually
15934 defined as a boxed type. This patch removes the table because it is
15935 very confusing to have code lying around that is not used.
15937 http://bugzilla.openedhand.com/show_bug.cgi?id=2068
15939 clutter/clutter-color.c | 88 -----------------------------------------------
15940 1 file changed, 88 deletions(-)
15942 commit 452cb1abbfed4adb7e3d802765df9e27775adc4f
15943 Author: Øyvind Kolås <pippin@linux.intel.com>
15944 Date: Wed May 5 18:15:12 2010 +0100
15946 animator: fix looping when doing cubic interpolation
15948 When using interpolation and the last key is not at 1.0 a bouncing
15949 artifact could be observed after the keys.
15951 clutter/clutter-animator.c | 4 ++--
15952 1 file changed, 2 insertions(+), 2 deletions(-)
15954 commit e4089efb4c36abe2c743eefef0c960cb9453ae85
15955 Author: Øyvind Kolås <pippin@linux.intel.com>
15956 Date: Wed May 5 16:55:16 2010 +0100
15958 animator: only keys that are removed due to actors disappearing are inert
15960 clutter/clutter-animator.c | 58 +++++++++++++++++++++++++++++---------------
15961 1 file changed, 38 insertions(+), 20 deletions(-)
15963 commit 0f8ca38e594ac829b246b2107e20f68e29dbe75c
15964 Author: Øyvind Kolås <pippin@linux.intel.com>
15965 Date: Wed May 5 13:48:34 2010 +0100
15967 animator: refactoring
15969 renamed KeyAnimator to PropertyIter
15971 clutter/clutter-animator.c | 167 ++++++++++++++++++++++----------------------
15972 1 file changed, 84 insertions(+), 83 deletions(-)
15974 commit 8afb091f56c8f4c15c587f79bb683cfcdb998f5a
15975 Author: Øyvind Kolås <pippin@linux.intel.com>
15976 Date: Wed May 5 13:58:15 2010 +0100
15978 animator: retain ease-in/interpolation when changing first key
15980 Duplicate the existing ease-in/interpolation mode for the property when
15981 removing, replacing the first key for a property or adding a new first
15982 key for a property.
15984 clutter/clutter-animator.c | 38 +++++++++++++++++++++++++++++++++++++-
15985 1 file changed, 37 insertions(+), 1 deletion(-)
15987 commit d45395d78bf033cb9895092f77bdd81b9802fb2f
15988 Author: Øyvind Kolås <pippin@linux.intel.com>
15989 Date: Wed May 5 13:34:06 2010 +0100
15991 animator: fix crash when setting keys on running animator
15993 When inserting or modifying keys of a running animator the internal
15994 iterators per property could go out of sync. Reinitializing the
15995 iterators if the timeline is running avoids this.
15997 clutter/clutter-animator.c | 4 ++++
15998 1 file changed, 4 insertions(+)
16000 commit 9ebd5fd935e6695acfbebfe479e56c20b0a92a15
16001 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16002 Date: Mon Apr 26 18:08:45 2010 +0100
16004 Implement accessors for the color bits in a framebuffer
16006 Instead of using cogl_get_bitmasks() to query the GL machinery for the
16007 size of the color bits, we should store the values inside the
16008 CoglFramebuffer object and query them the first time we set the framebuffer
16009 as the current one.
16011 Currently, cogl_get_bitmasks() is re-implemented in terms of
16012 cogl_framebuffer_get_*_bits(). As soon as we are able to expose the
16013 CoglOnscreen framebuffer object in the public API we'll be able to
16014 deprecate cogl_get_bitmasks() altogether.
16016 http://bugzilla.openedhand.com/show_bug.cgi?id=2094
16018 clutter/cogl/cogl/cogl-context.c | 1 +
16019 clutter/cogl/cogl/cogl-framebuffer-private.h | 18 ++++++++
16020 clutter/cogl/cogl/cogl-framebuffer.c | 57 ++++++++++++++++++++++++++
16021 clutter/cogl/cogl/cogl.c | 24 ++++-------
16022 clutter/cogl/cogl/cogl.h | 52 +++++++++++++++++++++++
16023 5 files changed, 135 insertions(+), 17 deletions(-)
16025 commit 0ff02d18d2741adbb79d479a34325f0d63a05c26
16026 Author: Neil Roberts <neil@linux.intel.com>
16027 Date: Wed May 5 12:05:15 2010 +0100
16029 gles: Fix the functions names for the GL_OES_framebuffer_object ext
16031 In 91cde78a7 I accidentally changed the function names that get looked
16032 up for the framebuffer extension under GLES so that they didn't have
16033 any suffix. The spec for extension specifies that they should have the
16036 clutter/cogl/cogl/driver/gles/cogl-feature-functions.h | 5 +----
16037 1 file changed, 1 insertion(+), 4 deletions(-)
16039 commit d8e1bd989c0ccd95a6c0cea20d567da9a3bc6d79
16040 Author: Owen W. Taylor <otaylor@fishsoup.net>
16041 Date: Fri Apr 30 14:56:07 2010 -0400
16043 Ignore unexpected GLX_BufferSwapComplete
16045 A server that supports GLX_BufferSwapComplete will always send
16046 these events, so we should just silently ignore them if we've
16047 chosen not to take advantage of the INTEL_swap_event GLX
16050 http://bugzilla.openedhand.com/show_bug.cgi?id=2102
16052 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
16054 clutter/glx/clutter-event-glx.c | 15 ++++++++-------
16055 1 file changed, 8 insertions(+), 7 deletions(-)
16057 commit 21914eaead44447e5ee4e0ffef205be9d4ba7524
16058 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16059 Date: Wed May 5 11:53:51 2010 +0100
16061 docs: Update the dependencies in the README
16064 1 file changed, 2 insertions(+), 2 deletions(-)
16066 commit 755625c75897a17da971d2252224a10bb39b1cf2
16067 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16068 Date: Wed May 5 11:52:20 2010 +0100
16070 build: Clean up build dependencies
16072 • Depend on autoconf 2.63
16073 • Depend on automake 1.11
16074 • Depend on gobject-introspection 0.6.7
16075 • Depend on gtk-doc 1.13
16076 • Remove Shave from the build
16078 build/autotools/Makefile.am.silent | 6 ---
16079 build/autotools/shave-libtool.in | 69 --------------------------------
16080 build/autotools/shave.in | 76 ------------------------------------
16081 build/autotools/shave.m4 | 73 ----------------------------------
16082 configure.ac | 38 +++++-------------
16083 5 files changed, 10 insertions(+), 252 deletions(-)
16085 commit 33642757f5a82418b71600c758babc2b86577b1d
16086 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16087 Date: Wed May 5 11:32:39 2010 +0100
16089 animation: Use 'guint' for set_duration() parameter
16091 The :duration property and the get_duration() method use unsigned int,
16092 but the setter using a signed integer for no apparent reason.
16094 http://bugzilla.openedhand.com/show_bug.cgi?id=2089
16096 clutter/clutter-animation.c | 2 +-
16097 clutter/clutter-animation.h | 2 +-
16098 2 files changed, 2 insertions(+), 2 deletions(-)
16100 commit 0835e27380e2de484c0bd330ab0163d5df63b902
16101 Author: Jussi Kukkonen <jku@linux.intel.com>
16102 Date: Sun Apr 18 10:47:14 2010 +0300
16104 container: use CLUTTER_IS_ACTOR on correct parameter
16106 clutter_container_create_child_meta() uses CLUTTER_IS_ACTOR on the
16107 container parameter instead of the actor parameter.
16109 http://bugzilla.openedhand.com/show_bug.cgi?id=2087
16111 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
16113 clutter/clutter-container.c | 2 +-
16114 1 file changed, 1 insertion(+), 1 deletion(-)
16116 commit 71f942d03a42e9f0c2a88823aaa20d375f392163
16117 Author: Damien Lespiau <damien.lespiau@intel.com>
16118 Date: Mon May 3 20:41:17 2010 +0200
16120 debug: Use G_UNLIKELY in the tests
16122 Debugging code is not meant to be run in the nominal code path. Use
16123 G_UNLIKELY to be reduce the number of bubbles in the instruction
16126 Took the opportunity to re-indent the macros.
16128 clutter/clutter-debug.h | 56 ++++++++++++++++++++--------------------
16129 clutter/cogl/cogl/cogl-debug.h | 20 +++++++-------
16130 2 files changed, 38 insertions(+), 38 deletions(-)
16132 commit f9072b8663728994610d3a26ae41718c94cdcbc7
16133 Author: Owen W. Taylor <otaylor@fishsoup.net>
16134 Date: Fri Apr 30 14:50:11 2010 -0400
16136 Call backend handle_event from clutter_x11_handle_event()
16138 Whether events come from the main loop source or from
16139 clutter_x11_handle_event(), we need to feed them to the backend
16140 virtual handle_event function. This fixes problems with clients
16141 using clutter_x11_handle_event() hanging because
16142 GLXBufferSwapComplete events aren't received.
16144 http://bugzilla.openedhand.com/show_bug.cgi?id=2101
16146 clutter/x11/clutter-event-x11.c | 10 +++++++++-
16147 1 file changed, 9 insertions(+), 1 deletion(-)
16149 commit d6dbd62021b9a8e711a1c34865920959051329fb
16150 Author: Robert Bragg <robert@linux.intel.com>
16151 Date: Fri Apr 30 12:10:16 2010 +0100
16153 debug: wrap glClear calls with the GE macro
16155 This adds a GE macro wrapper around our calls to glClear so we can
16156 print a warning for any errors reported by the driver.
16158 clutter/cogl/cogl/cogl.c | 2 +-
16159 1 file changed, 1 insertion(+), 1 deletion(-)
16161 commit e477768bd859550930c57a72318c952076b67158
16162 Author: Neil Roberts <neil@linux.intel.com>
16163 Date: Mon Apr 26 12:41:26 2010 +0100
16165 cogl-texture-2d-sliced: Use the converted bitmap when uploading
16167 When uploading texture data the cogl-texture-2d-sliced backend was
16168 using _cogl_texture_prepare_for_upload to create a bitmap suitable for
16169 upload but then it was using the original bitmap instead of the new
16170 bitmap for the data. This was causing any format conversions performed
16171 by cogl_texture_prepare_for_upload to be ignored.
16173 http://bugzilla.openedhand.com/show_bug.cgi?id=2059
16175 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 6 +++---
16176 1 file changed, 3 insertions(+), 3 deletions(-)
16178 commit 405d529f449bb3cfa7f156510a98e70e38c9e1b5
16179 Author: Neil Roberts <neil@linux.intel.com>
16180 Date: Mon Apr 26 12:30:37 2010 +0100
16182 cogl-texture: Don't attempt to use GL to convert formats under GLES
16184 In commit abe91784c4b I changed cogl-texture so that it would use the
16185 OpenGL mechanism to specify a different internal texture format from
16186 the image format so that it can do the conversion instead of
16187 Cogl. However under GLES the internal format and the image format must
16188 always be the same and it only supports a limited set of formats. This
16189 patch changes _cogl_texture_prepare_for_upload so that it does the
16190 conversion using the cogl bitmap code when compiling for GLES.
16192 http://bugzilla.openedhand.com/show_bug.cgi?id=2059
16194 clutter/cogl/cogl/cogl-texture.c | 32 ++++++++++++++++++++++++++++++++
16195 1 file changed, 32 insertions(+)
16197 commit 8530b7946a862abdbcd4890ba8a444799b75986d
16198 Author: Neil Roberts <neil@linux.intel.com>
16199 Date: Tue Apr 27 16:38:07 2010 +0100
16201 cogl-material: Fix the check to prevent using too many layers
16203 There was a check at the bottom of the loop which sets up the state
16204 for each of the layers so that it would break from the loop when the
16205 maximum number of layers is reached. However after doing this it would
16206 not increment 'i'. 'i' is later used to disable the remaining layers
16207 so it would end up disabling the last layer it just set up.
16209 This patch moves the check to be part of the loop condition so that
16210 the check is performed after incrementing 'i'.
16212 http://bugzilla.openedhand.com/show_bug.cgi?id=2064
16214 clutter/cogl/cogl/cogl-material.c | 9 ++++-----
16215 1 file changed, 4 insertions(+), 5 deletions(-)
16217 commit 3c2bb33cbd129a474bd59cf9efa8275617eb06fa
16218 Author: Neil Roberts <neil@linux.intel.com>
16219 Date: Tue Apr 27 16:35:35 2010 +0100
16221 cogl-material: Fix the warning for when too many layers are used
16223 The warning displayed when too many layers are used had an off-by-one
16224 error so that it would display even if exactly the maximum number is
16225 used. There was also a missing space at the end of the line in the
16226 message which looked wrong when displayed on the terminal.
16228 http://bugzilla.openedhand.com/show_bug.cgi?id=2064
16230 clutter/cogl/cogl/cogl-material.c | 4 ++--
16231 1 file changed, 2 insertions(+), 2 deletions(-)
16233 commit a3bc4a6009086a92f1abc448a52865654d553993
16234 Author: Neil Roberts <neil@linux.intel.com>
16235 Date: Tue Apr 27 16:34:59 2010 +0100
16237 test-cogl-materials: Add a test using the maximum number of layers
16239 This adds a test which creates a material using the maximum number of
16240 layers. All of the layers are assigned a white texture except the last
16241 which is set to red. The default combine mode is used for all of the
16242 layers so the final fragment should end up red.
16244 Currently Cogl doesn't provide a way to query the maximum number of
16245 layers so it just uses glGetIntegerv instead. This might cause
16246 problems on GLES 2 because that adds additional restrictions on the
16249 http://bugzilla.openedhand.com/show_bug.cgi?id=2064
16251 tests/conform/test-cogl-materials.c | 62 +++++++++++++++++++++++++++++++++++
16252 1 file changed, 62 insertions(+)
16254 commit ce261025f6dfd34153382cb69bcb7fb11b8e2561
16255 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16256 Date: Wed Apr 28 16:19:37 2010 +0100
16258 Fix clutter_event_get_coords() for crossing events
16260 The ClutterCrossingEvent data structure contains the coordinates
16261 of the crossing; they are regularly filed out by Clutter and by
16262 the backend event processing code. And yet clutter_event_get_coords()
16263 returns (0, 0) because it thinks that CLUTTER_ENTER and CLUTTER_LEAVE
16264 events do not have coordinates.
16266 clutter/clutter-event.c | 4 ++++
16267 1 file changed, 4 insertions(+)
16269 commit b7098563c26bb6e0f1992bb7c4cb711fbe0424ac
16270 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16271 Date: Tue Apr 27 10:12:25 2010 +0100
16273 actor: Make consistent use of the name in error reporting
16275 Whenever we are warning inside ClutterActor we prefer the actor's name
16276 to its type, if the name is set. The current code is made less readable
16277 by the use of the ternary operator:
16279 priv->name != NULL ? priv->name : G_OBJECT_TYPE_NAME (self)
16281 This looks like a job for a simple convenience function.
16283 clutter/clutter-actor.c | 104 +++++++++++++++++++++--------------------------
16284 1 file changed, 46 insertions(+), 58 deletions(-)
16286 commit 9024cd9f7c32b30f1ca5a4d5c53569af7c72da48
16287 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16288 Date: Mon Apr 26 12:58:17 2010 +0100
16290 Clean up the Texture private data structure
16292 clutter/clutter-texture.c | 29 ++++++++++++++---------------
16293 1 file changed, 14 insertions(+), 15 deletions(-)
16295 commit 48b8510a0688baef86db5b808e458c5295aee819
16296 Author: Neil Roberts <neil@linux.intel.com>
16297 Date: Sun Apr 25 16:20:39 2010 +0100
16299 mingw-cross-compile.sh: Write the build environment to a script
16301 The script now writes out a separate script that can be used to set up
16302 the build environment to $ROOT_DIR/share/env.sh. This can be sourced
16303 in a shell to set up the build environment or it can be given a
16304 command to directly execute in the environment. This makes it easier
16305 to build Clutter from your own source rather than checking it out from
16308 build/mingw/mingw-cross-compile.sh | 88 ++++++++++++++++++++++++------------
16309 1 file changed, 60 insertions(+), 28 deletions(-)
16311 commit eb22ab9bf2b6837b33911bd3962d09b757139366
16312 Author: Neil Roberts <neil@linux.intel.com>
16313 Date: Sun Apr 25 16:09:16 2010 +0100
16315 mingw-cross-compile.sh: Update the package versions
16317 This updates to the latest binaries from Tor Lillqvist. zlib and iconv
16318 are now taken from the Tor deps instead of the gnuwin32 project. SDL
16319 is no longer downloaded because the SDL backend has been removed from
16320 Clutter. The GL headers are downloaded from the Mesa cgit rather than
16321 downloading the whole Mesa package. glext.h is taken directly from
16324 build/mingw/mingw-cross-compile.sh | 101 +++++++++++-------------------------
16325 1 file changed, 29 insertions(+), 72 deletions(-)
16327 commit a881c8b07e73325749bb2ab6c0d4d5710507b016
16328 Author: Neil Roberts <neil@linux.intel.com>
16329 Date: Thu Apr 22 18:14:40 2010 +0100
16331 cogl-path: Make cogl_path_arc_rel static
16333 cogl_path_arc_rel was never in any public headers so it isn't part of
16334 the public API. It also has a slightly inconsistent name because the
16335 rest of the relative path functions are called cogl_path_rel_*. This
16336 patch makes it static for now to make it more obvious that it isn't
16337 public. The name has changed to _cogl_path_rel_arc.
16339 clutter/cogl/cogl/cogl-path.c | 56 ++++++++++++++++++++---------------------
16340 1 file changed, 28 insertions(+), 28 deletions(-)
16342 commit e16f05326e72484a38c5154ecdf973de2c35445a
16343 Author: Neil Roberts <neil@linux.intel.com>
16344 Date: Thu Apr 22 18:03:57 2010 +0100
16346 cogl-path: Add documentation for the angles of cogl_path_arc
16348 This adds documentation for how Cogl interprets the angles given to
16351 clutter/cogl/cogl/cogl-path.h | 10 ++++++++--
16352 1 file changed, 8 insertions(+), 2 deletions(-)
16354 commit 73e4d49053b8cf79d0d5694e2b077e0e7ab05dfe
16355 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16356 Date: Thu Apr 22 17:54:05 2010 +0100
16358 profile: Add profiling points for Text
16360 Add a static timer for the text layout code, and two counters for the
16361 layout cache hit and miss conditions.
16363 clutter/clutter-text.c | 44 +++++++++++++++++++++++++++++++++++++-------
16364 1 file changed, 37 insertions(+), 7 deletions(-)
16366 commit 5608a54708c3ab1665840c24bdfcb9c2b38fa78b
16367 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16368 Date: Thu Apr 22 17:52:13 2010 +0100
16370 profile: Fix the report generation
16372 Timers and counters might not exist, so make every section of the
16373 profile report depend on the object that it is querying.
16375 This fixes the profile report generation that was broken by commit
16376 8146d8d08deafd6cf86238a4a8c2fa6149e5c691.
16378 clutter/clutter-profile.c | 31 +++++++++++++++++--------------
16379 1 file changed, 17 insertions(+), 14 deletions(-)
16381 commit b13eb77e05670367b99caa4d4cb6a9f24e9b15aa
16382 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16383 Date: Thu Apr 22 17:51:56 2010 +0100
16385 Add uprof to the jhbuild moduleset
16387 build/clutter.modules | 6 ++++++
16388 1 file changed, 6 insertions(+)
16390 commit 05cf570570879fe5d699a07ad19a27168b57c23b
16391 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16392 Date: Thu Apr 22 16:49:57 2010 +0100
16394 actor: Add an internal variant of get_stage()
16396 For internal use we should have a get_stage_internal() variant that
16397 avoids type checks and calls to public functions. The implementation
16398 is trivial enough, and it will avoid (scene graph depth + 1) type
16399 checks and (scene graph depth) function calls.
16401 clutter/clutter-actor.c | 47 ++++++++++++++++++++++++++---------------------
16402 1 file changed, 26 insertions(+), 21 deletions(-)
16404 commit 1355c19f66a029247dab775b8c9d52aa44889a6e
16405 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16406 Date: Wed Apr 21 11:30:54 2010 +0100
16408 docs: Fix gtk-doc warnings
16410 clutter/clutter-behaviour-opacity.h | 2 +-
16411 clutter/clutter-behaviour.c | 4 ++--
16412 2 files changed, 3 insertions(+), 3 deletions(-)
16414 commit 3196658b8ca648655815a61a04e09c479084b1f2
16415 Author: Neil Roberts <neil@linux.intel.com>
16416 Date: Wed Apr 21 22:36:43 2010 +0100
16418 cogl-path: Fix the truncation when adding to a copied path
16420 If a path is copied and then appended to, the copy needs to have the
16421 last sub path truncated so that it fits in the total path size in case
16422 the original path was modified. However the path size check was broken
16423 so if the copied path had more than one sub path it would fail.
16425 clutter/cogl/cogl/cogl-path.c | 2 +-
16426 1 file changed, 1 insertion(+), 1 deletion(-)
16428 commit fddd3169865f1ad623453d8fc9490277325ed105
16429 Author: Neil Roberts <neil@linux.intel.com>
16430 Date: Wed Apr 21 18:58:18 2010 +0100
16432 test-cogl-path: Test sub paths and intersections
16434 This changes the original tests so that it splits the original path
16435 into two sub paths. When adding a new block to the copied path it also
16436 adds another sub path. This further stresses the path copying
16437 mechanism and exposes a bug.
16439 It also tests intersections by drawing a self-intersecting path and a
16440 path with two sub-paths that overlap. Where the path overlaps it
16441 should be inverted.
16443 tests/conform/test-cogl-path.c | 33 ++++++++++++++++++++++++++++-----
16444 1 file changed, 28 insertions(+), 5 deletions(-)
16446 commit abc64a2c671a4eeafa374ceb91482e058705f6fb
16447 Author: Neil Roberts <neil@linux.intel.com>
16448 Date: Tue Apr 20 14:58:57 2010 +0100
16450 cogl-clip-stack: Use orientation of the polygon to set clip planes
16452 Previously the clip stack code was trying to detect when the
16453 orientation of the on-screen rectangle had changed by checking if the
16454 order of the y-coordinates on the left edge was different from the
16455 order the x-coordinates on the top edge. This doesn't work for some
16456 rotations which was causing the clip planes to clip the wrong side of
16457 the line. This patch makes it detect the orientation by calculating
16458 the signed area which is a standard computer graphics algorithm.
16460 http://bugzilla.openedhand.com/show_bug.cgi?id=2079
16462 clutter/cogl/cogl/cogl-clip-stack.c | 43 +++++++++++++++++++----------------
16463 1 file changed, 24 insertions(+), 19 deletions(-)
16465 commit 7f2b2e13641c146f4b62631ed89638aba610ae07
16466 Author: Neil Roberts <neil@linux.intel.com>
16467 Date: Wed Apr 21 11:49:57 2010 +0100
16469 cogl-path: Document how a shape is filled
16471 This adds some documentation to cogl_path_fill() describing the fill
16474 clutter/cogl/cogl/cogl-path.h | 28 +++++++++++++++++++++++-----
16475 doc/reference/cogl/Makefile.am | 6 +++++-
16476 doc/reference/cogl/fill-rule.png | Bin 0 -> 3121 bytes
16477 3 files changed, 28 insertions(+), 6 deletions(-)
16479 commit 44c86fceadf4e770fa93df1605cf93f16103b195
16480 Author: Neil Roberts <neil@linux.intel.com>
16481 Date: Mon Apr 19 18:54:40 2010 +0100
16483 cogl-path: Don't try to union sub paths
16485 When drawing a path with only a single sub path, Cogl uses the
16486 'even-odd' fill rule which means that if a part of the path intersects
16487 with another part then the intersection would be inverted. However
16488 when combining sub paths it treats them as separate paths and then
16489 unions them together. This doesn't match the semantics of the even-odd
16490 rule in SVG and Cairo. This patch makes it so that a new sub path is
16491 just drawn as another triangle fan so that it will continue to invert
16492 the stencil buffer. This is also much simpler and more efficient as
16493 well as being more correct.
16495 http://bugzilla.openedhand.com/show_bug.cgi?id=2088
16497 clutter/cogl/cogl/cogl-path.c | 24 ------------------------
16498 1 file changed, 24 deletions(-)
16500 commit 78dc59b34859686c89e9b96dc0fc78f453031262
16501 Author: Neil Roberts <neil@linux.intel.com>
16502 Date: Fri Mar 26 23:09:11 2010 +0000
16504 picking: Read the colour value using COGL_PIXEL_FORMAT_RGBA_8888_PRE
16506 In commit c0a553163b I changed the format used to read the picking
16507 pixel to COGL_PIXEL_FORMAT_RGB_888 because it was convenient to avoid
16508 the premult conversion. However this broke picking on GLES on some
16509 platforms because for that glReadPixels is only guaranteed to support
16510 GL_RGBA with GL_UNSIGNED_BYTE. Since the last commit cogl_read_pixels
16511 will always use that format but it will end up with a conversion back
16512 to RGB_888. This patch avoids that conversion and avoids the premult
16513 conversion by reading in RGBA_8888_PRE.
16515 http://bugzilla.openedhand.com/show_bug.cgi?id=2057
16517 clutter/clutter-main.c | 12 +++++++++---
16518 1 file changed, 9 insertions(+), 3 deletions(-)
16520 commit 0cb09cd40d6b031a5514038af73a13d4e7bf2f82
16521 Author: Neil Roberts <neil@linux.intel.com>
16522 Date: Fri Mar 26 22:40:53 2010 +0000
16524 cogl_read_pixels: Always use GL_RGBA/GL_UNSIGNED_BYTE under GLES
16526 Under GLES glReadPixels is documented to only support GL_RGBA with
16527 GL_UNSIGNED_BYTE and an implementation specfic format which can be
16528 fetched with glGet, GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES and
16529 GL_IMPLEMENTATION_COLOR_READ_TYPE_OES. This patch makes it always read
16530 using GL_RGBA and GL_UNSIGNED_BYTE and then convert the results if
16533 This has some room for improvement because it doesn't attempt to use
16534 the implementation specific format. Also the conversion is somewhat
16535 wasteful because there are currently no cogl_bitmap_* functions to
16536 convert without allocating a new buffer so it ends up doing an
16539 http://bugzilla.openedhand.com/show_bug.cgi?id=2057
16541 clutter/cogl/cogl/cogl.c | 67 +++++++++++++++++++++++++++++++++++++++-------
16542 1 file changed, 58 insertions(+), 9 deletions(-)
16544 commit 9750b90f37127c85f7092c16ca64fb0b63501882
16545 Author: Neil Roberts <neil@linux.intel.com>
16546 Date: Fri Mar 26 22:34:56 2010 +0000
16548 cogl-bitmap: Fix converting formats with and without alpha channels
16550 _cogl_bitmap_convert_format_and_premult was failing when converting
16551 from RGBA to RGB and vice versa. _cogl_bitmap_fallback_convert
16552 converts without altering the premult status so when choosing a new
16553 format it would copy over the premult bit. However, it did this
16554 regardless of whether the new format had an alpha channel so when
16555 converting from RGBA_8888_PRE to RGB_888 it would end up inventing a
16556 new meaningless format which would be RGB_888_PRE. This patch makes it
16557 avoid copying the premult flag if the destination has no alpha. It
16558 doesn't matter if it copies when the source format has no alpha
16559 because it will always be unset.
16561 _cogl_bitmap_convert_format_and_premult was also breaking when
16562 converting from RGBA_8888_PRE to RGB_888 because it would think
16563 RGB_888 is unpremultiplied and try to convert but then
16564 _cogl_bitmap_fallback_premult wouldn't know how to do the conversion.
16566 http://bugzilla.openedhand.com/show_bug.cgi?id=2057
16568 clutter/cogl/cogl/cogl-bitmap-fallback.c | 8 ++++++--
16569 clutter/cogl/cogl/cogl-bitmap.c | 10 +++++++++-
16570 2 files changed, 15 insertions(+), 3 deletions(-)
16572 commit 05afe139a508a26a93af787a7eb19d76b45acd9c
16573 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16574 Date: Mon Apr 19 17:55:37 2010 +0100
16576 Require GLib >= 2.18
16578 We use g_signal_override_class_handler(), which was added in GLib 2.18,
16579 so we should bump up our requirements.
16582 configure.ac | 2 +-
16583 2 files changed, 2 insertions(+), 2 deletions(-)
16585 commit a28440eafbfc126020fc83544eb89d06069df3e2
16586 Author: Neil Roberts <neil@linux.intel.com>
16587 Date: Thu Apr 15 13:57:45 2010 +0100
16589 clutter-texture: Remove confusing comments about realization
16591 In 125bded81 some comments were introduced to ClutterTexture
16592 complaining that it can have a Cogl texture before being
16593 realized. Clutter always assumes that the single GL context is current
16594 so there is no need to wait until the actor is realized before setting
16595 a texture. This patch replaces the comments with clarification that
16596 this should not be a problem.
16598 The patch also changes the documentation about the realized state in
16599 various places to clarify that it is acceptable to create any Cogl
16600 resources before the actor is realized.
16602 http://bugzilla.openedhand.com/show_bug.cgi?id=2075
16604 clutter/clutter-actor.c | 49 ++++++++++++++++++++++----------------
16605 clutter/clutter-texture.c | 30 ++++++++++-------------
16606 doc/clutter-actor-invariants.txt | 5 +++-
16607 3 files changed, 44 insertions(+), 40 deletions(-)
16609 commit 62ac3b312e861d813dc5a4f9c8d3556b86381626
16610 Author: Robert Bragg <robert@linux.intel.com>
16611 Date: Fri Apr 16 14:38:52 2010 +0100
16613 glx: handle spurious GLX_BufferSwapComplete events gracefully
16615 Instead of simply aborting we now print out a warning, when a spurious
16616 GLX_BufferSwapComplete event is handled since it seems that people are
16617 coming across the problem (perhaps due to a buggy driver) and making
16618 apps crash in this situation is a bit extreme.
16620 clutter/glx/clutter-event-glx.c | 10 ++++++++--
16621 1 file changed, 8 insertions(+), 2 deletions(-)
16623 commit 716ec82db8bec57e35d51e8dee5468435fc9e59e
16624 Author: Neil Roberts <neil@linux.intel.com>
16625 Date: Wed Feb 3 20:58:32 2010 +0000
16627 clutter-cairo-texture: Use the new cogl_pixel_buffer API
16629 ClutterCairoTexture now stores the surface image data in a Cogl pixel
16630 buffer object. When clutter_cairo_texture_create is called the buffer
16631 is mapped and a new Cairo surface is created to render directly to the
16632 PBO. When the surface is destroyed the buffer is unmapped and a Cogl
16633 texture is recreated from the buffer. This should enable slightly
16634 faster uploads when using Cairo because it avoids having to copy the
16635 surface data to the texture.
16637 http://bugzilla.openedhand.com/show_bug.cgi?id=1982
16639 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
16641 clutter/clutter-cairo-texture.c | 208 +++++++++++++++------------------------
16642 1 file changed, 77 insertions(+), 131 deletions(-)
16644 commit 1a1e7d35730b510f2a32e25bb34ae7ab0e2be349
16645 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16646 Date: Fri Apr 16 11:11:50 2010 +0100
16648 text: Increase the size of the Layout cache
16650 Currently, each ClutterText caches 3 Pango layouts:
16652 » one for the preferred, unbounded width
16653 » one for the preferred height for a given width
16654 » one for the allocated size
16656 Some layout managers do a double pass that could flush the whole cache
16657 before it has a chance of actually storing relevant data, resulting in
16658 a continuous series of misses.
16660 We can try to counteract this by doubling the size of the cache, from
16661 three slots to six. More than six would be pointless, as well as too
16662 memory consuming; but we might get down to a number between 3 and 6 at
16665 clutter/clutter-text.c | 5 ++++-
16666 1 file changed, 4 insertions(+), 1 deletion(-)
16668 commit dd407326feaa53a68fa30db710f8ca4b5ea7b1ba
16669 Author: Rob Bradford <rob@linux.intel.com>
16670 Date: Wed Apr 14 00:12:02 2010 +0100
16672 text: Check generated size of layouts in cache
16674 By comparing the requested size against the computed sized for existing
16675 Pango layouts we can avoid creating layouts where the requested size
16676 matches that of a previously computed one.
16678 In particular this optimisation means that when working with a fixed
16679 positioning based layout (with no constraints on the size of the
16680 ClutterText) the same PangoLayout can be used to calculate the preferred
16681 width, height and also the layout used for the actual painting.
16683 http://bugzilla.openedhand.com/show_bug.cgi?id=2078
16685 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
16687 clutter/clutter-text.c | 55 +++++++++++++++++++++++++++++++++++++++++++++---
16688 1 file changed, 52 insertions(+), 3 deletions(-)
16690 commit 708bbc72e1121022e577c25a799489e193ca535a
16691 Author: Neil Roberts <neil@linux.intel.com>
16692 Date: Thu Apr 15 10:58:28 2010 +0100
16694 cogl: Implement retained clip stacks
16696 This adds three new internal API functions which can be used to retain
16697 the clip stack state and restore it later:
16699 _cogl_get_clip_stack
16700 _cogl_set_clip_stack
16701 _cogl_clip_stack_copy
16703 The functions are currently internal and not yet used but we may want
16704 to make them public in future to replace the cogl_clip_stack_save()
16705 and cogl_clip_stack_restore() APIs.
16707 The get function just returns the handle to the clip stack at the top
16708 of the stack of stacks and the set function just replaces it.
16710 The copy function makes a cheap copy of an existing stack by taking a
16711 reference to the top stack entry. This ends up working like a deep
16712 copy because there is no way to modify entries of a stack but it
16713 doesn't actually copy the data.
16715 clutter/cogl/cogl/cogl-clip-stack.c | 26 ++++++++++++++++++++++++++
16716 clutter/cogl/cogl/cogl-clip-stack.h | 19 +++++++++++++++++++
16717 clutter/cogl/cogl/cogl-clip-state.c | 34 ++++++++++++++++++++++++++++++++++
16718 clutter/cogl/cogl/cogl-clip-state.h | 28 ++++++++++++++++++++++++++++
16719 4 files changed, 107 insertions(+)
16721 commit 3a58bc440b2e5dd0af15c65849e2baed170835f8
16722 Author: Neil Roberts <neil@linux.intel.com>
16723 Date: Thu Apr 15 10:27:43 2010 +0100
16725 cogl-clip-stack: Convert to be a CoglHandle
16727 CoglClipStacks can now be reference counted via a CoglHandle. The
16728 ClipClipState now stores handles in the list rather than CoglClipStack
16731 clutter/cogl/cogl/cogl-clip-stack.c | 28 +++++++++++++++++++++-------
16732 clutter/cogl/cogl/cogl-clip-stack.h | 17 ++++++-----------
16733 clutter/cogl/cogl/cogl-clip-state.c | 16 ++++++++--------
16734 3 files changed, 35 insertions(+), 26 deletions(-)
16736 commit aba7fb63cb2b190e3878e2be2e8818fcecfdeb2b
16737 Author: Neil Roberts <neil@linux.intel.com>
16738 Date: Wed Apr 14 19:41:08 2010 +0100
16740 Separate out CoglClipStackState from cogl-clip-stack.c
16742 CoglClipStackState has now been renamed to CoglClipState and is moved
16743 to a separate file. CoglClipStack now just maintains a stack and
16744 doesn't worry about the rest of the state. CoglClipStack sill contains
16745 the code to flush the stack to GL.
16747 clutter/cogl/cogl/Makefile.am | 2 +
16748 clutter/cogl/cogl/cogl-clip-stack.c | 349 ++--------------------
16749 clutter/cogl/cogl/cogl-clip-stack.h | 37 ++-
16750 clutter/cogl/cogl/cogl-clip-state.c | 405 ++++++++++++++++++++++++++
16751 clutter/cogl/cogl/cogl-clip-state.h | 50 ++++
16752 clutter/cogl/cogl/cogl-framebuffer-private.h | 6 +-
16753 clutter/cogl/cogl/cogl-framebuffer.c | 10 +-
16754 clutter/cogl/cogl/cogl-path.c | 4 +-
16755 clutter/cogl/cogl/cogl.c | 2 +-
16756 9 files changed, 519 insertions(+), 346 deletions(-)
16758 commit 732223074be151e543a30ffff858104dee1ac60d
16759 Author: Neil Roberts <neil@linux.intel.com>
16760 Date: Wed Apr 14 18:47:25 2010 +0100
16762 cogl-slip-stack: Store clip window rect entries in Cogl coordinates
16764 When glScissor is called it needs to pass coordinates in GL's
16765 coordinate space where the origin is the bottom left. Previously this
16766 conversion was done before storing the window rect in the clip
16767 stack. However this might make it more difficult if we want to be able
16768 to grab a handle to a clip stack and use it in different circumstances
16769 later. This patch moves the coordinate conversion to inside the clip
16770 state flushing code.
16772 clutter/cogl/cogl/cogl-clip-stack.c | 57 ++++++++++++++++++++---------------
16773 1 file changed, 32 insertions(+), 25 deletions(-)
16775 commit e9aa5d807cb29e1cdc9b8a7b627de914352e4fc1
16776 Author: Neil Roberts <neil@linux.intel.com>
16777 Date: Wed Apr 14 15:42:57 2010 +0100
16779 cogl-clip-stack: Store window rect entries as ints not floats
16781 The window rectangles are passed in as integers so there is no point
16782 in converting them to floats when storing a stack entry for them.
16784 clutter/cogl/cogl/cogl-clip-stack.c | 8 ++++----
16785 1 file changed, 4 insertions(+), 4 deletions(-)
16787 commit a0e19c94696a0ba0627fd125e4a5285d355c1d80
16788 Author: Neil Roberts <neil@linux.intel.com>
16789 Date: Wed Apr 14 13:17:26 2010 +0100
16791 cogl-clip-stack: Use reference counted stack entries
16793 The stack is now stored as a list of reference counted entries.
16794 Instead of using a GList, each entry now contains a link with a
16795 reference to its parent. The idea is that this would allow copying
16796 stacks with a shared ancestry.
16798 Previously the code flushed the state by finding the bottom of the
16799 stack and then applying each entry by walking back up to the top. This
16800 is slightly harder to do now because the list is no longer
16801 doubly-linked. However I don't think it matters which order the
16802 entries are applied so I've just changed it to apply them in reverse
16805 There was also a restriction that if ever the stencil buffer is used
16806 then we could no longer use clip planes for any subsequent entries. I
16807 don't think this makes sense because it should always work as long as
16808 it doesn't attempt to use the clip planes more than once. I've
16809 therefore removed the restriction.
16811 clutter/cogl/cogl/cogl-clip-stack.c | 207 +++++++++++++++++++++++++----------
16812 1 file changed, 149 insertions(+), 58 deletions(-)
16814 commit 15ef549207b188e7e201a21a77386c3268a1cb53
16815 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16816 Date: Wed Apr 14 23:34:38 2010 +0100
16818 docs: Clean up ClutterActor's long description
16820 The Actor's long description is a bit cluttered; it contains a section
16821 on the actor's box semantics, on the transformation order and on the
16824 We should use <refsect2> tags to divide the Actor's description into
16825 logically separated sections.
16827 We should also add a section about the custom Scriptable properties that
16828 ClutterActor defines, and the special handling of unit-based properties.
16830 clutter/clutter-actor.c | 210 +++++++++++++++++++++++++++--------------------
16831 1 file changed, 119 insertions(+), 91 deletions(-)
16833 commit 2d4ddc1b11acbc2b82be713cb48bbd81864844f9
16834 Author: Emmanuele Bassi <ebassi@linux.intel.com>
16835 Date: Wed Apr 14 00:52:23 2010 +0100
16837 Add test-cogl-wrap-mode to the ignore list
16840 1 file changed, 1 insertion(+)
16842 commit 1445e9d32d8f4b5c82c81deb32a57a90c0009825
16843 Author: Neil Roberts <neil@linux.intel.com>
16844 Date: Tue Apr 13 17:26:03 2010 +0100
16846 cogl-atlas-texture: Fix a memory leak
16848 The CoglAtlasTexture struct was not being freed in
16849 _cogl_atlas_texture_free so there would be a small leak whenever a
16850 texture was destroyed.
16852 Thanks to Robert Bragg for spotting this.
16854 clutter/cogl/cogl/cogl-atlas-texture.c | 2 ++
16855 1 file changed, 2 insertions(+)
16857 commit 30f43c6cda98a1dcf3a6cca10cf23212bfb2b503
16858 Author: Neil Roberts <neil@linux.intel.com>
16859 Date: Thu Apr 1 18:35:32 2010 +0100
16861 cogl-material: Use CLAMP_TO_EDGE for WRAP_AUTOMATIC unless overriden
16863 CoglMaterial now sets GL_CLAMP_TO_EDGE if WRAP_MODE_AUTOMATIC is used
16864 unless it is overridden when the material is flushed. The primitives
16865 are still expected to expose repeat semantics so no user visible
16866 changes are made. The idea is that drawing non-repeated textures is
16867 the most common case so if we make clamp_to_ege the default then we
16868 will reduce the number of times we have to override the
16869 material. Avoiding overrides will become important if the overriding
16870 mechanism is replaced with one where the primitive is expected to copy
16871 the material and change that instead.
16873 clutter/cogl/cogl/cogl-material.c | 6 +-
16874 clutter/cogl/cogl/cogl-primitives.c | 104 ++++++++++++++++++++++++--------
16875 clutter/cogl/cogl/cogl-vertex-buffer.c | 35 ++++++++++-
16876 3 files changed, 115 insertions(+), 30 deletions(-)
16878 commit 08a4995383d3169746e8454ba2272b4f2f29c44a
16879 Author: Neil Roberts <neil@linux.intel.com>
16880 Date: Wed Mar 31 18:54:34 2010 +0100
16882 tests: Add a conformance test for the wrap modes of a cogl material
16884 This renders a texture using different combinations of wrap modes for
16885 the s and t coordinates and then verifies that the expected wrapping
16886 is acheived. The texture is drawn using rectangles, polygons and
16887 vbos. There is also code to test a rectangle using an atlased texture
16888 (which should test the manual repeating) however the validation for
16889 this is currently disabled because it doesn't work.
16891 http://bugzilla.openedhand.com/show_bug.cgi?id=2063
16893 tests/conform/Makefile.am | 1 +
16894 tests/conform/test-cogl-wrap-modes.c | 332 ++++++++++++++++++++++++++++++++++
16895 tests/conform/test-conform-main.c | 1 +
16896 3 files changed, 334 insertions(+)
16898 commit 75f1dc90b05badc9aa9798985c23ac1489ddf535
16899 Author: Neil Roberts <neil@linux.intel.com>
16900 Date: Thu Apr 1 11:31:33 2010 +0100
16902 cogl-material: Add support for setting the wrap mode for a layer
16904 Previously, Cogl's texture coordinate system was effectively always
16905 GL_REPEAT so that if an application specifies coordinates outside the
16906 range 0→1 it would get repeated copies of the texture. It would
16907 however change the mode to GL_CLAMP_TO_EDGE if all of the coordinates
16908 are in the range 0→1 so that in the common case that the whole texture
16909 is being drawn with linear filtering it will not blend in edge pixels
16910 from the opposite sides.
16912 This patch adds the option for applications to change the wrap mode
16913 per layer. There are now three wrap modes: 'repeat', 'clamp-to-edge'
16914 and 'automatic'. The automatic map mode is the default and it
16915 implements the previous behaviour. The wrap mode can be changed for
16916 the s and t coordinates independently. I've tried to make the
16917 internals support setting the r coordinate but as we don't support 3D
16918 textures yet I haven't exposed any public API for it.
16920 The texture backends still have a set_wrap_mode virtual but this value
16921 is intended to be transitory and it will be changed whenever the
16922 material is flushed (although the backends are expected to cache it so
16923 that it won't use too many GL calls). In my understanding this value
16924 was always meant to be transitory and all primitives were meant to set
16925 the value before drawing. However there were comments suggesting that
16926 this is not the expected behaviour. In particular the vertex buffer
16927 drawing code never set a wrap mode so it would end up with whatever
16928 the texture was previously used for. These issues are now fixed
16929 because the material will always set the wrap modes.
16931 There is code to manually implement clamp-to-edge for textures that
16932 can't be hardware repeated. However this doesn't fully work because it
16933 relies on being able to draw the stretched parts using quads with the
16934 same values for tx1 and tx2. The texture iteration code doesn't
16935 support this so it breaks. This is a separate bug and it isn't
16938 When flushing a material there are now extra options to set wrap mode
16939 overrides. The overrides are an array of values for each layer that
16940 specifies an override for the s, t or r coordinates. The primitives
16941 use this to implement the automatic wrap mode. cogl_polygon also uses
16942 it to set GL_CLAMP_TO_BORDER mode for its trick to render sliced
16943 textures. Although this code has been added it looks like the sliced
16944 trick has been broken for a while and I haven't attempted to fix it
16947 I've added a constant to represent the maximum number of layers that a
16948 material supports so that I can size the overrides array. I've set it
16949 to 32 because as far as I can tell we have that limit imposed anyway
16950 because the other flush options use a guint32 to store a flag about
16951 each layer. The overrides array ends up adding 32 bytes to each flush
16952 options struct which may be a concern.
16954 http://bugzilla.openedhand.com/show_bug.cgi?id=2063
16956 clutter/cogl/cogl/cogl-journal-private.h | 2 +
16957 clutter/cogl/cogl/cogl-journal.c | 7 +
16958 clutter/cogl/cogl/cogl-material-private.h | 56 +++++--
16959 clutter/cogl/cogl/cogl-material.c | 221 +++++++++++++++++++++++++++-
16960 clutter/cogl/cogl/cogl-material.h | 104 +++++++++++++
16961 clutter/cogl/cogl/cogl-primitives.c | 174 ++++++++++++++++++----
16962 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 4 -
16963 clutter/cogl/cogl/cogl-texture-2d.c | 4 -
16964 doc/reference/cogl/cogl-sections.txt | 5 +
16965 9 files changed, 524 insertions(+), 53 deletions(-)
16967 commit 463ebc8220122c9d424b2d091a33df376f9837f1
16968 Author: Neil Roberts <neil@linux.intel.com>
16969 Date: Thu Mar 25 17:29:22 2010 +0000
16971 Split the wrap mode of _cogl_texture_set_wrap_mode into three
16973 GL supports setting different wrap modes for the s, t and r
16974 coordinates so we should design the backend interface to support that
16975 also. The r coordinate is not currently used by any of the backends
16976 but we might as well have it to make life easier if we ever add
16977 support for 3D textures.
16979 http://bugzilla.openedhand.com/show_bug.cgi?id=2063
16981 clutter/cogl/cogl/cogl-atlas-texture.c | 13 +++++---
16982 clutter/cogl/cogl/cogl-primitives.c | 16 +++++++---
16983 clutter/cogl/cogl/cogl-sub-texture.c | 13 +++++---
16984 clutter/cogl/cogl/cogl-texture-2d-private.h | 3 +-
16985 clutter/cogl/cogl/cogl-texture-2d-sliced-private.h | 3 +-
16986 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 31 +++++++++++++-------
16987 clutter/cogl/cogl/cogl-texture-2d.c | 26 +++++++++-------
16988 clutter/cogl/cogl/cogl-texture-private.h | 13 +++++---
16989 clutter/cogl/cogl/cogl-texture.c | 11 +++++--
16990 9 files changed, 87 insertions(+), 42 deletions(-)
16992 commit 774f5e0bdf0ad61a3bcecb53fd109e79f95b0419
16993 Author: Neil Roberts <neil@linux.intel.com>
16994 Date: Thu Apr 1 20:06:30 2010 +0100
16996 cogl: Make private members really hard to accidentally use
16998 CoglColor and CoglMatrix have public declarations with private members
16999 so that we are free to change the implementation but the structures
17000 could still be allocated on the stack in applications. However it's
17001 quite easy not to realise the members are private and then access them
17002 directly. This patch wraps the members in a macro which redefines the
17003 symbol name when including the header outside of the clutter source.
17005 http://bugzilla.openedhand.com/show_bug.cgi?id=2065
17007 clutter/cogl/cogl/cogl-matrix.h | 9 +++++----
17008 clutter/cogl/cogl/cogl-types.h | 24 +++++++++++++++++-------
17009 2 files changed, 22 insertions(+), 11 deletions(-)
17011 commit 3fea5051db58ed376275621b56fbaaba75bb7ea1
17012 Author: Neil Roberts <neil@linux.intel.com>
17013 Date: Mon Apr 12 15:16:58 2010 +0100
17015 CoglMatrix: Don't make the matrix fields private
17017 The xx, yx, zx etc fields are meant to be read-only but they were
17018 marked as private with the gtk-doc annotation. This patch moves the
17019 private marker so that the 16 float member fields are public but the
17020 type, inverted matrix, flags and padding are not.
17022 clutter/cogl/cogl/cogl-matrix.h | 4 ++--
17023 1 file changed, 2 insertions(+), 2 deletions(-)
17025 commit 94465cfe3996d9d039cd3e55de10bc1ceab93a1a
17026 Author: Neil Roberts <neil@linux.intel.com>
17027 Date: Mon Apr 12 12:06:03 2010 +0100
17029 Fix indentation in CoglMatrix
17031 The members of CoglMatrix were indented by 4 characters instead of 2.
17033 clutter/cogl/cogl/cogl-matrix.h | 54 +++++++++++++++++++--------------------
17034 1 file changed, 27 insertions(+), 27 deletions(-)
17036 commit e0f41fa166665e099d894cc367346b6cafcd4634
17037 Author: Damien Lespiau <damien.lespiau@intel.com>
17038 Date: Sat Apr 10 17:02:42 2010 +0100
17040 actor: Flag the color argument of the ::pick signal as being constant
17042 When emitting signals, one can mark arguments as being "static", ie an
17043 indication this argument will not change during the signal emission.
17044 This allows the signal marshalling code to create static GValues, in
17045 this case not to copy the Color.
17047 http://bugzilla.openedhand.com/show_bug.cgi?id=2073
17049 clutter/clutter-actor.c | 2 +-
17050 1 file changed, 1 insertion(+), 1 deletion(-)
17052 commit 93a5b78e5ae3ab07c11f92fc6d7525dc3569dcb4
17053 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17054 Date: Fri Apr 9 18:24:09 2010 +0100
17056 actor: Do not use G_UNLIKELY in paint()
17058 We decide whether the paint() should be a real paint or a paint in pick
17059 mode depending on the global pick_mode value. Using G_UNLIKELY() on an
17060 operation that most likely is going to be executed once every frame is
17061 going to blow a lot of cache lines and frak with the CPU branch
17062 prediction. Not good.
17064 clutter/clutter-actor.c | 24 ++++++++++++------------
17065 1 file changed, 12 insertions(+), 12 deletions(-)
17067 commit 6583f8bb4906a450593d77b213e67ad8886edbbb
17068 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17069 Date: Fri Apr 9 18:22:50 2010 +0100
17071 tests: Fix test-script.json
17073 A trailing comma is breaking the validity of test-script.json
17075 tests/data/test-script.json | 2 +-
17076 1 file changed, 1 insertion(+), 1 deletion(-)
17078 commit c99a24d34163b1a8d867facdee0256f5af5b33b8
17079 Author: Fridrich Strba <fridrich.strba@bluewin.ch>
17080 Date: Fri Apr 9 15:43:42 2010 +0100
17082 win32: Use GCLP_* instead of GCL_* when calling GetClassLongPtr
17084 (commit message by Neil)
17086 GetClassLongPtr expects a different constant when retrieving handles
17087 or pointers. This fixes problems using Win64.
17089 clutter/win32/clutter-stage-win32.c | 2 +-
17090 1 file changed, 1 insertion(+), 1 deletion(-)
17092 commit f2776ea32b2656e14de393773c4c5457d4176a5e
17093 Author: Neil Roberts <neil@linux.intel.com>
17094 Date: Fri Apr 9 14:10:11 2010 +0100
17096 Add tests/conform/test-cogl-path to .gitignore
17099 1 file changed, 1 insertion(+)
17101 commit 10b16b4b7e06d7592a3d83ef209a39ba26eedbad
17102 Author: Neil Roberts <neil@linux.intel.com>
17103 Date: Thu Apr 8 17:18:40 2010 +0100
17105 Add a test case for cogl_path
17107 This tests various paths drawing rectangles and verifies that the
17108 expected pixels are filled in. Some of the paths are drawn by copying
17109 an existing path and modifying it which should test the copy-on-write
17112 tests/conform/Makefile.am | 1 +
17113 tests/conform/test-cogl-path.c | 179 +++++++++++++++++++++++++++++++++++++
17114 tests/conform/test-conform-main.c | 1 +
17115 3 files changed, 181 insertions(+)
17117 commit 9ee6dd240b58cbbbfcfcfc269152fb3065f9a935
17118 Author: Neil Roberts <neil@linux.intel.com>
17119 Date: Thu Apr 8 17:43:27 2010 +0100
17121 cogl: Support retained paths
17123 This adds three new API calls:
17125 CoglHandle cogl_path_get()
17126 void cogl_path_set(CoglHandle path)
17127 CoglHandle cogl_path_copy(CoglHandle path)
17129 All of the fields relating to the path have been moved from the Cogl
17130 context to a new CoglPath handle type. The cogl context now just
17131 contains a CoglPath handle. All of the existing path commands
17132 manipulate the data in the current path handle. cogl_path_new now just
17133 creates a new path handle and unrefs the old one.
17135 The path handle can be stored for later with cogl_path_get. The path
17136 can then be copied with cogl_path_copy. Internally it implements
17137 copy-on-write semantics with an extra optimisation that it will only
17138 copy the data if the new path is modified, but not if the original
17139 path is modified. It can do this because the only way to modify a path
17140 is by appending to it so the copied path is able to store its own path
17141 length and only render the nodes up to that length. For this to work
17142 the copied path also needs to keep its own copies of the path extents
17143 because the parent path may change these by adding nodes.
17145 The clip stack now uses the cogl_path_copy mechanism to store paths in
17146 the stack instead of directly copying the data. This should save some
17147 memory and processing time.
17149 clutter/cogl/cogl/Makefile.am | 1 +
17150 clutter/cogl/cogl/cogl-clip-stack.c | 37 ++--
17151 clutter/cogl/cogl/cogl-context.c | 8 +-
17152 clutter/cogl/cogl/cogl-context.h | 7 +-
17153 clutter/cogl/cogl/cogl-internal.h | 28 ---
17154 clutter/cogl/cogl/cogl-path-private.h | 96 ++++++++++
17155 clutter/cogl/cogl/cogl-path.c | 333 +++++++++++++++++++++++++--------
17156 clutter/cogl/cogl/cogl-path.h | 46 +++++
17157 doc/reference/cogl/cogl-sections.txt | 3 +
17158 9 files changed, 413 insertions(+), 146 deletions(-)
17160 commit 45885850d27aede5383e4aad84690e5fb9002fa5
17161 Author: Robert Bragg <robert@linux.intel.com>
17162 Date: Thu Apr 8 14:37:01 2010 +0100
17164 cogl: renames cogl_multiply_matrix to cogl_transform
17166 Although cogl_multiply_matrix was consistent with OpenGL, after further
17167 consideration it was agreed that cogl_transform is a better name. Given
17168 that it's in the global cogl_ namespace cogl_transform seems more self
17171 clutter/cogl/cogl/cogl.c | 2 +-
17172 clutter/cogl/cogl/cogl.h | 4 ++--
17173 doc/reference/cogl/cogl-sections.txt | 1 +
17174 3 files changed, 4 insertions(+), 3 deletions(-)
17176 commit 412a468d5ef4a2cc6cc748717ae245874d3ccd76
17177 Author: Robert Bragg <robert@linux.intel.com>
17178 Date: Thu Apr 1 13:15:12 2010 +0100
17180 docs: This improves the documentation for cogl_push_framebuffer
17182 This adds an example of how to setup a Clutter style 2D coordinate space
17183 and clarifies what state is owned by a framebuffer. (projection,
17184 modelview, viewport and clip stack)
17186 When we expose more cogl_framebuffer API this example will hopefully be
17187 migrated into a more extensive introduction to using framebuffers.
17189 clutter/cogl/cogl/cogl.h | 85 ++++++++++++++++++++++++++++++++++++++++------
17190 1 file changed, 75 insertions(+), 10 deletions(-)
17192 commit d2d890a33ebbde2e4a4e5fb7b90b75ed33a5af05
17193 Author: Robert Bragg <robert@linux.intel.com>
17194 Date: Wed Mar 3 16:37:59 2010 +0000
17196 test-cogl-offscreen: Setup a clutter style modelview/projection
17198 This updates test-cogl-offscreen to give an example of setting up a
17199 CoglFramebuffer with a Clutter style 2D coordinate system with (0,0) top
17200 left and (framebuffer_width, framebuffer_height) bottom right.
17202 tests/interactive/test-cogl-offscreen.c | 109 ++++++++++++++++++++++++++++++-
17203 1 file changed, 108 insertions(+), 1 deletion(-)
17205 commit 6f6ab8692911e0d0cdfd76bc7a90bd95af5063b1
17206 Author: Robert Bragg <robert@linux.intel.com>
17207 Date: Fri Mar 19 09:55:30 2010 +0000
17209 cogl: move cogl_set_source* funcs into cogl.c
17211 Previously cogl_set_source and cogl_set_source_texture were in
17212 cogl-material.c and the cogl_set_source_color* funcs were in
17213 cogl-color.c. Originally this was because cogl.c was duplicated between
17214 the GL and GLES backends and we didn't want to add to the amount of
17215 duplicated code, but these files have since been consolidated into one
17218 clutter/cogl/cogl/cogl-color.c | 24 ---------------
17219 clutter/cogl/cogl/cogl-material.c | 36 ----------------------
17220 clutter/cogl/cogl/cogl.c | 60 ++++++++++++++++++++++++++++++++++++-
17221 3 files changed, 59 insertions(+), 61 deletions(-)
17223 commit a678e9f62737994d42ea0d2066ff97464b00ba16
17224 Author: Robert Bragg <robert@linux.intel.com>
17225 Date: Fri Mar 19 09:30:59 2010 +0000
17227 cogl: adds convenience cogl_multiply_matrix function
17229 Quite often it's desirable to be able to multiply the current modelview
17230 matrix by an arbitrary matrix. Currently though you have to first
17231 explicitly call cogl_get_modelview_matrix to get the current modelview
17232 into a temporary variable, then you need to multiply it with your matrix
17233 using cogl_matrix_multiply and finally use cogl_set_modelview_matrix to
17234 make the result be the new modelview. This new convenience function lets
17235 more efficiently skip the first get and last set steps.
17237 clutter/cogl/cogl/cogl.c | 8 ++++++++
17238 clutter/cogl/cogl/cogl.h | 11 +++++++++++
17239 2 files changed, 19 insertions(+)
17241 commit 1dd70aff731ae8eba747d0dc914021067b1adadc
17242 Author: Robert Bragg <robert@linux.intel.com>
17243 Date: Fri Mar 19 09:16:08 2010 +0000
17245 cogl: rename cogl_enable to _cogl_enable
17247 Every now and then someone sees the cogl_enable API and gets confused,
17248 thinking its public API so this renames the symbol to be clear that it's
17249 is an internal only API.
17251 clutter/cogl/cogl/cogl-context.c | 2 +-
17252 clutter/cogl/cogl/cogl-internal.h | 4 +--
17253 clutter/cogl/cogl/cogl-journal.c | 6 ++--
17254 clutter/cogl/cogl/cogl-material.c | 2 +-
17255 clutter/cogl/cogl/cogl-path.c | 10 +++---
17256 clutter/cogl/cogl/cogl-primitives.c | 2 +-
17257 clutter/cogl/cogl/cogl-vertex-buffer.c | 2 +-
17258 clutter/cogl/cogl/cogl.c | 52 ++++++++++++++++----------------
17259 8 files changed, 40 insertions(+), 40 deletions(-)
17261 commit fdf608af4c01511699e5108da8e3ad639e0ee405
17262 Author: Neil Roberts <neil@linux.intel.com>
17263 Date: Wed Mar 31 19:03:02 2010 +0100
17265 test-cogl-tex-polygon: Actually use the material it creates
17267 test-cogl-tex-polygon creates a separate material so that it can set
17268 the texture filters. However in the paint functions that use
17269 cogl_polygon it was calling cogl_set_source_texture which replaces the
17270 material and ends up always using GL_LINEAR. This patch makes the
17271 paint functions assume the correct source is set up instead of trying
17272 to select a new source.
17274 tests/interactive/test-cogl-tex-polygon.c | 35 ++++++++++++-----------------
17275 1 file changed, 14 insertions(+), 21 deletions(-)
17277 commit 53cf25ef11fc8bab5dc3c541c77ced4b714d4ce3
17278 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17279 Date: Wed Mar 31 15:14:09 2010 +0100
17281 Add jhbuild moduleset
17283 Clutter should provide a moduleset for JHBuild, to allow building the
17284 whole Clutter stack within a separate prefix.
17286 build/clutter.modules | 301 +++++++++++++++++++++++++++++++++++++++++++++++++
17287 1 file changed, 301 insertions(+)
17289 commit 6fcc8c5bce08296151de418e472d2777c8b2abca
17290 Author: Owen W. Taylor <otaylor@fishsoup.net>
17291 Date: Fri Mar 26 00:41:46 2010 +0000
17293 x11: Use has_allocation() in TfP actor
17295 ClutterX11TexturePixmap calls get_allocation_box() when queueing a
17296 clipped redraw. If the allocation is not valid, and if we queue a
17297 lot of redraws in response to a series of damage events, the net
17298 result is that we spend all our time in a re-layout. We can
17299 short-circuit this by checking if the actor has a valid allocation, and
17300 if not, just queue a redraw - the actor will be allocated by the time it
17301 is going to be painted.
17303 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
17305 clutter/x11/clutter-x11-texture-pixmap.c | 18 +++++++++++-------
17306 1 file changed, 11 insertions(+), 7 deletions(-)
17308 commit 8df4a0b8fdbbff580aab4377dec9878c693d2440
17309 Author: Owen W. Taylor <otaylor@fishsoup.net>
17310 Date: Fri Mar 26 00:35:36 2010 +0000
17312 actor: Add has_allocation() method
17314 Add clutter_actor_has_allocation(), a method meant to be used when
17315 deciding whether to call clutter_actor_get_allocation_box() or any
17318 The get_allocation_box() method will, in case the allocation is invalid,
17319 perform a costly re-allocation cycle to ensure that the returned box
17320 is valid. The has_allocation() method is meant to be used if we have an
17321 actor calling get_allocation_box() from outside the place where the
17322 allocation is always guaranteed to be valid.
17324 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
17326 clutter/clutter-actor.c | 32 ++++++++++++++++++++++++++++
17327 clutter/clutter-actor.h | 2 ++
17328 doc/reference/clutter/clutter-sections.txt | 1 +
17329 3 files changed, 35 insertions(+)
17331 commit 7483f82566cad0359d305a4096f4263d91d4991a
17332 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17333 Date: Thu Mar 25 09:45:59 2010 +0000
17335 docs: Add 1.4 index to the API references
17337 Now that master has branched for the 1.3 development cycle.
17339 doc/reference/clutter/clutter-docs.xml.in | 5 +++++
17340 doc/reference/cogl/cogl-docs.xml.in | 5 +++++
17341 2 files changed, 10 insertions(+)
17343 commit 7b63da69cf294b4d076e405e0af5c8afe47c2253
17344 Author: José Dapena Paz <jdapena@igalia.com>
17345 Date: Wed Mar 17 16:16:09 2010 +0100
17347 Add "homogeneous" mode to ClutterBoxLayout.
17349 Added new "homogeneous" mode to ClutterBoxLayout, that makes layout children
17350 get all the same size.
17352 This is heavily inspired in the "homogeneous" attribute available in GtkBox,
17353 but simplified as we don't have padding nor borders in box layout, only
17356 Also added to test-box-layout a key to set/unset homogeneous mode.
17358 * Coding style fixes.
17359 * Added proper test for homogeneous mode in box layout.
17360 * Fix in homogeneous mode.
17362 http://bugzilla.openedhand.com/show_bug.cgi?id=2034
17364 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
17366 clutter/clutter-box-layout.c | 122 +++++++++++++++++++++++++++++++++--
17367 clutter/clutter-box-layout.h | 3 +
17368 tests/interactive/test-box-layout.c | 6 ++
17369 3 files changed, 126 insertions(+), 5 deletions(-)
17371 commit 5395a7a998a84ea9614d7745a4337094eb2e1383
17372 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17373 Date: Thu Mar 25 09:33:26 2010 +0000
17375 Use begin/end macros in cogl-primitives.h
17377 Protect the people using a C++ compiler from the dark abyss of C code.
17379 http://bugzilla.openedhand.com/show_bug.cgi?id=2049
17381 clutter/cogl/cogl/cogl-primitives.h | 6 ++++++
17382 1 file changed, 6 insertions(+)
17384 commit 6a8e1087576c295807835d877c87fcb79971b2eb
17385 Author: Neil Roberts <neil@linux.intel.com>
17386 Date: Wed Mar 24 15:32:28 2010 +0000
17388 clutter-actor: Rename y1 to y_1 to avoid a compiler warning
17390 Somebody somewhere decided it would be ok to define 'y1' as a global
17391 function in math.h thus condemning us to repeatedly making commits to
17392 fix these obnoxious compiler warnings about aliasing.
17394 clutter/clutter-actor.c | 20 ++++++++++----------
17395 1 file changed, 10 insertions(+), 10 deletions(-)
17397 commit 5de85051c324449b813adc43186f249f75289858
17398 Author: Adel Gadllah <adel.gadllah@gmail.com>
17399 Date: Sun Mar 21 13:12:58 2010 +0100
17401 Make sure GLX_SGI_swap_control is set up correctly
17403 glXSwapIntervalSGI only affects buffer swaps to the
17404 current GLX drawable.
17406 That means that calling it once in clutter_backend_glx_get_features
17407 isn't sufficent, so set it up in clutter_backend_glx_ensure_context to
17408 make sure it affects buffer swaps for the current drawable.
17410 http://bugzilla.openedhand.com/show_bug.cgi?id=2044
17412 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
17414 clutter/glx/clutter-backend-glx.c | 6 ++++++
17415 1 file changed, 6 insertions(+)
17417 commit 2fc8ecdb92e80e16510048c56bb07e5b87427f26
17418 Author: Owen W. Taylor <otaylor@fishsoup.net>
17419 Date: Fri Mar 19 18:18:17 2010 +0000
17421 glx: Clean up the clip area conditions
17423 Move the size check after the NULL check, add the clip height into the
17424 check logic and fix up the comment.
17426 http://bugzilla.openedhand.com/show_bug.cgi?id=2040
17428 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
17430 clutter/glx/clutter-stage-glx.c | 11 ++++++-----
17431 1 file changed, 6 insertions(+), 5 deletions(-)
17433 commit f935270aa01ac83ecb43212cb86bac63e76d5687
17434 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17435 Date: Fri Mar 19 16:24:34 2010 +0000
17437 script: Do not allocate memory when not needed
17439 When printing out the property value during a ClutterScript debug run we
17440 generate the value's content using g_strdup_value_contents() - though we
17441 do it unconditionally. The contents might not be printed (they most
17442 likely won't, actually) and will be freed afterwards. This is
17443 unnecessary: we can allocate the contents string after checking if we're
17444 going to print out the debug note, thus avoiding the whole
17445 allocation/free cycle unless strictly needed.
17447 clutter/clutter-actor.c | 19 ++++++++++---------
17448 1 file changed, 10 insertions(+), 9 deletions(-)
17450 commit a39cef41b85ca6f38f3e9c95fbd18de990f73b7f
17451 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17452 Date: Fri Mar 19 11:39:23 2010 +0000
17454 glx: Do not access stage_clip without checking it
17456 The stage_clip parameter for add_redraw_clip() can be NULL, so we need
17457 to check before accessing its members.
17459 clutter/glx/clutter-stage-glx.c | 7 ++++---
17460 1 file changed, 4 insertions(+), 3 deletions(-)
17462 commit 913c187f4e611aac71360863ca67640e4cfd1d41
17463 Author: Owen W. Taylor <otaylor@fishsoup.net>
17464 Date: Tue Mar 16 20:38:53 2010 -0400
17466 Switch texture units before calling _cogl_texture_set_filters()
17468 When setting up the state for a layer, we need to switch texture
17469 units before we do anything that might bind the texture, or
17470 we'll bind the wrong texture to the previous unit.
17472 http://bugzilla.openedhand.com/show_bug.cgi?id=2033
17474 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
17476 clutter/cogl/cogl/cogl-material.c | 9 ++++++---
17477 1 file changed, 6 insertions(+), 3 deletions(-)
17479 commit 66e0f187533f5ee322967cff8996c9f1e22d8361
17480 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17481 Date: Fri Mar 19 11:13:04 2010 +0000
17483 json: Update JsonParser
17485 Add another fix from upstream, to clean up the code.
17487 clutter/json/json-parser.c | 28 +++++++++++++---------------
17488 1 file changed, 13 insertions(+), 15 deletions(-)
17490 commit 295bc517f8a8789b335c7d8d7643cee8519b0ce3
17491 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17492 Date: Fri Mar 19 10:40:12 2010 +0000
17494 json: Update the internal copy of JsonGenerator
17496 The JsonGenerator we have inside Clutter as a fallback for a missing
17497 system copy of JSON-GLib is way out of date.
17499 clutter/json/json-generator.c | 177 +++++++++++++++++++++++++++++++++--------
17500 1 file changed, 143 insertions(+), 34 deletions(-)
17502 commit d21b7522f825d913317a8e62b86314a7737c7e43
17503 Author: Owen W. Taylor <otaylor@fishsoup.net>
17504 Date: Thu Mar 18 13:55:01 2010 -0400
17506 Fix errors in keeping track of the stage bounding rectangle
17508 * Add new clutter_geometry_union(), because writing union intersection
17509 is harder than it looks. Fixes two problems with the inline code in
17510 clutter_stage_glx_add_redraw_clip().
17512 1) The ->x and ->y of were reassigned to before using them to
17513 compute the new width and height.
17514 2) since ClutterGeometry has unsigned width, x + width is unsigned,
17515 and comparison goes wrong if either rectangle has a negative
17516 x + width. (We fixed width for GdkRectangle to be signed for GTK+-2.0,
17517 this is a potent source of bugs.)
17519 * Use in clutter_stage_glx_add_redraw_clip()
17521 * Account for the case where the incoming rectangle is empty, and don't
17522 end up with the stage being entirely redrawn.
17524 * Account for the case where the stage already has a degenerate
17525 width and don't end up with redrawing only the new rectangle and not
17526 the rest of the stage.
17528 The better fix here for the second two problems is to stop using a 0
17529 width to mean the entire stage, but this should work for now.
17531 http://bugzilla.openedhand.com/show_bug.cgi?id=2040
17533 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
17535 clutter/clutter-actor.c | 29 +++++++++++++++++++++++++++++
17536 clutter/clutter-types.h | 4 ++++
17537 clutter/glx/clutter-stage-glx.c | 26 +++++++-------------------
17538 3 files changed, 40 insertions(+), 19 deletions(-)
17540 commit bfd2b19290dc021862ee542c80ddd4e21a20cfef
17541 Author: Owen W. Taylor <otaylor@fishsoup.net>
17542 Date: Wed Mar 17 15:39:55 2010 -0400
17544 Set pixel store parameters before calling glGetTexImage
17546 We need to set up the rowstride and alignment properly in
17547 CoglTexture2D before reading texture data.
17549 http://bugzilla.openedhand.com/show_bug.cgi?id=2036
17551 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
17553 clutter/cogl/cogl/cogl-texture-2d.c | 3 +++
17554 1 file changed, 3 insertions(+)
17556 commit 9e0385304f7cff494c41ced5805393845f1e423a
17557 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17558 Date: Thu Mar 18 20:36:02 2010 +0000
17560 build: Mark --with-json=internal as experimental
17562 The system JSON-GLib installation should be the preferred way of parsing
17563 JSON in Clutter. The internal copy is limited by re-synchronization from
17564 upstream, and by the fact that upstream contains a fork of GScanner that
17565 allows parsing escaped UTF-8. We should warn users compiling Clutter
17566 with the internal copy, just like we warn about the internal image
17569 configure.ac | 8 ++++++--
17570 1 file changed, 6 insertions(+), 2 deletions(-)
17572 commit e1ad78ee183c973a210244ef845605ba9f11a373
17573 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17574 Date: Thu Mar 18 20:29:59 2010 +0000
17576 docs: Update the README
17578 Add a "requirements" section and detail all the build requirements for
17579 Clutter, depending on the platform.
17581 README | 38 +++++++++++++++++++++++++++++---------
17582 1 file changed, 29 insertions(+), 9 deletions(-)
17584 commit 7e700be7b8589e71255b9df601fcdc5bb35337a7
17585 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17586 Date: Thu Mar 18 20:27:18 2010 +0000
17588 build: Require xcomposite
17590 The X11TexturePixmap actor uses XComposite API directly, without guards.
17591 It has been doing so for a while, against the fact that we do check for
17592 the XComposite extension - but we don't depend on it. As soon as you try
17593 building Clutter on X11 without the XComposite extension available all
17596 The obvious fix is to make Clutter depend on XComposite - basically
17597 ratifying what's the current state of things.
17599 configure.ac | 6 ++----
17600 1 file changed, 2 insertions(+), 4 deletions(-)
17602 commit a8595aec13a48e449db15bcc65cc65fe8f3ecfaf
17603 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17604 Date: Thu Mar 18 20:20:09 2010 +0000
17606 script: Add more comments and annotations
17608 Detail why we are adding a fake id, and under which circumstances that
17609 happens. Also be more verbose with the debug annotations.
17611 clutter/clutter-script-parser.c | 31 +++++++++++++++++++++++++++----
17612 1 file changed, 27 insertions(+), 4 deletions(-)
17614 commit 203847d03c551ea13f87a78e636e0a74dc13c5fb
17615 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17616 Date: Thu Mar 18 17:44:14 2010 +0000
17618 script: Skip empty nodes
17620 If we get an empty node then we should skip it; this is really a
17621 workaround for something that is broken in JSON-GLib or in our use
17624 clutter/clutter-script-parser.c | 14 ++++++++++----
17625 1 file changed, 10 insertions(+), 4 deletions(-)
17627 commit d2bb57c3b2bc4ef7700735dcc4c6386b67fb4cc0
17628 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17629 Date: Thu Mar 18 14:15:33 2010 +0000
17631 Emit a critical warning if features are not initialized
17633 If you forgot to call clutter_init() then you currently end up with a
17634 warning saying that the stage cannot be initialized because the backend
17635 does not support multiple stages. Clearly not useful.
17637 We can catch some of the missing initialization in the features API,
17638 since we will likely end up asking for a feature at some point.
17640 clutter/clutter-feature.c | 11 ++++++++++-
17641 1 file changed, 10 insertions(+), 1 deletion(-)
17643 commit 54504b7ac46c92d996a08fa3957b702aea70af68
17644 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17645 Date: Wed Mar 17 17:41:52 2010 +0000
17647 glx: Remove unnecessary call to create_stage()
17649 If we are in the stage realization sequence we already have a GLX
17650 context set in the backend; there is no need to call create_backend().
17652 clutter/glx/clutter-stage-glx.c | 19 ++++---------------
17653 1 file changed, 4 insertions(+), 15 deletions(-)
17655 commit bf7e6ae587adaf3321ed56ec407ed2d432805f57
17656 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17657 Date: Wed Mar 17 17:28:20 2010 +0000
17659 Add error reporting for create_context() failures
17661 We kind of assume that stuff will break well before during the
17662 ClutterBackend::create_context() implementation if we fail to create a
17663 GL context. We do, however, have error reporting in place inside the
17664 Backend API to catch those cases. Unfortunately, since we switched to
17665 lazy initialization of the Stage, there can be a case of GL context
17666 creation failure that still leads to a successful initialization - and a
17667 segmentation fault later on. This is clearly Not Good™.
17669 Let's try to catch a failure in all the places calling create_context()
17670 and report back to the user the error in a meaningful way, before
17671 crashing and burning.
17673 clutter/clutter-backend.c | 20 +++++++++++++++++++-
17674 clutter/clutter-feature.c | 11 +++++++----
17675 clutter/clutter-main.c | 3 ++-
17676 clutter/clutter-private.h | 2 +-
17677 4 files changed, 29 insertions(+), 7 deletions(-)
17679 commit d735ac4807b556e3444ed9611691e44b00ddd915
17680 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17681 Date: Wed Mar 17 17:14:08 2010 +0000
17683 model: Let get_n_columns() return a sane value
17685 If you call get_n_columns() during the instance initialization phase but
17686 before set_name()/set_types() have been called, you'll get a (guint) -1.
17687 This is less than ideal.
17689 If columns haven't been initialized we should just return 0, which was
17690 the intent of the API since the beginning.
17692 Based on a patch by: Bastian Winkler <buz@netbuz.org>
17694 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
17696 clutter/clutter-model.c | 7 ++++++-
17697 1 file changed, 6 insertions(+), 1 deletion(-)
17699 commit 0a6497a3b6c4219e6a6a9310849159b00c864671
17700 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17701 Date: Tue Mar 16 18:57:28 2010 +0000
17703 model: Add a comment on the n_columns field type
17705 To avoid another bug report like:
17707 http://bugzilla.openedhand.com/show_bug.cgi?id=2017
17709 with a patch that gets applied without a proper review, resulting in a
17712 http://bugzilla.openedhand.com/show_bug.cgi?id=2032
17714 I should probably add a comment on why on earth we're using an integer
17715 as the n_columns member of the ClutterModelPrivate structure, and why it
17716 is important that it is initialized as -1.
17718 clutter/clutter-model.c | 9 +++++++++
17719 1 file changed, 9 insertions(+)
17721 commit de4abfac955641de9218d272e6aea1a8c618a577
17722 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17723 Date: Tue Mar 16 18:53:24 2010 +0000
17725 Revert "model: Use guint for the n_columns field"
17727 The int storage, and the initial value of -1, is used as a guard when
17728 subclassing ClutterListModel to allow the sub-class to call
17729 clutter_model_set_names() and clutter_model_set_types().
17731 This reverts commit c274118a8f7ed18e5bc703e614a9ea0a7cdb553c.
17733 clutter/clutter-model.c | 4 ++--
17734 1 file changed, 2 insertions(+), 2 deletions(-)
17736 commit 035d571e95b65437a6aeebe7c095d76807b95765
17737 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17738 Date: Tue Mar 16 10:44:40 2010 +0000
17740 Branch master for 1.3
17742 configure.ac | 6 +++---
17743 1 file changed, 3 insertions(+), 3 deletions(-)
17745 commit 4e946f538ca2871346a0fa3e918de439ac74ecc0
17746 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17747 Date: Mon Mar 15 16:40:50 2010 +0000
17749 Post-release version bump to 1.2.3
17751 configure.ac | 4 ++--
17752 1 file changed, 2 insertions(+), 2 deletions(-)
17754 commit 7b5692f8b362d8c39a165d7457fe4e88a67db9df
17755 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17756 Date: Mon Mar 15 16:25:46 2010 +0000
17760 configure.ac | 4 ++--
17761 1 file changed, 2 insertions(+), 2 deletions(-)
17763 commit 7a3fe4c056a64bcf04905b12cc35dd03f8c120fc
17764 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17765 Date: Mon Mar 15 16:04:34 2010 +0000
17769 NEWS | 29 +++++++++++++++++++++++++++++
17770 1 file changed, 29 insertions(+)
17772 commit 60d8369a1afaba4efdd64688e4157bc4b48b7525
17773 Author: Colin Walters <walters@verbum.org>
17774 Date: Fri Mar 12 17:39:27 2010 -0500
17776 Return and warn if a handle's refcount is <= 0
17778 This makes it more likely consumers notice invalid unreferences.
17779 GObject has the same assertion.
17781 http://bugzilla.openedhand.com/show_bug.cgi?id=2029
17783 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
17785 clutter/cogl/cogl/cogl-util.c | 1 +
17786 1 file changed, 1 insertion(+)
17788 commit c274118a8f7ed18e5bc703e614a9ea0a7cdb553c
17789 Author: Bastian Winkler <buz@netbuz.org>
17790 Date: Tue Mar 2 09:26:57 2010 +0100
17792 model: Use guint for the n_columns field
17794 clutter_model_get_n_columns is supposed to return a guint, so the
17795 n_columns field needs to be a guint with the initial value set to 0.
17797 http://bugzilla.openedhand.com/show_bug.cgi?id=2017
17799 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
17801 clutter/clutter-model.c | 4 ++--
17802 1 file changed, 2 insertions(+), 2 deletions(-)
17804 commit c2faaa4f39d3ad69523e806bffe4651545c0bdea
17805 Author: Neil Roberts <neil@linux.intel.com>
17806 Date: Tue Mar 9 16:37:52 2010 -0800
17808 cogl-texture-2d: Determine format before checking texture support
17810 When entering cogl_texture_2d_new_from_bitmap the internal format can
17811 be COGL_PIXEL_FORMAT_ANY. This was causing _cogl_texture_2d_can_create
17812 to use an invalid GL format type. Mesa apparently ignores this but it
17813 was causing errors when Cogl is compiled with debugging under NVidia.
17815 http://bugzilla.openedhand.com/show_bug.cgi?id=2026
17817 clutter/cogl/cogl/cogl-texture-2d.c | 3 +++
17818 1 file changed, 3 insertions(+)
17820 commit a25885edf294be0bc4a6710cc3fd7dec4b3ef013
17821 Author: Owen W. Taylor <otaylor@fishsoup.net>
17822 Date: Mon Mar 1 16:49:04 2010 -0500
17824 Fix checks for out-of-bounds coordinates and repeats
17826 Add a return result from CoglTexture.transform_quad_coords_to_gl(),
17827 so that we can properly determine the nature of repeats in
17828 the face of GL_TEXTURE_RECTANGLE_ARB, where the returned
17829 coordinates are not normalized.
17831 The comment "We also work out whether any of the texture
17832 coordinates are outside the range [0.0,1.0]. We need to do
17833 this after calling transform_coords_to_gl in case the texture
17834 backend is munging the coordinates (such as in the sub texture
17835 backend)." is disregarded and removed, since it's actually
17836 the virtual coordinates that determine whether we repeat,
17837 not the GL coordinates.
17839 Warnings about disregarded layers are used in all cases where
17840 applicable, including for subtextures.
17842 http://bugzilla.openedhand.com/show_bug.cgi?id=2016
17844 Signed-off-by: Neil Roberts <neil@linux.intel.com>
17846 clutter/cogl/cogl/cogl-atlas-texture.c | 2 +-
17847 clutter/cogl/cogl/cogl-primitives.c | 40 ++++++++++------------------
17848 clutter/cogl/cogl/cogl-sub-texture.c | 9 +++----
17849 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 22 ++++++++++++---
17850 clutter/cogl/cogl/cogl-texture-2d.c | 15 ++++++++---
17851 clutter/cogl/cogl/cogl-texture-private.h | 18 ++++++++++---
17852 clutter/cogl/cogl/cogl-texture.c | 2 +-
17853 7 files changed, 66 insertions(+), 42 deletions(-)
17855 commit 382b38c0f7fa79ed1679875db4c7b10e26fff039
17856 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17857 Date: Wed Mar 10 00:25:26 2010 +0000
17859 test-paint-wrapper: Request ARGB visuals on GLX
17861 If we are on GLX we have to request ARGB visuals, otherwise Clutter will
17862 not do it by itself.
17864 tests/interactive/test-paint-wrapper.c | 12 ++++++++++++
17865 1 file changed, 12 insertions(+)
17867 commit 6bd1846d6c39d27863a6fc89356324c0cb3a57ce
17868 Author: José Dapena Paz <jdapena@igalia.com>
17869 Date: Mon Mar 8 15:37:36 2010 +0100
17871 Fix argb initialisation.
17873 Fix clutter initialisation if argb visuals are enabled, setting a border
17874 color on creating the dummy window. This should avoid BadMatch happening
17875 when the depth of the root window visual is not the same of the depth
17876 of the argb visual.
17878 http://bugzilla.openedhand.com/show_bug.cgi?id=2011
17880 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
17882 clutter/glx/clutter-backend-glx.c | 3 ++-
17883 1 file changed, 2 insertions(+), 1 deletion(-)
17885 commit 3d2d932835bd74d497fcbec6695208be155924d0
17886 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17887 Date: Sun Mar 7 23:46:59 2010 +0000
17889 actor: Remove some double indirection
17891 Use an intermediate variable to avoid a double indirection when accessing
17892 the instance private data structure.
17894 clutter/clutter-actor.c | 44 ++++++++++++++++++++++++++++----------------
17895 1 file changed, 28 insertions(+), 16 deletions(-)
17897 commit 9ad1197cb21552cd0db03158eae0ce2742c52ede
17898 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17899 Date: Sun Mar 7 20:54:33 2010 +0000
17901 json: Improve strictness of the JSON parser
17903 Backport of the upstream JSON-GLib commit that improved the strictness
17906 The original upstream commit is:
17908 29881f03468db08bfb404cfcd5b61b4cdc419a87
17910 clutter/json/json-parser.c | 98 +++++++++++++++++++++++++++++++++++---------
17911 1 file changed, 79 insertions(+), 19 deletions(-)
17913 commit 7c6567704d0adc3a5456d5ac3bedb85fb6b55709
17914 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17915 Date: Fri Mar 5 11:39:32 2010 +0000
17917 Add test-cogl-texture-rectangle to the ignore file
17920 1 file changed, 1 insertion(+)
17922 commit ac074bc0f06658a59f05d1e1d0b149ccf5117448
17923 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17924 Date: Fri Mar 5 08:48:52 2010 +0000
17926 eglnative: Connect StageWindow.show and .hide
17928 The show() and hide() methods of the StageWindow interface are
17929 implemented but not assigned when initializing the interface
17932 clutter/eglnative/clutter-stage-egl.c | 2 ++
17933 1 file changed, 2 insertions(+)
17935 commit dbe2acc2b1dcba44964f7fafcb242dd346de5f40
17936 Author: Emmanuele Bassi <ebassi@linux.intel.com>
17937 Date: Wed Mar 3 18:17:15 2010 +0000
17939 docs: Update the HACKING.backends file
17941 The create_context() and ensure_context() sections should be more clear
17942 on the role of the functions, and their eventual caveats, like being
17943 called multiple times.
17945 doc/HACKING.backends | 9 ++++++++-
17946 1 file changed, 8 insertions(+), 1 deletion(-)
17948 commit c3a942abdec57583d0fc917b7578d574e5c1573d
17949 Author: Neil Roberts <neil@linux.intel.com>
17950 Date: Tue Mar 2 15:18:00 2010 +0000
17952 Add a conformance test for rectangle textures
17954 The test creates a GL_TEXTURE_RECTANGLE_ARB texture using
17955 cogl_texture_new_from_foreign and confirms that rendering it works
17956 correctly. If the rectangle texture extension isn't available then
17957 this test always succeeds.
17959 http://bugzilla.openedhand.com/show_bug.cgi?id=2015
17961 tests/conform/Makefile.am | 1 +
17962 tests/conform/test-cogl-texture-rectangle.c | 268 +++++++++++++++++++++++++++
17963 tests/conform/test-conform-main.c | 1 +
17964 3 files changed, 270 insertions(+)
17966 commit f13a42793a979cb514ea86121b3450e2e0a2e05e
17967 Author: Owen W. Taylor <otaylor@fishsoup.net>
17968 Date: Mon Mar 1 14:04:20 2010 -0500
17970 CoglTexture2DSliced: Handle TEXTURE_RECTANGLE_ARB
17972 In _cogl_texture_2d_sliced_foreach_sub_texture_in_region(), don't
17973 assert that the target is GL_TEXTURE_2D; instead conditionalize
17974 normalization on the target.
17976 http://bugzilla.openedhand.com/show_bug.cgi?id=2015
17978 clutter/cogl/cogl/cogl-texture-2d-sliced.c | 22 +++++++++++++---------
17979 1 file changed, 13 insertions(+), 9 deletions(-)
17981 commit 40b43fd64a7d5563d6b8b736c0ede625311934c2
17982 Author: Neil Roberts <neil@linux.intel.com>
17983 Date: Wed Mar 3 18:08:33 2010 +0000
17985 eglnative: Don't create a context if there already is one
17987 If the EGL context is already created then we shouldn't try to create
17988 another one. This was causing problems where one context would be
17989 created from calling _clutter_feature_init and the other was created
17990 from _clutter_backend_get_features. Cogl would set up its state using
17991 the first context and then assume the state was still valid when the
17992 second context became used so blending was not working correctly.
17994 http://bugzilla.openedhand.com/show_bug.cgi?id=2020
17996 clutter/eglnative/clutter-backend-egl.c | 3 +++
17997 1 file changed, 3 insertions(+)
17999 commit 169ce1508b29e7133f5033fa3f473b3d9ffdf577
18000 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18001 Date: Wed Mar 3 17:46:53 2010 +0000
18003 x11-texture-pixmap: Move signal handler override
18005 The signal handling override for the ::queue-damage-redraw should be
18006 done in the class initialization function, not in the instance one.
18008 clutter/x11/clutter-x11-texture-pixmap.c | 31 +++++++++++++++---------------
18009 1 file changed, 15 insertions(+), 16 deletions(-)
18011 commit 1b57800208fe1f34640c5001127eb570a24491f9
18012 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18013 Date: Wed Mar 3 17:02:51 2010 +0000
18017 Upstream "released" 1.18.
18019 clutter/cogl/cogl/stb_image.c | 1605 ++++++++++++++++++++++-------------------
18020 1 file changed, 862 insertions(+), 743 deletions(-)
18022 commit b19332a0bec7bb121ec62285b942ce880e547a95
18023 Author: Øyvind Kolås <pippin@linux.intel.com>
18024 Date: Wed Mar 3 15:45:43 2010 +0000
18026 animator: compare floating point values with an epsilon
18028 Direct comparisons with doubles are error prone.
18030 clutter/clutter-animator.c | 9 ++++++---
18031 1 file changed, 6 insertions(+), 3 deletions(-)
18033 commit 4168b216a3c062cc9d038e6ab71db4452ec116e4
18034 Author: Øyvind Kolås <pippin@linux.intel.com>
18035 Date: Wed Mar 3 15:46:19 2010 +0000
18037 animator: fix a crash in clutter_animator_compute_value
18039 Fix a crasher when there is only one key in the animator.
18041 clutter/clutter-animator.c | 3 +++
18042 1 file changed, 3 insertions(+)
18044 commit 824cd9a7ff20a764a031982317f38beb6fe135c2
18045 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18046 Date: Wed Mar 3 15:31:01 2010 +0000
18048 eglnative: Compilation fixes
18050 We should include <errno.h>, if we plan to use errno.
18052 Why, yes: I am that stupid.
18054 clutter/eglnative/clutter-backend-egl.c | 4 +++-
18055 clutter/eglnative/clutter-backend-egl.h | 2 +-
18056 clutter/eglnative/clutter-event-egl.c | 11 +++--------
18057 3 files changed, 7 insertions(+), 10 deletions(-)
18059 commit 52f8cd30cea1ac3b62c82d026a1d2d581c38e1c1
18060 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18061 Date: Wed Mar 3 10:49:34 2010 +0000
18063 docs: Fix gtk-doc annotation for ClutterStageManageClass
18065 Remove the semi-colon and use a colon for declaring the type.
18067 clutter/clutter-stage-manager.h | 2 +-
18068 1 file changed, 1 insertion(+), 1 deletion(-)
18070 commit a2f444ccbe4255e4386a9df40415a04637a296e2
18071 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18072 Date: Wed Mar 3 10:47:42 2010 +0000
18074 box: Fix allow-none annotation
18076 The syntax for allowing NULL is "allow-none", not "allow none".
18078 clutter/clutter-box.c | 4 ++--
18079 1 file changed, 2 insertions(+), 2 deletions(-)
18081 commit fa6070ec1a2bdbf5b5bd182b663ad5bdbdefb98d
18082 Author: Emmanuele Bassi <ebassi@linux.intel.com>
18083 Date: Tue Mar 2 19:41:44 2010 +0000
18085 Post-release version bump to 1.2.1
18087 configure.ac | 4 ++--
18088 1 file changed, 2 insertions(+), 2 deletions(-)