commit e9eaa5376b6d1506091ae55a7c6d85244d0bd265
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jun 14 14:11:17 2011 +0100
Clutter 1.6.16 (release)
NEWS | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 4 ++--
2 files changed, 54 insertions(+), 2 deletions(-)
commit 50684d870c0a520bc73333f1812857ed8984fd58
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jun 14 14:10:41 2011 +0100
build: Remove G_DISABLE_DEPRECATED
We cannot fix the API retroactively in a stable release.
clutter/Makefile.am | 1 -
clutter/cogl/cogl/Makefile.am | 1 -
2 files changed, 0 insertions(+), 2 deletions(-)
commit 16a0b84bca35e232d24762821ad7ea0ff5de0d5f
Author: Robert Bragg <robert@linux.intel.com>
Date: Wed Jun 8 17:52:28 2011 +0100
cogl-vertex-buffer: make sure to unref weak pipelines
When validating a user pipeline before drawing with a CoglVertexBuffer
we sometimes find we have to make some overrides and we handle that by
creating a pipeline which is a weak copy of the user pipeline. The weak
pipeline gets associated with the original pipeline so if that pipeline
is used multiple times then we can re-use the same override pipeline and
skip validation. Because it's a weak pipeline we get notified when the
original material is destroyed or changed so we know our weak pipeline
is now invalid.
When we get notified that the weak material is invalid we should unref
it, but instead we were just discarding our reference to it. This was
resulting in leaking weak materials and in some cases those materials
referenced textures which would then also be leaked.
Cherry-picked from Cogl's commit:
c603dc67ca13d26e3909196500da693a92654dee
clutter/cogl/cogl/cogl-vertex-buffer.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
commit de1114ffd9b65088f5119a9b7674d1bb8ff98a0e
Author: Neil Roberts <neil@linux.intel.com>
Date: Fri Jun 10 18:48:44 2011 +0100
cogl-texture-pixmap-x11: Fix the can_hardware_repeat wrapper
The wrapper for the can_hardware_repeat had a cut and paste error so
it would call the wrong function on the child texture.
Many thanks to Owen Taylor for finding this bug.
This is backported from 6d1371e0e9291a on the Cogl master branch.
clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 2ec7f74881f9c6f0b13668564cd2a983edb6838f
Author: Neil Roberts <neil@linux.intel.com>
Date: Mon Mar 7 18:17:32 2011 +0000
cogl-pango-render: Use the glyph size for unknown glyphs
When rendering a box for an unknown glyph it would previously just use
the average glyph size for the font. This causes problems because the
size calculations for the layout assume a different size so it can end
up rendering outside of the expected ink rectangle. This patch changes
it to query the size of the glyph in the font. Pango should end up
reporting the size of what would be the hex box which should be the
same as the sized used for the extents calculation.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
This is backported from commit db954565d4e9ffeb in Cogl master.
clutter/cogl/pango/cogl-pango-render.c | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
commit 49448d0991a60e239ea80728694daeced8e0664d
Author: Neil Roberts <neil@linux.intel.com>
Date: Mon Mar 7 18:53:07 2011 +0000
clutter-text: Use the ink rect in the paint volume
Previously ClutterText was just reporting the allocation as the paint
volume. The preferred size of a ClutterText is just the logical
rectangle of the layout. A pango layout can sometimes draw outside of
its logical rectangle for example with an italicised font with large
serifs. Additionally, ClutterText doesn't make any attempt to clip the
text if the actor gets allocated a size too small for the text so it
would also end up drawing outside of the paint volume in that case. To
fix this, the paint volume is now reported as the ink rect of the
Pango layout. The rectangle for the cursor and selection is also
unioned into that because it won't necessarily be within the ink
rectangle.
The function for drawing the selection rectangles has been split up
into a generic function that calculates the rectangles that need to be
drawn and a function that draws them. That way the get_paint_volume
virtual can share the code to calculate the rectangles.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
(cherry picked from commit fe83dee71246ef6fdad07c4cd59d59b433023ebd)
clutter/clutter-text.c | 362 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 271 insertions(+), 91 deletions(-)
commit f2f68d50f43955c60cda57b82f5d08b44e07876d
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue Mar 8 17:30:04 2011 +0000
clutter-text: Don't move the cursor to the left when at pos 0
When the cursor is at the leftmost position in the text the drawn
pixel position is moved to the left by the size of the cursor. There's
no explanation for why this happens and it doesn't seem to make any
sense so this patch removes it. It makes multi-line texts looks odd
because the cursor ends up at a different horizontal position when it
is on the first line from any other line. It also makes using
priv->cursor_pos difficult in any other part of the code because the
paint function modifies it.
The original patch that added this can be traced back to Tidy commit
c356487c15. There's no explanation in the commit message either.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
(cherry picked from commit 2505f5b0afadd49d8c5d54d8fb1bf57b9f2a6014)
clutter/clutter-text.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
commit 2505f5b0afadd49d8c5d54d8fb1bf57b9f2a6014
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed Jun 8 18:08:36 2011 +0100
Implement COGL_DEBUG=disable-texturing for ARBFp and GLSL fragends
The COGL_DEBUG=disable-texturing debug variable disables texturing in
the fixed function fragend by not bothering to enable the texture
targets. This wasn't working for the programmable fragends because the
texture targets don't need to be enabled to use them. This patch
modifies the two programmable backends to generate a constant value
for the texture lookups in the shader when the debug variable is
given.
This is backported from commit c3c080481952b33737bea in Cogl master.
clutter/cogl/cogl/cogl-pipeline-fragend-arbfp.c | 25 ++++++++++++++--------
clutter/cogl/cogl/cogl-pipeline-fragend-glsl.c | 9 ++++++++
2 files changed, 25 insertions(+), 9 deletions(-)
commit 378550c3d6561f6f7877f332a1c125a36e222204
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jun 8 13:25:26 2011 +0100
Skip CoglFixed accessors for GValue
Introspection is pointless for these.
clutter/clutter-fixed.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit dcace91d476085be76959d92b10d126df5292373
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue Mar 1 16:39:22 2011 +0000
clutter-actor: Redraw or relayout when clearing effects or constraints
When calling clutter_actor_clear_constraints the layout of the actor
may change so we need to queue a relayout. Similarly when the effects
are cleared we need to queue a redraw.
(cherry picked from commit 8df8d4ff0fa667cb25148b451ef754115f5c954b)
clutter/clutter-actor.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
commit 3dc3f8ea154c3a65765a24e5c41eb5f646ad2641
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date: Fri May 20 11:15:07 2011 +0200
clutter-offscreen-effect: use target size when setting up the viewport
https://bugzilla.gnome.org/show_bug.cgi?id=650650
(cherry picked from commit e59fff7a3f2d490b7a9b8dc8e149dfc20831a141)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-offscreen-effect.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
commit 40eaf1b915cff4b246e1f1b27797fca7df9840a2
Author: Craig R. Hughes <craig.git@rungie.com>
Date: Mon May 9 09:39:55 2011 -0700
osx: Handle bare modifier keypresses
http://bugzilla.clutter-project.org/show_bug.cgi?id=2644
(cherry picked from commit 9ecddeb1c3fce7bbd3fdb0096713e05a50e6ffcd)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/osx/clutter-event-osx.c | 85 ++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 5 deletions(-)
commit cbe1a705bf9629bb44fd4c30df1e9c7cae770998
Author: Peter Ward <peteraward@gmail.com>
Date: Sat May 28 00:12:15 2011 +1000
device: Prevent segfault
When disposing a slave device without a master.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2655
(cherry picked from commit c836b8c53c473e7d309c6c0c9d25b3ec74c827ff)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-input-device.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
commit 486e7a990605d6b825342eb91421969008f55e2f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jun 7 14:25:17 2011 +0100
actor: Avoid queueing redraws during destruction
If an actor or the stage to which it belongs are being destroyed then
there is no point in queueing a redraw that will not be seen anyway.
Bailing out early also avoids the case in which a redraw is queued
during destruction wil cause redraw entries will be added to the Stage,
which will take references on it and cause the Stage never to be
finalized.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2652
(cherry-picked from commit 19c986c0c6e0aa08ae76ab7d992fbf70ae5e44a0)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-actor.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 0513e0243aa393c66adf8976be66ef55dbbbb82e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jun 7 14:34:19 2011 +0100
stage: Bail out of do_update() when no impl is set
If the Stage has been destroyed the StageWindow implementation is not
going to be available, but the IN_DESTRUCTION flag will have already
been cleared.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2656
(cherry picked from commit 22cc9b35cb78e9b7a867a3c356647e15bf005c85)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-stage.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
commit 142b1e988d269bd674f3b7c7d2f00657c1b17fdf
Author: Kjartan Maraas <kmaraas@gnome.org>
Date: Tue Jun 7 16:45:45 2011 +0200
Add Norwegian bokmål translation.
po/nb.po | 2040 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 2040 insertions(+), 0 deletions(-)
commit 0c323266cace61f0add9c33cf28bc9d26b856f63
Author: Neil Roberts <neil@linux.intel.com>
Date: Fri May 27 12:29:09 2011 +0100
cogl-pipeline-fragend-fixed: Fix enabling texture targets
When flushing a pipeline that has more layers than the previous
pipeline, the fixed function fragend is supposed to detect that the
texture unit previously had no texture target enabled and then enable
it. However the logic for checking whether the unit was enabled was
broken due to a typing failure when unit->enabled and
unit->current_gl_target were combined into one value in commit
6b7139b0. This was breaking some of the conformance tests when the
fixed function fragend is used.
This was backported from 54f94a0ed07e2 in the Cogl master branch.
https://bugzilla.gnome.org/show_bug.cgi?id=650979
clutter/cogl/cogl/cogl-pipeline-fragend-fixed.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 930cf5483f984fc3fe924be10ce634cde689efd1
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue May 24 13:56:42 2011 +0100
cogl-pipeline-opengl: Don't use number of tex units on fixed-function
The CoglPipeline code uses a combination of GL_MAX_TEXTURE_COORDS,
GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS and GL_MAX_TEXTURE_UNITS to
determine the maximum number of layers to allow in a pipeline. However
on fixed function hardware that doesn't advertise either GLSL or ARBfp
it was still using the first two enums which will probably just return
0 and set a GLerror. This meant that we effectively didn't support
using any layers on purely fixed function hardware. This patch changes
it to only use those two enums if the appropriate extensions are
advertised and to always use GL_MAX_TEXTURE_UNITS except on GLES2
where there is no fixed function.
This is backported from 3f0cd9196c6bb8e672 on the Cogl master branch.
https://bugzilla.gnome.org/show_bug.cgi?id=650966
clutter/cogl/cogl/cogl-pipeline-opengl.c | 69 +++++++++++++++++++++--------
1 files changed, 50 insertions(+), 19 deletions(-)
commit a96ebe53510cf58c8e274affded44dd4e3d39530
Author: Dan Winship <danw@gnome.org>
Date: Thu May 19 10:46:24 2011 -0400
clutter-id-pool: fix warning on bad pick
Commit 13ac1fe7 purported to extend the _clutter_id_pool_lookup()
warning to the case where the id referred to a deleted actor, but did
not actually do so, because _clutter_id_pool_remove() set deleted IDs
to 0xdecafbad, not NULL. Fix this.
https://bugzilla.gnome.org/show_bug.cgi?id=650597
clutter/clutter-id-pool.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
commit a24fe849c864ef2e0ccc77c73a89cbb1d71e506f
Author: Neil Roberts <neil@linux.intel.com>
Date: Fri May 13 15:48:27 2011 +0100
clutter-actor: Store the queue redraw entry pointer
_clutter_stage_queue_actor_redraw returns a pointer to the
ClutterStageQueueRedrawEntry struct which it allocates. The actor is
expected to store a pointer to this so that it doesn't need to search
the list of queued redraws next time a queue redraw is called. However
_clutter_actor_queue_redraw_with_clip wasn't storing this pointer
which meant that it thought every queue redraw was the first queue
redraw. That meant that queueing a redraw with a clip would override
any previous attempts to queue a redraw instead of trying to combine
them.
This is based on commit d95258e987178 in the master branch.
clutter/clutter-actor.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
commit 523a6c0820249cd934dff9ca4e0b1e3a86f30679
Author: James Athey <james.athey@unleashbts.com>
Date: Mon Apr 11 14:26:45 2011 -0400
GL_IMG_TEXTURE_NPOT extension enables TEXTURE_NPOT features on GLES
Older drivers for PowerVR SGX hardware have the vendor-specific
GL_IMG_TEXTURE_NPOT extension instead of the
functionally-equivalent GL_OES_TEXTURE_NPOT extension.
(cherry picked from commit b80d5c81429097ede587906ce1b314a38af80012)
.../cogl/driver/gles/cogl-feature-functions-gles.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit fd33dd0668dfc6fbc935ffba824246200a87a5e0
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Apr 7 15:07:43 2011 +0100
build: Fix typo in the docs URI variable name
build/autotools/Makefile.am.release | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
commit 961f330dcf3fbdf70744ae1b399966d604f7a243
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed Apr 6 15:24:33 2011 +0100
cogl-pango-glyph-cache: Fix the flags passed to cogl_atlas_new
In 047227fb cogl_atlas_new was changed so that it can take a flags
parameter to specify whether to clear the new atlases and whether to
copy images to the new atlas after reorganisation. This was done so
that the atlas code could be shared with the glyph cache. At some
point during the development of this patch the flag was just a single
boolean instead and this is accidentally how it is used from the glyph
cache. The glyph cache therefore passes 'TRUE' as the set of flags
which means it will only get the 'clear' flag and not the
'disable-migration' flag. When the glyph cache gets full it will
therefore try to copy the texture to the new atlas as well as
redrawing them with cairo. This causes problems because the glyph
cache needs to work in situations where there is no FBO support.
(cherry picked from commit b36dde61939b270796ec6fd0df824cf1cd3ad514)
clutter/cogl/pango/cogl-pango-glyph-cache.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 1e59487defdc2979c45fe6d199fb8b58111837ba
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Apr 5 18:53:32 2011 +0100
Post-release version bump to 1.6.15
configure.ac | 4 ++--
po/clutter-1.0.pot | 4 ++--
po/de.po | 2 +-
po/fr.po | 2 +-
po/gl.po | 2 +-
po/id.po | 2 +-
po/it.po | 2 +-
po/nl.po | 2 +-
po/pa.po | 2 +-
po/pl.po | 2 +-
po/sv.po | 2 +-
po/te.po | 2 +-
po/uk.po | 2 +-
po/zh_CN.po | 2 +-
po/zh_TW.po | 2 +-
15 files changed, 17 insertions(+), 17 deletions(-)