commit fc8c5f53bc8bc2b0ed4ef0fbbf7264ad66fb57c6
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jun 8 11:37:19 2010 +0100
Release 1.2.10 (stable)
NEWS | 22 ++++++++++++++++++++++
configure.ac | 4 ++--
2 files changed, 24 insertions(+), 2 deletions(-)
commit fadc0c61f437800ad96e557315db33ab0dbfc7f9
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jun 8 11:42:00 2010 +0100
Fix variable shadowing
clutter/clutter-actor.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
commit b9d973b91d200426171e1ea44097fecd2be881fa
Author: Damien Lespiau <damien.lespiau@intel.com>
Date: Thu Jun 3 13:48:53 2010 +0100
build: Fix out of tree gtk-doc generation
Various headers are build in builddirs (clutter-marshal.h, mkenums
headers and cogl-define.h) so we need to add the corresponding include
paths for gtk-doc to build its scanner.
(cherry picked from commit 582f2ced5fe3eca78f6c9e04543bc622b5858196)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
doc/reference/clutter/Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit f6c2901fced230db2b04ffdb044a75159b551f90
Author: Damien Lespiau <damien.lespiau@intel.com>
Date: Fri Jun 4 17:17:45 2010 +0100
build: Don't distribute clutter-version.h and cogl-defines.h
As with a351ff2af earlier, distributing headers generated at configure
time conflicts with out of tree builds as the distributed headers will
be included first instead of including the generated ones.
(cherry picked from commit cef4c8de769fd76dbcfb9f219b6ee1f2154b13e5)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/Makefile.am | 5 +++--
clutter/cogl/cogl/Makefile.am | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
commit b47b5b360061956567d960a27afeca32994aecba
Author: Damien Lespiau <damien.lespiau@intel.com>
Date: Thu Jun 3 11:59:48 2010 +0100
build: Do not distribute clutter-json.h
clutter-jon.h is generated at configure time, we should not distribute it.
This caused a build issue when compiling from a tarballs and out of tree
builds as we ended up with two clutter-json.h one in $(top_srcdir)/json
and the other in $(top_builddir)/json and picked up the wrong one
($(top_srcdir)/json is included first in the include search path).
(cherry picked from commit a351ff2afc1ac44f71fabc1219e928d2214f7bf8)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/Makefile.am | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
commit 839ebef44f49405ac13d8b8c5c62bfea2973dc3d
Author: Neil Roberts <neil@linux.intel.com>
Date: Fri May 28 18:12:53 2010 +0100
cogl-texture-2d: Regenerate the mipmaps when the texture is modified
When the texture is modified by cogl_texture_set_region, it wasn't
setting mipmaps_dirty so it would never update the mipmaps.
(cherry picked from commit a4fc5074faa3cda9d1c920ac94fe46e310a4ee2d)
clutter/cogl/cogl/cogl-texture-2d.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
commit bbede2036aea0dfe2516f81fbd58fef1ff832f81
Author: Brian Tarricone <brian@kakai.com>
Date: Thu Mar 25 20:55:31 2010 -0700
eglx: implement cogl_get_proc_address()
http://bugzilla.openedhand.com/show_bug.cgi?id=2124
(cherry picked from commit b0cc98fdceb7f2ba8bc377c085216cabc6232980)
clutter/cogl/cogl/winsys/cogl-eglx.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
commit 9682b4dcbf433b906993574e661efcd0028f7576
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue May 18 17:25:25 2010 +0100
eglx: Rename EGLNative{Window,Display}Type back to Native{Window,Display}Type
Commit e2a990d renamed these types to new names from EGL 1.3. However
it still works to use the old names under EGL 1.3 so let's just use
those to keep compatibility.
(cherry picked from commit 36903dfdcc0c549972a95056b6d7e417d207ca24)
clutter/eglx/clutter-backend-egl.c | 4 ++--
clutter/eglx/clutter-stage-egl.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
commit 5abb2fe244a5692fda50f5901a8f401a0607a73e
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue May 18 17:08:12 2010 +0100
clutter-backend-egl: Chain up in dispose before destroying the context
clutter_backend_egl_dispose now chains up before disposing its own
resources so that ClutterBackendX11 will destroy all of the stages
before we destroy the egl context. Otherwise the actors may try to
make GL calls during destruction which causes a crash.
(cherry picked from commit 4b239e1fe89d6f9c20c930f1cad4bdfcca88aa32)
clutter/eglx/clutter-backend-egl.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
commit 040c2404afa7c75e9a4421d7df0331d1f64fcfff
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue May 18 16:51:46 2010 +0100
clutter-stage-egl.c: Don't call eglWait*()
According to the docs, eglSwapBuffers performs an implicit glFlush
before swapping so there should be no need to wait.
(cherry picked from commit 6c3d1cfab9d21cd638854e0900d8bc17c4ebce9e)
clutter/eglx/clutter-stage-egl.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
commit e9d24b346259158384112022a991de21f2308687
Author: Brian Tarricone <brian@kakai.com>
Date: Thu Mar 25 19:44:37 2010 -0700
fix case when EGL driver doesn't support EGL_NATIVE_VISUAL_ID
Some EGL drivers, such as the PowerVR simulator (and some proprietary drivers)
return zero when the EGLConfig is queried for the EGL_NATIVE_VISUAL_ID
attribute via eglGetConfigAttrib().
This patch detects and attempts to work around that situation by picking a
visual with the same color depth.
http://bugzilla.openedhand.com/show_bug.cgi?id=2123
(cherry picked from commit c4ae1a55fa88cb01839b939220f7d1bd8a251ace)
clutter/eglx/clutter-backend-egl.c | 37 +++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 7 deletions(-)
commit 23de53f1260eb1d571de22563806192750f37a8b
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed May 5 17:30:00 2010 +0100
clutter-backend-egl: Create a dummy X window and EGL surface
After the EGL context is created it now also creates an invisible 1x1
window and a corresponding surface so that the context can be
immediately made current. This is similar to changes for the GLX
backend introduced in d2c091e62.
http://bugzilla.openedhand.com/show_bug.cgi?id=2056
(cherry picked from commit 26b061c3a80a81ec1fb19f61770ad4f6c3df40c1)
clutter/eglx/clutter-backend-egl.c | 80 ++++++++++++++++++++++++++++++++++--
clutter/eglx/clutter-backend-egl.h | 2 +
2 files changed, 78 insertions(+), 4 deletions(-)
commit 080187e8e2955e4b88dd37480a4d9522729d009c
Author: Brian Tarricone <brian@kakai.com>
Date: Thu Mar 25 19:37:26 2010 -0700
update backend to use lazy context/stage creation
http://bugzilla.openedhand.com/show_bug.cgi?id=2056
(cherry picked from commit e2a990dfd54761d147aec8b751ca6f5c29233652)
clutter/eglx/clutter-backend-egl.c | 171 +++++++++++++++++------
clutter/eglx/clutter-backend-egl.h | 3 +-
clutter/eglx/clutter-stage-egl.c | 278 ++++++++++++-----------------------
clutter/eglx/clutter-stage-egl.h | 3 +
4 files changed, 229 insertions(+), 226 deletions(-)
commit ebeade9a99019fec15434fd363c85795f440cbf0
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed May 12 18:57:52 2010 +0100
cogl-material: Set the blend equation even if blend funcs are the same
Previously it would only try to set the blend equation if the RGB and
alpha blending functions were different. However it's completely valid
to use a non-standard blending function when the functions are the
same. This patch moves the blending equation to outside the if
statement.
(cherry picked from commit 7caa10160dce6b7d8001421331133c4a00dfde52)
clutter/cogl/cogl/cogl-material.c | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
commit 7259c93e589c0c187cc4122a56b9b7f4122d8d07
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed May 12 15:19:09 2010 +0100
cogl-material: Set blend constant even if alpha and rgb factors are the same
Previously it would only set the blend constant if glBlendFuncSeparate
was used but it is perfectly acceptable to use the blend constant when
the same factor is used for each. It now sets the blend constant
whenever one of the factors would use the constant.
(cherry picked from commit dd9e7853ece631be48ac85e3a984bfb93a127b43)
clutter/cogl/cogl/cogl-material.c | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
commit 3dcdaf35dc2877b0d46c355b091202417ba20279
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed May 12 17:56:25 2010 +0100
cogl-blend-string: Don't split combined blend statements into two
When a single statement is used to specify the factors for both the
RGB and alpha parts it previously split up the statement into
two. This works but it ends up unnecessarily using glBlendFuncSeparate
when glBlendFunc would suffice.
For example, the blend statement
RGBA = ADD(SRC_COLOR*(SRC_COLOR), DST_COLOR*(1-SRC_COLOR))
would get split into the two statements
RGBA = ADD(SRC_COLOR*(SRC_COLOR[RGB]), DST_COLOR*(1-SRC_COLOR[RGB]))
A = ADD(SRC_COLOR*(SRC_COLOR[A]), DST_COLOR*(1-SRC_COLOR[A]))
That translates to:
glBlendFuncSeparate (GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR,
GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
This patch makes it so that arg_to_gl_blend_factor can handle the
combined RGBA mask instead. That way the single statement gets
translated to the equivalent call:
glBlendFunc (GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR);
(cherry picked from commit 502446ed8dc56ab9dccacbdd68f54306fe4d3558)
clutter/cogl/cogl/cogl-material.c | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
commit cec7d6a430f4ed02ee1fd90cddd6252ad4573fa8
Author: Owen W. Taylor <otaylor@fishsoup.net>
Date: Sat May 8 16:58:14 2010 -0400
cogl-framebuffer: Flush journal when creating fbo
Since framebuffer state is not flushed prior to replaying the journal,
the trick of marking the framebuffer dirty prior to calling
glBindFramebuffer() doesn't work... the outstanding journal entries
will get replayed to the newly created framebuffer.
Fix this by flushing the journal as well.
http://bugzilla.openedhand.com/show_bug.cgi?id=2110
Signed-off-by: Robert Bragg <robert@linux.intel.com>
(cherry picked from commit af37a1029ff86d082b55cebef6f59d227ab22da8)
clutter/cogl/cogl/cogl-framebuffer.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
commit caa5f57c915c0a5b22efb60a55a2d7465c5a8d65
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon May 10 10:22:43 2010 +0100
Post-release version bump to 1.2.9
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)