Neil Roberts 4e94500a2a Merge branch 'master' into cogl-float ...

The patches have been updated to apply cleanly.

The patches for the g_warnings in clutter-actor.c have been removed
because master now uses CLUTTER_UNITS_FORMAT so they aren't
necessary. The clutter-units.h patch now sets CLUTTER_UNITS_FORMAT to
'f'.

2009-01-15 18:26:22 +00:00

..

cogl-context.c

Support cogl_texture_multiple_rectangles in GL ES backend

2008-12-09 15:10:33 +00:00

cogl-context.h

Fix GLES 2 after the multiple-texture-rectangle branch merge

2009-01-13 16:52:39 +00:00

cogl-defines.h.in

…

cogl-fbo.c

2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>

2008-10-30 17:25:00 +00:00

cogl-fbo.h

…

cogl-fixed-fragment-shader.glsl

…

cogl-fixed-vertex-shader.glsl

…

cogl-gles2-wrapper.c

Fix GLES 2 after the multiple-texture-rectangle branch merge

2009-01-13 16:52:39 +00:00

cogl-gles2-wrapper.h

Merge branch 'master' into cogl-float

2009-01-15 18:26:22 +00:00

cogl-internal.h

* clutter/cogl/gl/cogl-internal.h

2008-11-18 16:23:40 +00:00

cogl-primitives.c

Bug 1172 - Disjoint paths and clip to path

2008-12-04 13:45:09 +00:00

cogl-program.c

2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com>

2008-11-18 15:21:02 +00:00

cogl-program.h

…

cogl-shader-private.h

2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>

2008-10-30 17:25:00 +00:00

cogl-shader.c

2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>

2008-10-30 17:25:00 +00:00

cogl-texture-private.h

A comparison of gl/cogl-texture.c and gles/cogl-texture.c, to reduce

2008-11-18 16:24:09 +00:00

cogl-texture.c

Fix GLES backends after merging the async-textures branch

2009-01-15 18:09:54 +00:00

cogl-util.c

…

cogl-util.h

…

cogl.c

Bug 1172 - Disjoint paths and clip to path

2008-12-04 13:45:09 +00:00

Makefile.am

Declare G_LOG_DOMAIN for COGL

2009-01-12 11:21:06 +00:00

stringify.sh

…