[cogl/msvc-support: 17/17] Merge branch 'master' into msvc-support

[Chun-wei Fan <fanchunwei src gnome org>]

commit b7910af0c135a4e5001728f1d2c3db035804f892
Merge: d976324 221850e
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Jul 13 11:16:59 2011 +0800

    Merge branch 'master' into msvc-support

 .gitignore                                         |    1 +
 cogl-pango/Makefile.am                             |    2 +
 cogl-pango/cogl-pango-display-list.c               |   45 +-
 cogl/Makefile.am                                   |   39 +-
 cogl/cogl-atlas.c                                  |   24 +-
 cogl/cogl-attribute.c                              |  313 +++++-----
 cogl/cogl-blend-string.c                           |   43 +-
 cogl/cogl-buffer.c                                 |   76 +--
 cogl/cogl-clip-stack.c                             |   95 ++--
 cogl/cogl-context-private.h                        |   51 ++-
 cogl/cogl-context.c                                |  104 +++-
 cogl/cogl-context.h                                |    8 +-
 cogl/cogl-display-private.h                        |    1 +
 cogl/cogl-display.c                                |    3 +
 cogl/cogl-ext-functions.h                          |  644 ++++++++++++++++++++
 cogl/cogl-feature-private.c                        |   74 ++-
 cogl/cogl-feature-private.h                        |   24 +-
 cogl/cogl-framebuffer.c                            |  164 +++---
 cogl/cogl-framebuffer.h                            |   28 +-
 cogl/cogl-glx-renderer-private.h                   |   51 ++
 cogl/cogl-internal.h                               |   27 +-
 cogl/cogl-journal.c                                |   60 +-
 cogl/cogl-matrix-stack.c                           |  112 ++--
 cogl/cogl-pipeline-fragend-arbfp.c                 |   86 ++--
 cogl/cogl-pipeline-fragend-fixed.c                 |  130 ++--
 cogl/cogl-pipeline-fragend-glsl.c                  |   49 +-
 cogl/cogl-pipeline-opengl.c                        |  355 ++++++------
 cogl/cogl-pipeline-private.h                       |  131 +++--
 cogl/cogl-pipeline-progend-glsl.c                  |  203 ++++---
 cogl/cogl-pipeline-vertend-fixed.c                 |    7 +-
 cogl/cogl-pipeline-vertend-glsl.c                  |   79 +--
 cogl/cogl-pipeline.c                               |  274 +++++----
 cogl/cogl-pixel-buffer.c                           |    9 -
 cogl/cogl-primitives.c                             |    5 -
 cogl/cogl-private.h                                |   10 +-
 cogl/cogl-program.c                                |   77 +--
 cogl/cogl-renderer-private.h                       |    9 +
 cogl/cogl-renderer.c                               |   80 +++
 cogl/cogl-shader-boilerplate.h                     |   27 +-
 cogl/cogl-shader-private.h                         |    2 -
 cogl/cogl-shader.c                                 |  153 ++---
 cogl/cogl-texture-2d-sliced.c                      |   21 +-
 cogl/cogl-texture-2d.c                             |  178 +++---
 cogl/cogl-texture-3d.c                             |   93 ++--
 cogl/cogl-texture-driver.h                         |  363 ++++++------
 cogl/cogl-texture-private.h                        |    2 +-
 cogl/cogl-texture-rectangle.c                      |  164 +++---
 cogl/cogl-texture.c                                |  116 ++--
 cogl/cogl.c                                        |   71 +--
 cogl/cogl2-path.c                                  |   36 +-
 cogl/driver/gl/cogl-context-driver-gl.h            |   53 --
 cogl/driver/gl/cogl-feature-functions-gl.h         |  435 -------------
 cogl/driver/gl/cogl-gl.c                           |  111 ++--
 cogl/driver/gl/cogl-texture-driver-gl.c            |  197 ++++---
 cogl/driver/gles/cogl-context-driver-gles.h        |   52 --
 cogl/driver/gles/cogl-feature-functions-gles.h     |  153 -----
 cogl/driver/gles/cogl-gles.c                       |  125 ++--
 cogl/driver/gles/cogl-texture-driver-gles.c        |  179 ++++---
 cogl/winsys/cogl-winsys-egl.c                      |   37 +-
 cogl/winsys/cogl-winsys-glx.c                      |  299 ++++++---
 cogl/winsys/cogl-winsys-stub.c                     |    4 +-
 cogl/winsys/cogl-winsys-wgl.c                      |    9 +-
 configure.ac                                       |   96 ++-
 doc/reference/cogl-2.0-experimental/Makefile.am    |    2 +-
 ...cs.xml.in => cogl-2.0-experimental-docs.xml.in} |    0
 ...ions.txt => cogl-2.0-experimental-sections.txt} |   10 +-
 examples/x11-foreign.c                             |    9 +-
 67 files changed, 3481 insertions(+), 3009 deletions(-)
---