commit 7b5692f8b362d8c39a165d7457fe4e88a67db9df
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 15 16:25:46 2010 +0000
Release 1.2.2
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 7a3fe4c056a64bcf04905b12cc35dd03f8c120fc
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 15 16:04:34 2010 +0000
Update NEWS file
NEWS | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
commit 60d8369a1afaba4efdd64688e4157bc4b48b7525
Author: Colin Walters <walters@verbum.org>
Date: Fri Mar 12 17:39:27 2010 -0500
Return and warn if a handle's refcount is <= 0
This makes it more likely consumers notice invalid unreferences.
GObject has the same assertion.
http://bugzilla.openedhand.com/show_bug.cgi?id=2029
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/cogl/cogl/cogl-util.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit c274118a8f7ed18e5bc703e614a9ea0a7cdb553c
Author: Bastian Winkler <buz@netbuz.org>
Date: Tue Mar 2 09:26:57 2010 +0100
model: Use guint for the n_columns field
clutter_model_get_n_columns is supposed to return a guint, so the
n_columns field needs to be a guint with the initial value set to 0.
http://bugzilla.openedhand.com/show_bug.cgi?id=2017
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-model.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit c2faaa4f39d3ad69523e806bffe4651545c0bdea
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue Mar 9 16:37:52 2010 -0800
cogl-texture-2d: Determine format before checking texture support
When entering cogl_texture_2d_new_from_bitmap the internal format can
be COGL_PIXEL_FORMAT_ANY. This was causing _cogl_texture_2d_can_create
to use an invalid GL format type. Mesa apparently ignores this but it
was causing errors when Cogl is compiled with debugging under NVidia.
http://bugzilla.openedhand.com/show_bug.cgi?id=2026
clutter/cogl/cogl/cogl-texture-2d.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
commit a25885edf294be0bc4a6710cc3fd7dec4b3ef013
Author: Owen W. Taylor <otaylor@fishsoup.net>
Date: Mon Mar 1 16:49:04 2010 -0500
Fix checks for out-of-bounds coordinates and repeats
Add a return result from CoglTexture.transform_quad_coords_to_gl(),
so that we can properly determine the nature of repeats in
the face of GL_TEXTURE_RECTANGLE_ARB, where the returned
coordinates are not normalized.
The comment "We also work out whether any of the texture
coordinates are outside the range [0.0,1.0]. We need to do
this after calling transform_coords_to_gl in case the texture
backend is munging the coordinates (such as in the sub texture
backend)." is disregarded and removed, since it's actually
the virtual coordinates that determine whether we repeat,
not the GL coordinates.
Warnings about disregarded layers are used in all cases where
applicable, including for subtextures.
http://bugzilla.openedhand.com/show_bug.cgi?id=2016
Signed-off-by: Neil Roberts <neil@linux.intel.com>
clutter/cogl/cogl/cogl-atlas-texture.c | 2 +-
clutter/cogl/cogl/cogl-primitives.c | 40 ++++++++++------------------
clutter/cogl/cogl/cogl-sub-texture.c | 9 +++---
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 22 +++++++++++++--
clutter/cogl/cogl/cogl-texture-2d.c | 15 ++++++++--
clutter/cogl/cogl/cogl-texture-private.h | 18 ++++++++++--
clutter/cogl/cogl/cogl-texture.c | 2 +-
7 files changed, 66 insertions(+), 42 deletions(-)
commit 382b38c0f7fa79ed1679875db4c7b10e26fff039
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 10 00:25:26 2010 +0000
test-paint-wrapper: Request ARGB visuals on GLX
If we are on GLX we have to request ARGB visuals, otherwise Clutter will
not do it by itself.
tests/interactive/test-paint-wrapper.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
commit 6bd1846d6c39d27863a6fc89356324c0cb3a57ce
Author: José Dapena Paz <jdapena@igalia.com>
Date: Mon Mar 8 15:37:36 2010 +0100
Fix argb initialisation.
Fix clutter initialisation if argb visuals are enabled, setting a border
color on creating the dummy window. This should avoid BadMatch happening
when the depth of the root window visual is not the same of the depth
of the argb visual.
http://bugzilla.openedhand.com/show_bug.cgi?id=2011
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/glx/clutter-backend-glx.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 3d2d932835bd74d497fcbec6695208be155924d0
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Sun Mar 7 23:46:59 2010 +0000
actor: Remove some double indirection
Use an intermediate variable to avoid a double indirection when accessing
the instance private data structure.
clutter/clutter-actor.c | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
commit 9ad1197cb21552cd0db03158eae0ce2742c52ede
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Sun Mar 7 20:54:33 2010 +0000
json: Improve strictness of the JSON parser
Backport of the upstream JSON-GLib commit that improved the strictness
of JsonParser.
The original upstream commit is:
29881f03468db08bfb404cfcd5b61b4cdc419a87
clutter/json/json-parser.c | 98 +++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 19 deletions(-)
commit 7c6567704d0adc3a5456d5ac3bedb85fb6b55709
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 5 11:39:32 2010 +0000
Add test-cogl-texture-rectangle to the ignore file
.gitignore | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit ac074bc0f06658a59f05d1e1d0b149ccf5117448
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 5 08:48:52 2010 +0000
eglnative: Connect StageWindow.show and .hide
The show() and hide() methods of the StageWindow interface are
implemented but not assigned when initializing the interface
vtable.
clutter/eglnative/clutter-stage-egl.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
commit dbe2acc2b1dcba44964f7fafcb242dd346de5f40
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 3 18:17:15 2010 +0000
docs: Update the HACKING.backends file
The create_context() and ensure_context() sections should be more clear
on the role of the functions, and their eventual caveats, like being
called multiple times.
doc/HACKING.backends | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
commit c3a942abdec57583d0fc917b7578d574e5c1573d
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue Mar 2 15:18:00 2010 +0000
Add a conformance test for rectangle textures
The test creates a GL_TEXTURE_RECTANGLE_ARB texture using
cogl_texture_new_from_foreign and confirms that rendering it works
correctly. If the rectangle texture extension isn't available then
this test always succeeds.
http://bugzilla.openedhand.com/show_bug.cgi?id=2015
tests/conform/Makefile.am | 1 +
tests/conform/test-cogl-texture-rectangle.c | 268 +++++++++++++++++++++++++++
tests/conform/test-conform-main.c | 1 +
3 files changed, 270 insertions(+), 0 deletions(-)
commit f13a42793a979cb514ea86121b3450e2e0a2e05e
Author: Owen W. Taylor <otaylor@fishsoup.net>
Date: Mon Mar 1 14:04:20 2010 -0500
CoglTexture2DSliced: Handle TEXTURE_RECTANGLE_ARB
In _cogl_texture_2d_sliced_foreach_sub_texture_in_region(), don't
assert that the target is GL_TEXTURE_2D; instead conditionalize
normalization on the target.
http://bugzilla.openedhand.com/show_bug.cgi?id=2015
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
commit 40b43fd64a7d5563d6b8b736c0ede625311934c2
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed Mar 3 18:08:33 2010 +0000
eglnative: Don't create a context if there already is one
If the EGL context is already created then we shouldn't try to create
another one. This was causing problems where one context would be
created from calling _clutter_feature_init and the other was created
from _clutter_backend_get_features. Cogl would set up its state using
the first context and then assume the state was still valid when the
second context became used so blending was not working correctly.
http://bugzilla.openedhand.com/show_bug.cgi?id=2020
clutter/eglnative/clutter-backend-egl.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
commit 169ce1508b29e7133f5033fa3f473b3d9ffdf577
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 3 17:46:53 2010 +0000
x11-texture-pixmap: Move signal handler override
The signal handling override for the ::queue-damage-redraw should be
done in the class initialization function, not in the instance one.
clutter/x11/clutter-x11-texture-pixmap.c | 31 ++++++++++++++---------------
1 files changed, 15 insertions(+), 16 deletions(-)
commit 1b57800208fe1f34640c5001127eb570a24491f9
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 3 17:02:51 2010 +0000
Update stb_image.c
Upstream "released" 1.18.
clutter/cogl/cogl/stb_image.c | 1605 ++++++++++++++++++++++-------------------
1 files changed, 862 insertions(+), 743 deletions(-)
commit b19332a0bec7bb121ec62285b942ce880e547a95
Author: Øyvind Kolås <pippin@linux.intel.com>
Date: Wed Mar 3 15:45:43 2010 +0000
animator: compare floating point values with an epsilon
Direct comparisons with doubles are error prone.
clutter/clutter-animator.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
commit 4168b216a3c062cc9d038e6ab71db4452ec116e4
Author: Øyvind Kolås <pippin@linux.intel.com>
Date: Wed Mar 3 15:46:19 2010 +0000
animator: fix a crash in clutter_animator_compute_value
Fix a crasher when there is only one key in the animator.
clutter/clutter-animator.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
commit 824cd9a7ff20a764a031982317f38beb6fe135c2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 3 15:31:01 2010 +0000
eglnative: Compilation fixes
We should include <errno.h>, if we plan to use errno.
Why, yes: I am that stupid.
clutter/eglnative/clutter-backend-egl.c | 4 +++-
clutter/eglnative/clutter-backend-egl.h | 2 +-
clutter/eglnative/clutter-event-egl.c | 11 +++--------
3 files changed, 7 insertions(+), 10 deletions(-)
commit 52f8cd30cea1ac3b62c82d026a1d2d581c38e1c1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 3 10:49:34 2010 +0000
docs: Fix gtk-doc annotation for ClutterStageManageClass
Remove the semi-colon and use a colon for declaring the type.
clutter/clutter-stage-manager.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit a2f444ccbe4255e4386a9df40415a04637a296e2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 3 10:47:42 2010 +0000
box: Fix allow-none annotation
The syntax for allowing NULL is "allow-none", not "allow none".
clutter/clutter-box.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit fa6070ec1a2bdbf5b5bd182b663ad5bdbdefb98d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 2 19:41:44 2010 +0000
Post-release version bump to 1.2.1
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)