spec=1.7.0.. commit 3bc30603a968d7b04347eeb2d9754c045978483c Author: Neil Roberts Date: Fri Jul 1 15:03:34 2011 +0100 Release 1.7.2 (snapshot) configure.ac | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 636f177a3a0b2d795e76647bcde5762ce85c4676 Author: Neil Roberts Date: Fri Jul 1 14:58:56 2011 +0100 NEWS: Update for the 1.7.2 release This adds the new features and bugfixes in preparation for the 1.7.2 release. NEWS | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) commit cfe5a0a28589d11287544533e2784dc49f0abe5f Author: Neil Roberts Date: Fri Jul 1 15:34:49 2011 +0100 releasing: Fix the check for an even micro version number The check for the version number was checking against the 2.0.0 micro version number which isn't expected to change for a long time so the test was useless. build/autotools/Makefile.am.release | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit b11f6c9e11b4f15c846d56259ef8d879d5d3d2f7 Author: Neil Roberts Date: Fri Jul 1 16:20:32 2011 +0100 README: Fix the required version number replacements The README file is generated by the configure script so that it can include the required dependency version numbers. However there was no corresponding AC_SUBST calls for the versions so the README would be left with @THESE_MARKERS@. README.in | 2 +- configure.ac | 28 +++++++++++++++++++--------- 2 files changed, 20 insertions(+), 10 deletions(-) commit 50287dadffad6d96160e5233f7077e245cfa8c91 Author: Neil Roberts Date: Fri Jul 1 15:48:40 2011 +0100 release: Fix the release mail template The release template had the wrong version number and download URL and the subject was slightly different from what we used in the previous release. Also the parts split out from the README were including the -- separator. These have been removed using tail -n +1. The documentation section is updated to match the message used for the 1.7.0 release. There is now a note about the release being a development snapshot that only gets added depending on COGL_RELEASE_STATUS. build/autotools/Makefile.am.release | 41 ++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 15 deletions(-) commit a517242087b6ed641cc80e969f06e79196a5212e Author: Neil Roberts Date: Fri Jul 1 14:30:59 2011 +0100 gles: Fix the name of the GLeglImageOES type The function declarations for the GL_OES_EGL_image extension were using the wrong name for the GLeglImageOES type so it was getting build errors when compiling for GLES. cogl/driver/gles/cogl-feature-functions-gles.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit f0366907d3c878e1b0e172cb9a91f82e0cd35323 Author: Robert Bragg Date: Thu Jun 30 15:00:58 2011 +0100 build: egl fix typo introduced by 3b64a439f0 The XEvent argument for event_filter_cb was named "event" but the rest of the function is expecting a variable named "xevent". cogl/winsys/cogl-winsys-egl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 5dff6f6aa1976068bc2b11a80cd8f668dbc60bdd Author: Robert Bragg Date: Tue Jun 28 16:06:45 2011 +0100 renderer: split win32 api out into separate header This adds a cogl-win32-renderer.h for the win32 specific cogl-renderer API instead of having #ifdef guards in cogl-renderer.h Signed-off-by: Neil Roberts cogl/Makefile.am | 3 + cogl/cogl-renderer.h | 62 ---------------------------- cogl/cogl-win32-renderer.h | 97 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 62 deletions(-) commit cd6e1d183de0f8c85f0e957609e965675c4b280d Author: Robert Bragg Date: Tue Jun 28 14:57:05 2011 +0100 Updates wayland symbol names to be consistent This updates the public wayland symbols to follow the pattern cogl_wayland_blah instead of cogl_blah_wayland. Signed-off-by: Neil Roberts cogl/Makefile.am | 3 + cogl/cogl-renderer.h | 28 --------- cogl/cogl-wayland-renderer.h | 62 ++++++++++++++++++++ cogl/cogl.h | 3 + cogl/winsys/cogl-winsys-egl.c | 8 +- .../cogl-2.0-experimental/cogl-sections.txt | 8 +- 6 files changed, 76 insertions(+), 36 deletions(-) commit 89562dda73bdd69d2f09affd98d605fb2b9318d3 Author: Robert Bragg Date: Tue Jun 28 14:16:24 2011 +0100 work towards consistent platform file/symbol naming we've got into a bit of a mess with how we name platform specific symbols and files, so this is a first pass at trying to tidy that up. All platform specific symbols should be named like cogl__symbol_name and similarly files should be named like cogl--filename.c This patch tackles the X11 specific renderer/display APIs as a start. Signed-off-by: Neil Roberts cogl/Makefile.am | 15 +- cogl/cogl-display-glx-private.h | 57 ----- cogl/cogl-display-xlib-private.h | 35 --- cogl/cogl-glx-display-private.h | 57 +++++ cogl/cogl-glx-renderer-private.h | 61 ++++++ cogl/cogl-renderer-glx-private.h | 61 ------ cogl/cogl-renderer-x11-private.h | 32 --- cogl/cogl-renderer-xlib-private.h | 77 ------- cogl/cogl-renderer-xlib.c | 226 -------------------- cogl/cogl-renderer.c | 4 +- cogl/cogl-renderer.h | 95 -------- cogl/cogl-x11-renderer-private.h | 32 +++ cogl/cogl-xlib-display-private.h | 35 +++ cogl/cogl-xlib-renderer-private.h | 77 +++++++ cogl/cogl-xlib-renderer.c | 226 ++++++++++++++++++++ cogl/cogl-xlib-renderer.h | 127 +++++++++++ cogl/cogl-xlib.c | 8 +- cogl/cogl.h | 1 + cogl/winsys/cogl-winsys-egl.c | 42 ++-- cogl/winsys/cogl-winsys-glx.c | 132 ++++++------ .../cogl-2.0-experimental/cogl-sections.txt | 4 +- examples/x11-foreign.c | 2 +- 22 files changed, 721 insertions(+), 685 deletions(-) commit 3b64a439f08dd9fceebfdf5243c434334c9e61c2 Author: Robert Bragg Date: Tue Jun 28 13:38:50 2011 +0100 replace public native_event APIs with typesafe APIs This adds Xlib and Win32 typesafe replacements for cogl_renderer_handle_native_event, cogl_renderer_add_native_filter, cogl_renderer_remove_native_filter. The old functions are kept as an implementation detail so we can share code. Signed-off-by: Neil Roberts cogl/Makefile.am | 1 + cogl/cogl-renderer-private.h | 17 +++ cogl/cogl-renderer-xlib.c | 26 ++++ cogl/cogl-renderer.c | 16 ++-- cogl/cogl-renderer.h | 123 +++++++++++++++---- cogl/cogl-types.h | 22 ---- cogl/cogl-win32-renderer.c | 58 +++++++++ cogl/cogl-xlib.c | 2 +- cogl/winsys/cogl-texture-pixmap-x11.c | 15 +-- cogl/winsys/cogl-winsys-egl.c | 15 +-- cogl/winsys/cogl-winsys-glx.c | 15 +-- cogl/winsys/cogl-winsys-wgl.c | 20 ++-- .../cogl-2.0-experimental/cogl-sections.txt | 13 ++- examples/x11-foreign.c | 3 +- 14 files changed, 250 insertions(+), 96 deletions(-) commit f0a28f4287d509be8e9a320ad4c29ec2319490da Author: Robert Bragg Date: Tue Jun 28 12:43:01 2011 +0100 attribute: cleanup some sentinel array left over logic It used to be that we passed around NULL terminated arrays of attributes, but since 3c1e83c7f we now explicitly pass an n_attributes count instead. There were some leftovers of the old approach in the cogl_vdraw_[indexed]_attributes functions and also there was an off-by-one error with the n_attributes values passed on which was causing crashes. Signed-off-by: Neil Roberts cogl/cogl-attribute.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) commit 098a19380215104f4dcf3474b4155f2d1b04f03d Author: Robert Bragg Date: Mon Jun 27 21:09:27 2011 +0100 pipeline: Avoid reseting texture target for NULL textures When setting a NULL texture on a CoglPipeline we would also reset the texture target to a dummy value of 0. Reseting the target also had the effect of making fragends discard any associated program. In cases where the NULL texture was only transient until a replacement texture could be set we were re-running lots of redundant codegen and shader compilations. Signed-off-by: Neil Roberts cogl/cogl-pipeline.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) commit 256274bfcc7d41721ea343e8215a8ac5a5a6ea37 Author: Robert Bragg Date: Mon Jun 27 11:50:48 2011 +0100 pipeline: fix layer change notify mutex rule There is a documented rule that layer changes should only be notified to the fragend once; either as a pipeline change or as a layer change. When the number of layers associated with a material changes then that should get notified against the pipeline. All other layer changes get notified against the layer. There was a mistake in the _cogl_pipeline_add/remove_layer_difference functions, in that we weren't using the 'inc/dec_n_layers' boolean to determine if the fragend should be notified of the change. It was also noticed that the logic of _cogl_pipeline_prune_to_n_layers would also break this rule, by failing to notify some changes at all. Signed-off-by: Neil Roberts cogl/cogl-pipeline.c | 159 ++++++++++++++++++++----------------------------- 1 files changed, 65 insertions(+), 94 deletions(-) commit 34fd07a8fa7d46cec25bb9fcf1e9c402a85afcdd Author: Robert Bragg Date: Mon Jun 27 11:19:15 2011 +0100 2.0 reference: make various fixups in cogl-sections.txt This does some minor gardening in cogl-sections.txt, tweaking some of the section titles and removing some stale api references. Signed-off-by: Neil Roberts doc/reference/cogl-2.0-experimental/Makefile.am | 2 + .../cogl-2.0-experimental/cogl-sections.txt | 58 ++++++-------------- 2 files changed, 20 insertions(+), 40 deletions(-) commit b9d7181f03e4656a841d2a015c3b6f16b50c2f82 Author: Robert Bragg Date: Mon Jun 27 11:16:21 2011 +0100 buffer: Improve the CoglBuffer API description This improves the gtk-doc overview for the CoglBuffer interface. Signed-off-by: Neil Roberts cogl/cogl-buffer.h | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) commit 407fdcf3bc9ba4f62ea35b87badd08a732a7dc67 Author: Robert Bragg Date: Mon Jun 20 17:35:29 2011 +0100 docs: Adds cogl-index/attribute-buffer syms to 2.0 reference Signed-off-by: Neil Roberts .../cogl-2.0-experimental/cogl-sections.txt | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) commit 45f9f56b3e70ada201a9d94d97e339736c5a467d Author: Robert Bragg Date: Mon Jun 20 17:34:21 2011 +0100 docs: fix stale include links Signed-off-by: Neil Roberts .../cogl-2.0-experimental/cogl-docs.xml.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 871e9aa2fe8d50016d756939ab9706cec6c80db0 Author: Robert Bragg Date: Mon Jun 20 14:07:07 2011 +0100 docs: Fix typo to avoid duplicate section name Signed-off-by: Neil Roberts .../cogl-2.0-experimental/cogl-docs.xml.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8bb28d6f22e285f49b6dc15b8ea015d0aacddc74 Author: Robert Bragg Date: Mon Jun 20 13:54:26 2011 +0100 docs: Add swap-chain/onscreen-template to 2.0 reference This adds the cogl_swap_chain and cogl_onscreen_template symbols to the experimental 2.0 reference manual. Signed-off-by: Neil Roberts .../cogl-2.0-experimental/cogl-sections.txt | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) commit 51bc27cbf16378db30d589ff602794bf12359456 Author: Robert Bragg Date: Mon Jun 20 13:50:34 2011 +0100 docs: Adds CoglDisplay symbols to 2.0 reference Adds the cogl_display symbols to the experimental 2.0 reference manual. Signed-off-by: Neil Roberts .../cogl-2.0-experimental/cogl-sections.txt | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) commit 8c5594d8e7d322da239327bb9f9aa70bc48457c0 Author: Robert Bragg Date: Mon Jun 20 13:45:26 2011 +0100 docs: Add CoglRenderer documentation to 2.0 reference This lists the cogl_renderer symbols in the cogl-sections.txt for the experimental 2.0 reference manual. Signed-off-by: Neil Roberts .../cogl-2.0-experimental/cogl-sections.txt | 22 ++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) commit b3a105c576a00fdecd27982811ef6b085009291a Author: Robert Bragg Date: Mon Jun 20 13:29:12 2011 +0100 renderer: Expose winsys ID setter/getters This adds API to let you override the choice of Cogl's winsys backend. Previously it was only possible to override the winsys using the COGL_RENDERER environment variable, but it's useful for something like Clutter to be able to control the winsys via API without needing environment variable tricks. This also adds API to query back the winsys chosen by Cogl, in case you don't set an explicit override. Signed-off-by: Neil Roberts cogl/cogl-renderer-private.h | 1 + cogl/cogl-renderer.c | 31 +++++++++++++++++++-- cogl/cogl-renderer.h | 55 +++++++++++++++++++++++++++++++++++++ cogl/winsys/cogl-winsys-egl.c | 1 + cogl/winsys/cogl-winsys-glx.c | 1 + cogl/winsys/cogl-winsys-private.h | 4 +++ cogl/winsys/cogl-winsys-stub.c | 1 + cogl/winsys/cogl-winsys-wgl.c | 1 + 8 files changed, 92 insertions(+), 3 deletions(-) commit c4eb869bd737b2b27c95f1bf9123e34343e80741 Author: Robert Bragg Date: Wed Jun 15 00:06:29 2011 +0100 framebuffer: expose viewport getters/setters This exposes experimental cogl_framebuffer APIs for getting and setting a viewport without having to refer to the implicit CoglContext. It adds the following experimental API: cogl_framebuffer_set_viewport cogl_framebuffer_get_viewport4fv cogl_framebuffer_get_viewport_x cogl_framebuffer_get_viewport_y cogl_framebuffer_get_viewport_width cogl_framebuffer_get_viewport_height Signed-off-by: Neil Roberts cogl/cogl-framebuffer-private.h | 22 ---------------------- cogl/cogl-framebuffer.c | 22 +++++++++++----------- cogl/cogl-framebuffer.h | 29 +++++++++++++++++++++++++++++ cogl/cogl-journal.c | 3 +-- cogl/cogl-texture.c | 2 +- cogl/cogl.c | 12 ++++++------ 6 files changed, 48 insertions(+), 42 deletions(-) commit 716b88b0c87f3a862d799d0817c85372e1b30cd9 Author: Robert Bragg Date: Wed May 11 16:37:09 2011 +0100 Adds another example that draws a 3D crate Based on the Cogl example we had on wiki.clutter-project.org this shows how to use the primitive API to draw a simple spinning crate. Signed-off-by: Neil Roberts examples/Makefile.am | 11 ++- examples/crate.c | 275 ++++++++++++++++++++++++++++++++++++++++++++++++++ examples/crate.jpg | Bin 0 -> 171588 bytes 3 files changed, 285 insertions(+), 1 deletions(-) commit a1234ee8d14a6f5d11bf9b5c67d95aac5d94256e Author: Robert Bragg Date: Tue Jun 14 22:33:44 2011 +0100 Add internal _cogl_init() function This adds a _cogl_init function for Cogl that we expect to be the first thing called before anything else is done with Cogl. It's not a public API so it's expected that all entry points for Cogl that might be the first function used should call _cogl_init(). We currently call _cogl_init() in these functions: cogl_renderer_new cogl_display_new cogl_context_new cogl_android_set_native_window _cogl_init() can be called multiple times, and only the first call has any affect. For example _cogl_init() gives us a place check and parse the COGL_DEBUG environment variable. Since we don't have any need to parse command line arguments (we can always get user configuration options from the environment) our init function doesn't require argc/argv pointers. By saying up front that we aren't interested in command line arguments that means we can avoid the mess that is GOption based library initialization which is extremely fragile due to its lack of dependency tracking between modules. Signed-off-by: Neil Roberts cogl/cogl-context.c | 2 ++ cogl/cogl-debug.c | 26 +++++++++++++++++--------- cogl/cogl-debug.h | 3 +++ cogl/cogl-display.c | 3 +++ cogl/cogl-private.h | 3 +++ cogl/cogl-renderer.c | 3 +++ cogl/cogl.c | 14 ++++++++++++++ cogl/winsys/cogl-winsys-egl.c | 2 ++ 8 files changed, 47 insertions(+), 9 deletions(-) commit e5c4c1ce7c6bc1c06c6fce5d516cca2e76cc5620 Author: Neil Roberts Date: Wed Jun 29 13:50:11 2011 +0100 doc/RELEASING: Fix the check for diffs from origin/master The recommended command to check for differences from master to the remote master was using git log with a range from the local master to the remote master but this wouldn't work if the local master is ahead of the remote master because the range is backwards. This patch changes it to recommend git diff --stat instead because then the command would work even if the two branches have diverged. doc/RELEASING | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 38a728b45a3718d9db71c9dc46535ca188368627 Author: Emmanuele Bassi Date: Wed Jun 29 10:12:47 2011 +0100 build: Do not define "default" in m4 The "default" m4 conflicts with one of libtool's internal symbols, one that is used to determine whether the -fPIC argument should be used; this breaks compilation onf 64bit platforms. https://bugzilla.gnome.org/show_bug.cgi?id=653615 Signed-off-by: Emmanuele Bassi Signed-off-by: Neil Roberts configure.ac | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) commit 5496a6464dc81376db8debba7b95c88946a79088 Author: Adam Jackson Date: Wed Jun 15 13:51:03 2011 -0400 Typo fix in cogl-framebuffer Signed-off-by: Adam Jackson https://bugzilla.gnome.org/show_bug.cgi?id=652672 cogl/cogl-framebuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c2bbf90c2ea7fe0dcd63a4a940b2c10ec8a3dae8 Author: Robert Bragg Date: Wed Jun 15 14:52:21 2011 +0100 examples: pass COGL_DEP_LIBS as ldflags when linking To be sure our examples link with all the libraries required, we now simply pass the $(COGL_DEP_LIBS) as ldflags when linking them. examples/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 2f000c3c12ed8f454d86e6b92e388dad703ae189 Author: Robert Bragg Date: Tue Jun 14 20:16:47 2011 +0100 Post-release version bump to 1.7.1 configure.ac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) spec=1.6.0..1.7.0