Merge lp:~darkxst/ubuntu/raring/cogl/lp1163025 into lp:ubuntu/raring/cogl

[Tim Lunn]

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

=== modified file 'Makefile.in'
--- Makefile.in	2013-02-26 16:43:25 +0000
+++ Makefile.in	2013-04-01 22:12:24 +0000
@@ -55,7 +55,7 @@
 host_triplet = @host@
 @BUILD_COGL_PANGO_TRUE@am__append_1 = cogl-pango
 @BUILD_COGL_GLES2_TRUE@am__append_2 = cogl-gles2
-DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/README.in \
 	$(srcdir)/config.h.in $(srcdir)/config.h.win32.in \
 	$(top_srcdir)/build/autotools/Makefile.am.release \
@@ -349,6 +349,11 @@
 UPROF_REQ_VERSION = @UPROF_REQ_VERSION@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WAYLAND_CLIENT_CFLAGS = @WAYLAND_CLIENT_CFLAGS@
+WAYLAND_CLIENT_LIBS = @WAYLAND_CLIENT_LIBS@
+WAYLAND_REQ_VERSION = @WAYLAND_REQ_VERSION@
+WAYLAND_SERVER_CFLAGS = @WAYLAND_SERVER_CFLAGS@
+WAYLAND_SERVER_LIBS = @WAYLAND_SERVER_LIBS@
 XCOMPOSITE_REQ_VERSION = @XCOMPOSITE_REQ_VERSION@
 XFIXES_REQ_VERSION = @XFIXES_REQ_VERSION@
 XGETTEXT = @XGETTEXT@
 
=== modified file 'NEWS'
--- NEWS	2013-02-26 16:43:25 +0000
+++ NEWS	2013-04-01 22:12:24 +0000
@@ -1,3 +1,44 @@
+Cogl 1.14.0                                                        2013-03-25
+
+  • List of changes since Cogl 1.13.4
+
+  » New snippet hook location for adding global definitions that can
+    be shared amongst other snippets.
+  » Fixed some cases where it's not possible to reference the builtin
+    cogl_sampler* uniforms from a snippet.
+  » Fixes for building on Visual Studio.
+  » Fixed a problem with the workaround for the viewport bug in Mesa
+    which could leave a broken scissor when switching between
+    different sized framebuffers.
+  » Fix some cases where the depth buffer wouldn't get cleared in
+    cogl_framebuffer_clear*.
+  » Fix for leaking pipelines and textures when a pipeline is copied
+    but all of its layer properties are replaced.
+  » Fix for interleaving snippets with different hook points.
+  » The Cogland example Wayland compositor has been updated to the
+    Wayland 1.0 API.
+
+  • Bugzilla bugs closed since 1.13.4:
+
+  #686770 - _cogl_bitmap_unbind: assertion failed: (bitmap->bound)
+            for gnome-shell on nexus 7
+  #694537 - Fails to compile if the EGL stack doesn't implement
+            KHR_create_context
+  #694657 - cogl-buffer: Stop warning spam running in sw rendering
+
+Many thanks to:
+
+  Chun-wei Fan
+  Robert Bragg
+  Gheyret Kenji
+  Ján Kyselica
+  Bastien Nocera
+  Duarte Loreto
+  Milo Casagrande
+  Pavol Klačanský
+  Plamena Manolova
+  Tomeu Vizoso
+
 Cogl 1.13.4                                                        2013-02-21
 
   • List of changes since Cogl 1.13.2
 
=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2013-04-01 22:12:24 +0000
@@ -0,0 +1,169 @@
+README for Cogl 1.14.0
+===============================================================================
+
+Note: This file is delimited with -- markers so it is possible to split
+sections out for other purposes, such as for release notes.
+
+--
+DESCRIPTION
+-------------------------------------------------------------------------------
+
+Cogl is a small open source library for using 3D graphics hardware for
+rendering. The API departs from the flat state machine style of OpenGL and is
+designed to make it easy to write orthogonal components that can render without
+stepping on each others toes.
+
+As well as aiming for a nice API, we think having a single library as opposed
+to an API specification like OpenGL has a few advantages too; like being
+able to paper over the inconsistencies/bugs of different OpenGL
+implementations in a centralized place, not to mention the myriad of OpenGL
+extensions. It also means we are in a better position to provide utility
+APIs that help software developers since they only need to be implemented
+once and there is no risk of inconsistency between implementations.
+
+Having other backends, besides OpenGL, such as drm, Gallium or D3D are
+options we are interested in for the future.
+
+--
+REQUIREMENTS
+-------------------------------------------------------------------------------
+
+Cogl currently only requires:
+
+  • GLib ≥ 2.32.0
+  • OpenGL ≥ 1.3 (or 1.2 + multitexturing), or OpenGL ES 2.0 (or 1.1)
+  • GLX, AGL, WGL or an EGL implementation
+
+Cogl also has optional dependencies:
+
+  • GDK-Pixbuf ≥ 2.0
+     - for image loading
+  • Cairo ≥ 1.10
+     - for debugging texture atlasing (debug builds only)
+
+The optional Cogl Pango library requires:
+  • Cairo ≥ 1.10
+  • PangoCairo ≥ 1.20
+
+On X11, Cogl depends on the following extensions
+
+  • XComposite ≥ 0.4
+  • XDamage
+  • XExt
+  • XFixes ≥ 3
+
+For the Wayland backend, Cogl requires:
+  • Wayland ≥ 1.0.0
+
+When running with OpenGL, Cogl requires at least version 1.3
+or 1.2 with the multitexturing extension. However to build Cogl
+you will need the latest GL headers which can be obtained from:
+
+  http://www.khronos.org
+
+If you are building the API reference you will also need:
+
+  • GTK-Doc ≥ 1.13
+
+If you are building the additional documentation you will also need:
+
+  • xsltproc
+  • jw (optional, for generating PDFs)
+
+If you are building the Introspection data you will also need:
+
+  • GObject-Introspection ≥ 0.9.5
+
+GObject-Introspection is available from:
+
+  git://git.gnome.org/gobject-introspection
+
+If you want support for profiling Cogl you will also need:
+
+  • UProf ≥ 0.3
+
+UProf is available from:
+
+  git://github.com/rib/UProf.git
+
+--
+DOCUMENTATION
+-------------------------------------------------------------------------------
+
+The 1.x stable API is documented here:
+
+  http://developer.gnome.org/cogl/stable/
+
+The 1.x development API is documented here:
+
+  http://developer.gnome.org/cogl/1.$(COGL_1_MINOR_VERSION)
+
+The experimental 2.0 API is currently not hosted online but can be built
+by passing the --enable-gtk-doc option to ./configure when building
+and the documentation can then be found under
+doc/reference/cogl-2.0-experimental/html/index.html
+
+--
+LICENSE
+-------------------------------------------------------------------------------
+
+Most of Cogl is licensed under the terms of the GNU Lesser General Public
+License, version 2.1 or (at your option) later. Some files are licensed under
+more permissive licenses MIT or BSD style licenses though so please see
+individual files for details.
+
+--
+BUILDING AND INSTALLATION
+-------------------------------------------------------------------------------
+
+Please refer to the INSTALL document.
+
+--
+BUGS
+-------------------------------------------------------------------------------
+
+Please report bugs here:
+
+  http://bugzilla.gnome.org/enter_bug.cgi?product=cogl
+
+You will need a Bugzilla account.
+
+Please include the following in bug reports:
+
+  • what system you're running Cogl on;
+  • which version of Cogl you are using;
+  • which version of GLib and OpenGL (or OpenGL ES) you are using;
+  • which video card and which drivers you are using, including output of
+    glxinfo and xdpyinfo (if applicable);
+  • how to reproduce the bug.
+
+If you cannot reproduce the bug with one of the tests that come with
+Cogl's source code, it can help a lot to include a small test case
+displaying the bad behaviour.
+
+If the bug exposes a crash, the exact text printed out and a stack trace
+obtained using gdb are greatly appreciated.
+
+--
+CONTRIBUTING
+-------------------------------------------------------------------------------
+
+The CODING_STYLE file describes the coding style we use throughout Cogl,
+please try your best to conform to this style because the consistency
+really helps keep the code maintainable.
+
+We can accept contributions in several ways:
+  • Either as patches attached to bugs on bugzilla
+      - For this you may be interested in using git-bz.
+
+        See http://git.fishsoup.net/man/git-bz.html for details
+  • You can email us patches
+      - For this we recommend using git-send-email
+
+  • You can create a remote branch and ask us to pull from that for more
+    substantial changes.
+      - For this we recommend using github.
+
+Ideally standalone patches should be created using git format-patch since
+that makes it easiest to import the patch with a commit message into a
+git repository.
 
=== modified file 'README.in'
--- README.in	2012-09-25 10:07:06 +0000
+++ README.in	2013-04-01 22:12:24 +0000
@@ -52,6 +52,9 @@
   • XExt
   • XFixes ≥ @XFIXES_REQ_VERSION@
 
+For the Wayland backend, Cogl requires:
+  • Wayland ≥ @WAYLAND_REQ_VERSION@
+
 When running with OpenGL, Cogl requires at least version 1.3
 or 1.2 with the multitexturing extension. However to build Cogl
 you will need the latest GL headers which can be obtained from:
 
=== modified file 'build/Makefile.in'
--- build/Makefile.in	2013-02-26 16:43:25 +0000
+++ build/Makefile.in	2013-04-01 22:12:24 +0000
@@ -51,8 +51,8 @@
 host_triplet = @host@
 subdir = build
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in compile \
-	config.guess config.rpath config.sub install-sh ltmain.sh \
-	missing
+	config.guess config.rpath config.sub depcomp install-sh \
+	ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/autotools/acglib.m4 \
 	$(top_srcdir)/build/autotools/as-compiler-flag.m4 \
@@ -317,6 +317,11 @@
 UPROF_REQ_VERSION = @UPROF_REQ_VERSION@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WAYLAND_CLIENT_CFLAGS = @WAYLAND_CLIENT_CFLAGS@
+WAYLAND_CLIENT_LIBS = @WAYLAND_CLIENT_LIBS@
+WAYLAND_REQ_VERSION = @WAYLAND_REQ_VERSION@
+WAYLAND_SERVER_CFLAGS = @WAYLAND_SERVER_CFLAGS@
+WAYLAND_SERVER_LIBS = @WAYLAND_SERVER_LIBS@
 XCOMPOSITE_REQ_VERSION = @XCOMPOSITE_REQ_VERSION@
 XFIXES_REQ_VERSION = @XFIXES_REQ_VERSION@
 XGETTEXT = @XGETTEXT@
 
=== modified file 'build/win32/Makefile.in'
--- build/win32/Makefile.in	2013-02-26 16:43:25 +0000
+++ build/win32/Makefile.in	2013-04-01 22:12:24 +0000
@@ -315,6 +315,11 @@
 UPROF_REQ_VERSION = @UPROF_REQ_VERSION@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WAYLAND_CLIENT_CFLAGS = @WAYLAND_CLIENT_CFLAGS@
+WAYLAND_CLIENT_LIBS = @WAYLAND_CLIENT_LIBS@
+WAYLAND_REQ_VERSION = @WAYLAND_REQ_VERSION@
+WAYLAND_SERVER_CFLAGS = @WAYLAND_SERVER_CFLAGS@
+WAYLAND_SERVER_LIBS = @WAYLAND_SERVER_LIBS@
 XCOMPOSITE_REQ_VERSION = @XCOMPOSITE_REQ_VERSION@
 XFIXES_REQ_VERSION = @XFIXES_REQ_VERSION@
 XGETTEXT = @XGETTEXT@
 
=== modified file 'build/win32/vs10/Makefile.in'
--- build/win32/vs10/Makefile.in	2013-02-26 16:43:25 +0000
+++ build/win32/vs10/Makefile.in	2013-04-01 22:12:24 +0000
@@ -275,6 +275,11 @@
 UPROF_REQ_VERSION = @UPROF_REQ_VERSION@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WAYLAND_CLIENT_CFLAGS = @WAYLAND_CLIENT_CFLAGS@
+WAYLAND_CLIENT_LIBS = @WAYLAND_CLIENT_LIBS@
+WAYLAND_REQ_VERSION = @WAYLAND_REQ_VERSION@
+WAYLAND_SERVER_CFLAGS = @WAYLAND_SERVER_CFLAGS@
+WAYLAND_SERVER_LIBS = @WAYLAND_SERVER_LIBS@
 XCOMPOSITE_REQ_VERSION = @XCOMPOSITE_REQ_VERSION@
 XFIXES_REQ_VERSION = @XFIXES_REQ_VERSION@
 XGETTEXT = @XGETTEXT@
 
=== modified file 'build/win32/vs10/cogl-crate.vcxproj'
--- build/win32/vs10/cogl-crate.vcxproj	2013-01-10 12:49:09 +0000
+++ build/win32/vs10/cogl-crate.vcxproj	2013-04-01 22:12:24 +0000
@@ -71,7 +71,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -90,7 +90,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -114,7 +114,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -133,7 +133,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
 
=== modified file 'build/win32/vs10/cogl-pango.vcxproj'
--- build/win32/vs10/cogl-pango.vcxproj	2013-01-10 12:49:09 +0000
+++ build/win32/vs10/cogl-pango.vcxproj	2013-04-01 22:12:24 +0000
@@ -89,7 +89,7 @@
    <AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
    <ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
-   <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+   <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    <SubSystem>Windows</SubSystem>
    <TargetMachine>MachineX86</TargetMachine>
@@ -117,7 +117,7 @@
    <AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
    <ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
-   <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+   <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    <SubSystem>Windows</SubSystem>
    <TargetMachine>MachineX64</TargetMachine>
@@ -145,7 +145,7 @@
    <AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
    <ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
-   <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+   <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    <SubSystem>Windows</SubSystem>
    <OptimizeReferences>true</OptimizeReferences>
@@ -172,7 +172,7 @@
    <AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
    <ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
-   <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+   <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    <SubSystem>Windows</SubSystem>
    <OptimizeReferences>true</OptimizeReferences>
 
=== modified file 'build/win32/vs10/cogl-pango.vcxprojin'
--- build/win32/vs10/cogl-pango.vcxprojin	2013-01-10 12:49:09 +0000
+++ build/win32/vs10/cogl-pango.vcxprojin	2013-04-01 22:12:24 +0000
@@ -89,7 +89,7 @@
 			<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
 			<ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
-			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+			<ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
 			<TargetMachine>MachineX86</TargetMachine>
@@ -117,7 +117,7 @@
 			<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
 			<ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
-			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+			<ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
 			<TargetMachine>MachineX64</TargetMachine>
@@ -145,7 +145,7 @@
 			<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
 			<ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
-			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+			<ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
 			<OptimizeReferences>true</OptimizeReferences>
@@ -172,7 +172,7 @@
 			<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
 			<ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
-			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+			<ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
 			<OptimizeReferences>true</OptimizeReferences>
 
=== modified file 'build/win32/vs10/cogl.props'
--- build/win32/vs10/cogl.props	2013-01-10 12:49:09 +0000
+++ build/win32/vs10/cogl.props	2013-04-01 22:12:24 +0000
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
-    <GlibEtcInstallRoot>..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
-	<GlibMkEnumsPath>..\..\..\vs10\$(Platform)</GlibMkEnumsPath>
-    <CoglApiVersion>1.0</CoglApiVersion>
+    <VSVer>10</VSVer>
+    <GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+    <GlibEtcInstallRootFromBuildWin32>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRootFromBuildWin32>
+    <ApiVersion>1.0</ApiVersion>
     <BaseBuildDefines>_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG</BaseBuildDefines>
     <LibBuildDefines>HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines)</LibBuildDefines>
     <ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines>
@@ -45,13 +46,13 @@
 
 cd ..
 
-gen-enums.bat $(GlibMkEnumsPath)
+gen-enums.bat $(GlibEtcInstallRootFromBuildWin32)
 
-cd .\vs10
+cd .\vs$(VSVer)
 
 
     </PreBuildCmd>
-    <CoglDoInstall>
+<CoglDoInstall>
 mkdir $(CopyDir)
 
 mkdir $(CopyDir)\bin
@@ -65,141 +66,166 @@
 copy ..\*.bat $(CopyDir)\bin
 
 
-mkdir $(CopyDir)\share\cogl-$(CoglApiVersion)\examples-data
+mkdir $(CopyDir)\share\cogl-$(ApiVersion)\examples-data
 
-copy ..\..\..\examples\*.jpg $(CopyDir)\share\cogl-$(CoglApiVersion)\examples-data
+copy ..\..\..\examples\*.jpg $(CopyDir)\share\cogl-$(ApiVersion)\examples-data
 
 
 mkdir $(CopyDir)\lib
 
-copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(CoglApiVersion).lib $(CopyDir)\lib
-
-
-mkdir $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-mkdir $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl-pango
-
-copy ..\..\..\cogl-pango\cogl-pango.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl-pango
-
-copy ..\..\..\cogl\cogl-object.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-attribute-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-bitmap.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-color.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-deprecated.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-depth-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-euler.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-fixed.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-glib-source.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-material-compat.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-pipeline.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-vector.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-matrix.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-offscreen.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-onscreen.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-primitives.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-primitive-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-path.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-path-functions.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-pipeline-layer-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-pipeline-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-pixel-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-poll.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-quaternion.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-shader.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-snippet.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-texture-2d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-texture-2d-sliced.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-sub-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-texture-rectangle.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-meta-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-texture-3d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-types.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-vertex-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-index-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-indices.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-attribute.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-primitive.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-clip-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-framebuffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-clutter.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-defines.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-enum-types.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-
-copy ..\..\..\cogl\cogl-renderer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-swap-chain.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-onscreen-template.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-display.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-context.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-version.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl-win32-renderer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl1-context.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl2-path.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
-    </CoglDoInstall>
-    <CoglDoInstallSDL>
-copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-    </CoglDoInstallSDL>
+copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
+
+
+mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango
+
+copy ..\..\..\cogl-pango\cogl-pango.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango
+
+copy ..\..\..\cogl\cogl-object.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-attribute-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-bitmap.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-color.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-deprecated.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-depth-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-error.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-euler.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-fixed.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-frame-info.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-glib-source.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-material-compat.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-pipeline.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-vector.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-matrix.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-matrix-stack.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-offscreen.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-onscreen.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-output.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-primitives.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-primitive-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-path.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-path-functions.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-pipeline-layer-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-pipeline-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-pixel-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-poll.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-quaternion.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-shader.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-snippet.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-texture-2d.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-texture-2d-gl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-texture-2d-sliced.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-sub-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-texture-rectangle.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-meta-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-texture-3d.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-vertex-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-index-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-indices.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-attribute.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-primitive.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-clip-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-framebuffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-clutter.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-defines.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-enum-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+
+copy ..\..\..\cogl\cogl-renderer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-swap-chain.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-onscreen-template.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-display.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-context.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-version.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-win32-renderer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl1-context.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl2-path.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+</CoglDoInstall>
+<CoglDoInstallSDL>
+copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+</CoglDoInstallSDL>
+<DoGenGir>
+set VSVER=$(VSVer)
+
+set CONF=$(Configuration)
+
+set PLAT=$(Platform)
+
+set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)
+
+cd ..
+
+call gengir_pango.bat
+
+cd vs$(VSVer)
+</DoGenGir>
     <GenerateCoglDef>
          echo EXPORTS &gt; $(DefDir)\cogl.def
 
@@ -219,11 +245,11 @@
 
      </GenerateCoglPangoDef>
     <CoglLibtoolCompatibleDllPrefix>lib</CoglLibtoolCompatibleDllPrefix>
-    <CoglLibtoolCompatibleDllSuffix>-$(CoglApiVersion)-0</CoglLibtoolCompatibleDllSuffix>
-    <CoglSeparateVS10DllPrefix />
-    <CoglSeparateVS10DllSuffix>-1-vs10</CoglSeparateVS10DllSuffix>
-    <CoglDllPrefix>$(CoglSeparateVS10DllPrefix)</CoglDllPrefix>
-    <CoglDllSuffix>$(CoglSeparateVS10DllSuffix)</CoglDllSuffix>
+    <CoglLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</CoglLibtoolCompatibleDllSuffix>
+    <CoglSeparateVSDllPrefix />
+    <CoglSeparateVSDllSuffix>-1-vs$(VSVer)</CoglSeparateVSDllSuffix>
+    <CoglDllPrefix>$(CoglSeparateVSDllPrefix)</CoglDllPrefix>
+    <CoglDllSuffix>$(CoglSeparateVSDllSuffix)</CoglDllSuffix>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>coglprops</_PropertySheetDisplayName>
@@ -233,7 +259,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..;..\..\..\cogl;..\..\..\cogl\winsys;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>G_DISABLE_SINGLE_INCLUDES;COGL_HAS_GLIB_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -252,11 +278,8 @@
     <BuildMacro Include="DefDir">
       <Value>$(DefDir)</Value>
     </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRoot">
-      <Value>$(GlibMkEnumsPath)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CoglApiVersion">
-      <Value>$(CoglApiVersion)</Value>
+    <BuildMacro Include="ApiVersion">
+      <Value>$(ApiVersion)</Value>
     </BuildMacro>
     <BuildMacro Include="BaseBuildDefines">
       <Value>$(BaseBuildDefines)</Value>
@@ -309,11 +332,11 @@
     <BuildMacro Include="CoglLibtoolCompatibleDllSuffix">
       <Value>$(CoglLibtoolCompatibleDllSuffix)</Value>
     </BuildMacro>
-    <BuildMacro Include="CoglSeparateVS10DllPrefix">
-      <Value>$(CoglSeparateVS10DllPrefix)</Value>
+    <BuildMacro Include="CoglSeparateVSDllPrefix">
+      <Value>$(CoglSeparateVSDllPrefix)</Value>
     </BuildMacro>
-    <BuildMacro Include="CoglSeparateVS10DllSuffix">
-      <Value>$(CoglSeparateVS10DllSuffix)</Value>
+    <BuildMacro Include="CoglSeparateVSDllSuffix">
+      <Value>$(CoglSeparateVSDllSuffix)</Value>
     </BuildMacro>
     <BuildMacro Include="CoglDllPrefix">
       <Value>$(CoglDllPrefix)</Value>
 
=== modified file 'build/win32/vs10/cogl.sln'
--- build/win32/vs10/cogl.sln	2013-01-10 12:49:09 +0000
+++ build/win32/vs10/cogl.sln	2013-04-01 22:12:24 +0000
@@ -7,8 +7,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-hello", "cogl-hello.vcxproj", "{F5A43C12-7032-428E-A56A-D294075FA493}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-msaa", "cogl-msaa.vcxproj", "{44E864D4-8447-484D-9B16-D5405E0783CF}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-info", "cogl-info.vcxproj", "{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}"
@@ -49,14 +47,6 @@
 		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|Win32.Build.0 = Release|Win32
 		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.ActiveCfg = Release|x64
 		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.Build.0 = Release|x64
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.Build.0 = Debug|Win32
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.ActiveCfg = Debug|x64
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.Build.0 = Debug|x64
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.ActiveCfg = Release|Win32
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.Build.0 = Release|Win32
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|x64.ActiveCfg = Release|x64
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|x64.Build.0 = Release|x64
 		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.Build.0 = Debug|Win32
 		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.ActiveCfg = Debug|x64
 
=== modified file 'build/win32/vs10/cogl.vcxproj'
--- build/win32/vs10/cogl.vcxproj	2013-02-26 16:43:25 +0000
+++ build/win32/vs10/cogl.vcxproj	2013-04-01 22:12:24 +0000
@@ -133,7 +133,7 @@
   </PreBuildEvent>
   <ClCompile>
    <Optimization>Disabled</Optimization>
-   <AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+   <AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    <PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    <MinimalRebuild>true</MinimalRebuild>
    <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -150,7 +150,7 @@
    <AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
    <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-   <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+   <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    <SubSystem>Windows</SubSystem>
    <TargetMachine>MachineX86</TargetMachine>
@@ -165,7 +165,7 @@
   </PreBuildEvent>
   <ClCompile>
    <Optimization>Disabled</Optimization>
-   <AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+   <AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    <PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    <MinimalRebuild>true</MinimalRebuild>
    <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -182,7 +182,7 @@
    <AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
    <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-   <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+   <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    <SubSystem>Windows</SubSystem>
    <TargetMachine>MachineX86</TargetMachine>
@@ -197,7 +197,7 @@
   </PreBuildEvent>
   <ClCompile>
    <Optimization>Disabled</Optimization>
-   <AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+   <AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    <PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    <MinimalRebuild>true</MinimalRebuild>
    <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -214,7 +214,7 @@
    <AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
    <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-   <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+   <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    <SubSystem>Windows</SubSystem>
    <TargetMachine>MachineX64</TargetMachine>
@@ -229,7 +229,7 @@
   </PreBuildEvent>
   <ClCompile>
    <Optimization>Disabled</Optimization>
-   <AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+   <AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    <PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    <MinimalRebuild>true</MinimalRebuild>
    <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -246,7 +246,7 @@
    <AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
    <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-   <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+   <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    <SubSystem>Windows</SubSystem>
    <TargetMachine>MachineX64</TargetMachine>
@@ -261,7 +261,7 @@
   </PreBuildEvent>
   <ClCompile>
    <Optimization>MaxSpeed</Optimization>
-   <AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+   <AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    <IntrinsicFunctions>true</IntrinsicFunctions>
    <PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -278,7 +278,7 @@
    <AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
    <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-   <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+   <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    <SubSystem>Windows</SubSystem>
    <OptimizeReferences>true</OptimizeReferences>
@@ -295,7 +295,7 @@
   </PreBuildEvent>
   <ClCompile>
    <Optimization>MaxSpeed</Optimization>
-   <AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+   <AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    <IntrinsicFunctions>true</IntrinsicFunctions>
    <PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -312,7 +312,7 @@
    <AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
    <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-   <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+   <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    <SubSystem>Windows</SubSystem>
    <OptimizeReferences>true</OptimizeReferences>
@@ -328,7 +328,7 @@
    </Command>
   </PreBuildEvent>
   <ClCompile>
-   <AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+   <AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    <PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    <PrecompiledHeader>
@@ -343,7 +343,7 @@
    <AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
    <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-   <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+   <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    <SubSystem>Windows</SubSystem>
    <OptimizeReferences>true</OptimizeReferences>
@@ -359,7 +359,7 @@
    </Command>
   </PreBuildEvent>
   <ClCompile>
-   <AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+   <AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    <PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    <PrecompiledHeader>
@@ -374,7 +374,7 @@
    <AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
    <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-   <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+   <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    <SubSystem>Windows</SubSystem>
    <OptimizeReferences>true</OptimizeReferences>
@@ -505,8 +505,15 @@
     <ClCompile Include="..\..\..\cogl\.\cogl-error.c" />
     <ClCompile Include="..\..\..\cogl\.\cogl-glib-source.c" />
     <ClCompile Include="..\..\..\cogl\cogl-enum-types.c" />
-  <ClCompile Include="..\..\..\cogl\driver\gl\cogl-gl.c" />
-  <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-driver-gl.c" />
+  <ClCompile Include="..\..\..\cogl\driver\gl\gl\cogl-driver-gl.c" />
+  <ClCompile Include="..\..\..\cogl\driver\gl\gl\cogl-texture-driver-gl.c" />
+  <ClCompile Include="..\..\..\cogl\driver\gl\cogl-attribute-gl.c" />
+  <ClCompile Include="..\..\..\cogl\driver\gl\cogl-buffer-gl.c" />
+  <ClCompile Include="..\..\..\cogl\driver\gl\cogl-clip-stack-gl.c" />
+  <ClCompile Include="..\..\..\cogl\driver\gl\cogl-framebuffer-gl.c" />
+  <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-gl.c" />
+  <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-2d-gl.c" />
+  <ClCompile Include="..\..\..\cogl\driver\gl\cogl-util-gl.c" />
  </ItemGroup>
  <ItemGroup>
   <ResourceCompile Include="..\..\..\cogl\cogl.rc" />
 
=== modified file 'build/win32/vs10/cogl.vcxproj.filters'
--- build/win32/vs10/cogl.vcxproj.filters	2013-02-26 16:43:25 +0000
+++ build/win32/vs10/cogl.vcxproj.filters	2013-04-01 22:12:24 +0000
@@ -126,7 +126,14 @@
     <ClCompile Include="..\..\..\cogl\.\cogl-error.c"><Filter>Sources</Filter></ClCompile>
     <ClCompile Include="..\..\..\cogl\.\cogl-glib-source.c"><Filter>Sources</Filter></ClCompile>
     <ClCompile Include="..\..\..\cogl\cogl-enum-types.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
-    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-driver-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\gl\cogl-driver-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\gl\cogl-texture-driver-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-attribute-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-buffer-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-clip-stack-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-framebuffer-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-2d-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-util-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
   </ItemGroup>
 </Project>
 
=== modified file 'build/win32/vs10/cogl.vcxproj.filtersin'
--- build/win32/vs10/cogl.vcxproj.filtersin	2012-09-25 10:07:06 +0000
+++ build/win32/vs10/cogl.vcxproj.filtersin	2013-04-01 22:12:24 +0000
@@ -19,7 +19,14 @@
     <ClCompile Include="..\..\..\cogl\cogl-sdl.c"><Filter>Sources</Filter></ClCompile>
     <ClCompile Include="..\..\..\cogl\cogl-win32-renderer.c"><Filter>Sources</Filter></ClCompile>
 #include "cogl.vs10.sourcefiles.filters"
-    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
-    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-driver-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\gl\cogl-driver-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\gl\cogl-texture-driver-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-attribute-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-buffer-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-clip-stack-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-framebuffer-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-2d-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-util-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
   </ItemGroup>
 </Project>
 \ No newline at end of file
 
=== modified file 'build/win32/vs10/cogl.vcxprojin'
--- build/win32/vs10/cogl.vcxprojin	2013-01-10 12:49:09 +0000
+++ build/win32/vs10/cogl.vcxprojin	2013-04-01 22:12:24 +0000
@@ -133,7 +133,7 @@
 		</PreBuildEvent>
 		<ClCompile>
 			<Optimization>Disabled</Optimization>
-			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<MinimalRebuild>true</MinimalRebuild>
 			<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -150,7 +150,7 @@
 			<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
 			<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+			<ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
 			<TargetMachine>MachineX86</TargetMachine>
@@ -165,7 +165,7 @@
 		</PreBuildEvent>
 		<ClCompile>
 			<Optimization>Disabled</Optimization>
-			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<MinimalRebuild>true</MinimalRebuild>
 			<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -182,7 +182,7 @@
 			<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
 			<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+			<ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
 			<TargetMachine>MachineX86</TargetMachine>
@@ -197,7 +197,7 @@
 		</PreBuildEvent>
 		<ClCompile>
 			<Optimization>Disabled</Optimization>
-			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<MinimalRebuild>true</MinimalRebuild>
 			<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -214,7 +214,7 @@
 			<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
 			<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+			<ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
 			<TargetMachine>MachineX64</TargetMachine>
@@ -229,7 +229,7 @@
 		</PreBuildEvent>
 		<ClCompile>
 			<Optimization>Disabled</Optimization>
-			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<MinimalRebuild>true</MinimalRebuild>
 			<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -246,7 +246,7 @@
 			<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
 			<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+			<ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
 			<TargetMachine>MachineX64</TargetMachine>
@@ -261,7 +261,7 @@
 		</PreBuildEvent>
 		<ClCompile>
 			<Optimization>MaxSpeed</Optimization>
-			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<IntrinsicFunctions>true</IntrinsicFunctions>
 			<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -278,7 +278,7 @@
 			<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
 			<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+			<ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
 			<OptimizeReferences>true</OptimizeReferences>
@@ -295,7 +295,7 @@
 		</PreBuildEvent>
 		<ClCompile>
 			<Optimization>MaxSpeed</Optimization>
-			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<IntrinsicFunctions>true</IntrinsicFunctions>
 			<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -312,7 +312,7 @@
 			<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
 			<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+			<ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
 			<OptimizeReferences>true</OptimizeReferences>
@@ -328,7 +328,7 @@
 			</Command>
 		</PreBuildEvent>
 		<ClCompile>
-			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 			<PrecompiledHeader>
@@ -343,7 +343,7 @@
 			<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
 			<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+			<ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
 			<OptimizeReferences>true</OptimizeReferences>
@@ -359,7 +359,7 @@
 			</Command>
 		</PreBuildEvent>
 		<ClCompile>
-			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 			<PrecompiledHeader>
@@ -374,7 +374,7 @@
 			<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
 			<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+			<ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
 			<OptimizeReferences>true</OptimizeReferences>
@@ -398,8 +398,15 @@
 		</ClCompile>
 		<ClCompile Include="..\..\..\cogl\cogl-win32-renderer.c" />
 #include "cogl.vs10.sourcefiles"
-		<ClCompile Include="..\..\..\cogl\driver\gl\cogl-gl.c" />
-		<ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-driver-gl.c" />
+		<ClCompile Include="..\..\..\cogl\driver\gl\gl\cogl-driver-gl.c" />
+		<ClCompile Include="..\..\..\cogl\driver\gl\gl\cogl-texture-driver-gl.c" />
+		<ClCompile Include="..\..\..\cogl\driver\gl\cogl-attribute-gl.c" />
+		<ClCompile Include="..\..\..\cogl\driver\gl\cogl-buffer-gl.c" />
+		<ClCompile Include="..\..\..\cogl\driver\gl\cogl-clip-stack-gl.c" />
+		<ClCompile Include="..\..\..\cogl\driver\gl\cogl-framebuffer-gl.c" />
+		<ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-gl.c" />
+		<ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-2d-gl.c" />
+		<ClCompile Include="..\..\..\cogl\driver\gl\cogl-util-gl.c" />
 	</ItemGroup>
 	<ItemGroup>
 		<ResourceCompile Include="..\..\..\cogl\cogl.rc" />
 
=== modified file 'build/win32/vs10/install.vcxproj'
--- build/win32/vs10/install.vcxproj	2012-03-13 19:11:11 +0000
+++ build/win32/vs10/install.vcxproj	2013-04-01 22:12:24 +0000
@@ -102,10 +102,6 @@
       <Project>{f5a43c12-7032-428e-a56a-d294075fa493}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="cogl-msaa.vcxproj">
-      <Project>{44e864d4-8447-484d-9b16-d5405e0783cf}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="cogl-info.vcxproj">
       <Project>{cd17f5c8-c860-4a65-8209-4d0b093a3da3}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 
=== modified file 'build/win32/vs10/test-conformance-cogl.vcxproj'
--- build/win32/vs10/test-conformance-cogl.vcxproj	2013-02-26 16:43:25 +0000
+++ build/win32/vs10/test-conformance-cogl.vcxproj	2013-04-01 22:12:24 +0000
@@ -193,6 +193,7 @@
     <ClCompile Include="..\..\..\tests\conform\test-texture-get-set-data.c" />
     <ClCompile Include="..\..\..\tests\conform\test-framebuffer-get-bits.c" />
     <ClCompile Include="..\..\..\tests\conform\test-primitive-and-journal.c" />
+    <ClCompile Include="..\..\..\tests\conform\test-copy-replace-texture.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="cogl.vcxproj">
 
=== modified file 'build/win32/vs10/test-conformance-cogl.vcxproj.filters'
--- build/win32/vs10/test-conformance-cogl.vcxproj.filters	2013-02-26 16:43:25 +0000
+++ build/win32/vs10/test-conformance-cogl.vcxproj.filters	2013-04-01 22:12:24 +0000
@@ -46,5 +46,6 @@
     <ClCompile Include="..\..\..\tests\conform\test-texture-get-set-data.c"><Filter>Sources</Filter></ClCompile>
     <ClCompile Include="..\..\..\tests\conform\test-framebuffer-get-bits.c"><Filter>Sources</Filter></ClCompile>
     <ClCompile Include="..\..\..\tests\conform\test-primitive-and-journal.c"><Filter>Sources</Filter></ClCompile>
+    <ClCompile Include="..\..\..\tests\conform\test-copy-replace-texture.c"><Filter>Sources</Filter></ClCompile>
   </ItemGroup>
 </Project>
 
=== modified file 'build/win32/vs9/Makefile.in'
--- build/win32/vs9/Makefile.in	2013-02-26 16:43:25 +0000
+++ build/win32/vs9/Makefile.in	2013-04-01 22:12:24 +0000
@@ -275,6 +275,11 @@
 UPROF_REQ_VERSION = @UPROF_REQ_VERSION@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WAYLAND_CLIENT_CFLAGS = @WAYLAND_CLIENT_CFLAGS@
+WAYLAND_CLIENT_LIBS = @WAYLAND_CLIENT_LIBS@
+WAYLAND_REQ_VERSION = @WAYLAND_REQ_VERSION@
+WAYLAND_SERVER_CFLAGS = @WAYLAND_SERVER_CFLAGS@
+WAYLAND_SERVER_LIBS = @WAYLAND_SERVER_LIBS@
 XCOMPOSITE_REQ_VERSION = @XCOMPOSITE_REQ_VERSION@
 XFIXES_REQ_VERSION = @XFIXES_REQ_VERSION@
 XGETTEXT = @XGETTEXT@
 
=== modified file 'build/win32/vs9/cogl-crate.vcproj'
--- build/win32/vs9/cogl-crate.vcproj	2013-01-10 12:49:09 +0000
+++ build/win32/vs9/cogl-crate.vcproj	2013-04-01 22:12:24 +0000
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\&quot;../share/cogl-$(CoglApiVersion)/examples-data/\&quot;;$(BaseBuildDefines)"
+				PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\&quot;../share/cogl-$(ApiVersion)/examples-data/\&quot;;$(BaseBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -60,7 +60,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\&quot;../share/cogl-$(CoglApiVersion)/examples-data/\&quot;;$(BaseBuildDefines)"
+				PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\&quot;../share/cogl-$(ApiVersion)/examples-data/\&quot;;$(BaseBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -94,7 +94,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\&quot;../share/cogl-$(CoglApiVersion)/examples-data/\&quot;;$(BaseBuildDefines)"
+				PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\&quot;../share/cogl-$(ApiVersion)/examples-data/\&quot;;$(BaseBuildDefines)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -124,7 +124,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\&quot;../share/cogl-$(CoglApiVersion)/examples-data/\&quot;;$(BaseBuildDefines)"
+				PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\&quot;../share/cogl-$(ApiVersion)/examples-data/\&quot;;$(BaseBuildDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 
=== modified file 'build/win32/vs9/cogl-pango.vcproj'
--- build/win32/vs9/cogl-pango.vcproj	2013-01-10 12:49:09 +0000
+++ build/win32/vs9/cogl-pango.vcproj	2013-04-01 22:12:24 +0000
@@ -50,7 +50,7 @@
     OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
     LinkIncremental="2"
     ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
-    ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+    ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
     GenerateDebugInformation="true"
     SubSystem="2"
     TargetMachine="1"
@@ -87,7 +87,7 @@
     OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
     LinkIncremental="2"
     ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
-    ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+    ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
     GenerateDebugInformation="true"
     SubSystem="2"
     TargetMachine="17"
@@ -125,7 +125,7 @@
     OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
     LinkIncremental="1"
     ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
-    ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+    ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
     GenerateDebugInformation="true"
     SubSystem="2"
     OptimizeReferences="2"
@@ -161,7 +161,7 @@
     OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
     LinkIncremental="2"
     ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
-    ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+    ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
     GenerateDebugInformation="true"
     SubSystem="2"
     OptimizeReferences="2"
 
=== modified file 'build/win32/vs9/cogl-pango.vcprojin'
--- build/win32/vs9/cogl-pango.vcprojin	2013-01-10 12:49:09 +0000
+++ build/win32/vs9/cogl-pango.vcprojin	2013-04-01 22:12:24 +0000
@@ -50,7 +50,7 @@
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -87,7 +87,7 @@
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="17"
@@ -125,7 +125,7 @@
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -161,7 +161,7 @@
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 
=== modified file 'build/win32/vs9/cogl.sln'
--- build/win32/vs9/cogl.sln	2012-03-13 19:11:11 +0000
+++ build/win32/vs9/cogl.sln	2013-04-01 22:12:24 +0000
@@ -19,11 +19,6 @@
 		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-msaa", "cogl-msaa.vcproj", "{44E864D4-8447-484D-9B16-D5405E0783CF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-info", "cogl-info.vcproj", "{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
@@ -39,7 +34,6 @@
 	ProjectSection(ProjectDependencies) = postProject
 		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
 		{F5A43C12-7032-428E-A56A-D294075FA493} = {F5A43C12-7032-428E-A56A-D294075FA493}
-		{44E864D4-8447-484D-9B16-D5405E0783CF} = {44E864D4-8447-484D-9B16-D5405E0783CF}
 		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3} = {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}
 		{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
 		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF} = {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}
@@ -78,14 +72,6 @@
 		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|Win32.Build.0 = Release|Win32
 		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.ActiveCfg = Release|x64
 		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.Build.0 = Release|x64
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.Build.0 = Debug|Win32
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.ActiveCfg = Debug|x64
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.Build.0 = Debug|x64
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.ActiveCfg = Release|Win32
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.Build.0 = Release|Win32
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|x64.ActiveCfg = Release|x64
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|x64.Build.0 = Release|x64
 		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.Build.0 = Debug|Win32
 		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.ActiveCfg = Debug|x64
 
=== modified file 'build/win32/vs9/cogl.vcproj'
--- build/win32/vs9/cogl.vcproj	2013-02-26 16:43:25 +0000
+++ build/win32/vs9/cogl.vcproj	2013-04-01 22:12:24 +0000
@@ -35,7 +35,7 @@
    <Tool
     Name="VCCLCompilerTool"
     Optimization="0"
-    AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+    AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
     PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglBuildDefines)"
     MinimalRebuild="true"
     BasicRuntimeChecks="3"
@@ -54,7 +54,7 @@
     OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
     LinkIncremental="2"
     ModuleDefinitionFile="$(IntDir)\cogl.def"
-    ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+    ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
     GenerateDebugInformation="true"
     SubSystem="2"
     TargetMachine="1"
@@ -77,7 +77,7 @@
    <Tool
     Name="VCCLCompilerTool"
     Optimization="0"
-    AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+    AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
     PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglBuildDefines)"
     MinimalRebuild="true"
     BasicRuntimeChecks="3"
@@ -96,7 +96,7 @@
     OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
     LinkIncremental="2"
     ModuleDefinitionFile="$(IntDir)\cogl.def"
-    ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+    ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
     GenerateDebugInformation="true"
     SubSystem="2"
     TargetMachine="1"
@@ -118,7 +118,7 @@
    <Tool
     Name="VCCLCompilerTool"
     Optimization="0"
-    AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+    AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
     PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglBuildDefines)"
     MinimalRebuild="true"
     BasicRuntimeChecks="3"
@@ -137,7 +137,7 @@
     OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
     LinkIncremental="2"
     ModuleDefinitionFile="$(IntDir)\cogl.def"
-    ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+    ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
     GenerateDebugInformation="true"
     SubSystem="2"
     TargetMachine="17"
@@ -160,7 +160,7 @@
    <Tool
     Name="VCCLCompilerTool"
     Optimization="0"
-    AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+    AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
     PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglBuildDefines)"
     MinimalRebuild="true"
     BasicRuntimeChecks="3"
@@ -179,7 +179,7 @@
     OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
     LinkIncremental="2"
     ModuleDefinitionFile="$(IntDir)\cogl.def"
-    ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+    ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
     GenerateDebugInformation="true"
     SubSystem="2"
     TargetMachine="17"
@@ -202,7 +202,7 @@
    <Tool
     Name="VCCLCompilerTool"
     Optimization="2"
-    AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+    AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
     EnableIntrinsicFunctions="true"
     PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
     RuntimeLibrary="2"
@@ -221,7 +221,7 @@
     OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
     LinkIncremental="1"
     ModuleDefinitionFile="$(IntDir)\cogl.def"
-    ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+    ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
     GenerateDebugInformation="true"
     SubSystem="2"
     OptimizeReferences="2"
@@ -247,7 +247,7 @@
    <Tool
     Name="VCCLCompilerTool"
     Optimization="2"
-    AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+    AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
     EnableIntrinsicFunctions="true"
     PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
     RuntimeLibrary="2"
@@ -266,7 +266,7 @@
     OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
     LinkIncremental="1"
     ModuleDefinitionFile="$(IntDir)\cogl.def"
-    ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+    ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
     GenerateDebugInformation="true"
     SubSystem="2"
     OptimizeReferences="2"
@@ -289,7 +289,7 @@
    />
    <Tool
     Name="VCCLCompilerTool"
-    AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+    AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
     PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
     RuntimeLibrary="2"
     UsePrecompiledHeader="0"
@@ -306,7 +306,7 @@
     OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
     LinkIncremental="2"
     ModuleDefinitionFile="$(IntDir)\cogl.def"
-    ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+    ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
     GenerateDebugInformation="true"
     SubSystem="2"
     OptimizeReferences="2"
@@ -330,7 +330,7 @@
    />
    <Tool
     Name="VCCLCompilerTool"
-    AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+    AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
     PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
     RuntimeLibrary="2"
     UsePrecompiledHeader="0"
@@ -347,7 +347,7 @@
     OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
     LinkIncremental="2"
     ModuleDefinitionFile="$(IntDir)\cogl.def"
-    ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+    ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
     GenerateDebugInformation="true"
     SubSystem="2"
     OptimizeReferences="2"
@@ -486,8 +486,15 @@
    <File RelativePath="..\..\..\cogl\.\cogl-glib-source.c" />
    <File RelativePath="..\..\..\cogl\cogl-enum-types.c" />
    <Filter Name="Driver_GL" >
-    <File RelativePath="..\..\..\cogl\driver\gl\cogl-gl.c" />
-    <File RelativePath="..\..\..\cogl\driver\gl\cogl-texture-driver-gl.c" />
+    <File RelativePath="..\..\..\cogl\driver\gl\gl\cogl-driver-gl.c" />
+    <File RelativePath="..\..\..\cogl\driver\gl\gl\cogl-texture-driver-gl.c" />
+    <File RelativePath="..\..\..\cogl\driver\gl\cogl-attribute-gl.c" />
+    <File RelativePath="..\..\..\cogl\driver\gl\cogl-buffer-gl.c" />
+    <File RelativePath="..\..\..\cogl\driver\gl\cogl-clip-stack-gl.c" />
+    <File RelativePath="..\..\..\cogl\driver\gl\cogl-framebuffer-gl.c" />
+    <File RelativePath="..\..\..\cogl\driver\gl\cogl-texture-gl.c" />
+    <File RelativePath="..\..\..\cogl\driver\gl\cogl-texture-2d-gl.c" />
+    <File RelativePath="..\..\..\cogl\driver\gl\cogl-util-gl.c" />
    </Filter>
   </Filter>
   <Filter Name="Headers"
 
=== modified file 'build/win32/vs9/cogl.vcprojin'
--- build/win32/vs9/cogl.vcprojin	2013-01-10 12:49:09 +0000
+++ build/win32/vs9/cogl.vcprojin	2013-04-01 22:12:24 +0000
@@ -35,7 +35,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
 				PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -54,7 +54,7 @@
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\cogl.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
 				PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -96,7 +96,7 @@
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\cogl.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -118,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
 				PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -137,7 +137,7 @@
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\cogl.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="17"
@@ -160,7 +160,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
 				PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -179,7 +179,7 @@
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\cogl.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="17"
@@ -202,7 +202,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
 				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
 				RuntimeLibrary="2"
@@ -221,7 +221,7 @@
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\cogl.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -247,7 +247,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
 				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
 				RuntimeLibrary="2"
@@ -266,7 +266,7 @@
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\cogl.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -289,7 +289,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
 				PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -306,7 +306,7 @@
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\cogl.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -330,7 +330,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
 				PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -347,7 +347,7 @@
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\cogl.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -379,8 +379,15 @@
 			<File RelativePath="..\..\..\cogl\cogl-win32-renderer.c" />
 #include "cogl.sourcefiles"
 			<Filter Name="Driver_GL" >
-				<File RelativePath="..\..\..\cogl\driver\gl\cogl-gl.c" />
-				<File RelativePath="..\..\..\cogl\driver\gl\cogl-texture-driver-gl.c" />
+				<File RelativePath="..\..\..\cogl\driver\gl\gl\cogl-driver-gl.c" />
+				<File RelativePath="..\..\..\cogl\driver\gl\gl\cogl-texture-driver-gl.c" />
+				<File RelativePath="..\..\..\cogl\driver\gl\cogl-attribute-gl.c" />
+				<File RelativePath="..\..\..\cogl\driver\gl\cogl-buffer-gl.c" />
+				<File RelativePath="..\..\..\cogl\driver\gl\cogl-clip-stack-gl.c" />
+				<File RelativePath="..\..\..\cogl\driver\gl\cogl-framebuffer-gl.c" />
+				<File RelativePath="..\..\..\cogl\driver\gl\cogl-texture-gl.c" />
+				<File RelativePath="..\..\..\cogl\driver\gl\cogl-texture-2d-gl.c" />
+				<File RelativePath="..\..\..\cogl\driver\gl\cogl-util-gl.c" />
 			</Filter>
 		</Filter>
 		<Filter Name="Headers"
 
=== modified file 'build/win32/vs9/cogl.vsprops'
--- build/win32/vs9/cogl.vsprops	2013-01-10 12:49:09 +0000
+++ build/win32/vs9/cogl.vsprops	2013-04-01 22:12:24 +0000
@@ -9,7 +9,7 @@
 	<Tool
 		Name="VCCLCompilerTool"
 		AdditionalIncludeDirectories="..\..\..;..\..\..\cogl;..\..\..\cogl\winsys;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
-		PreprocessorDefinitions="G_DISABLE_SINGLE_INCLUDES;COGL_HAS_GLIB_SUPPORT"
+		PreprocessorDefinitions="G_DISABLE_SINGLE_INCLUDES"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
 	/>
 	<Tool
@@ -18,8 +18,16 @@
 		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
 	/>
 	<UserMacro
+		Name="VSVer"
+		Value="9"
+	/>
+	<UserMacro
 		Name="GlibEtcInstallRoot"
-		Value="..\..\..\..\vs9\$(PlatformName)"
+		Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
+	/>
+	<UserMacro
+		Name="GlibEtcInstallRootFromBuildWin32"
+		Value="..\..\..\vs$(VSVer)\$(PlatformName)"
 	/>
 	<UserMacro
 		Name="CopyDir"
@@ -30,11 +38,7 @@
 		Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
 	/>
 	<UserMacro
-		Name="GlibMkEnumsPath"
-		Value="..\..\..\vs9\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="CoglApiVersion"
+		Name="ApiVersion"
 		Value="1.0"
 	/>
 	<UserMacro
@@ -100,8 +104,8 @@
 :DONE_CONFIG_H&#x0D;&#x0A;
 
 cd ..&#x0D;&#x0A;
-gen-enums.bat $(GlibMkEnumsPath)&#x0D;&#x0A;
-cd .\vs9&#x0D;&#x0A;
+gen-enums.bat $(GlibEtcInstallRootFromBuildWin32)&#x0D;&#x0A;
+cd .\vs$(VSVer)&#x0D;&#x0A;
 
 "
 	/>
@@ -116,82 +120,100 @@
 
 copy ..\*.bat $(CopyDir)\bin&#x0D;&#x0A;
 
-mkdir $(CopyDir)\share\cogl-$(CoglApiVersion)\examples-data&#x0D;&#x0A;
-copy ..\..\..\examples\crate.jpg $(CopyDir)\share\cogl-$(CoglApiVersion)\examples-data&#x0D;&#x0A;
+mkdir $(CopyDir)\share\cogl-$(ApiVersion)\examples-data&#x0D;&#x0A;
+copy ..\..\..\examples\crate.jpg $(CopyDir)\share\cogl-$(ApiVersion)\examples-data&#x0D;&#x0A;
 
 mkdir $(CopyDir)\lib&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(CoglApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-mkdir $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl-pango&#x0D;&#x0A;
-copy ..\..\..\cogl-pango\cogl-pango.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl-pango&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-object.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-attribute-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-bitmap.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-color.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-deprecated.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-depth-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-euler.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-fixed.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-glib-source.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-material-compat.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-pipeline.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-quaternion.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-vector.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-matrix.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-offscreen.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-onscreen.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-primitives.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-primitive-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-path.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-path-functions.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-pipeline-layer-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-pipeline-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-pixel-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-poll.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-shader.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-snippet.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-texture-2d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-texture-2d-sliced.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-sub-texture.h  $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-texture-rectangle.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-meta-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-texture-3d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-types.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-vertex-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-index-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-indices.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-attribute.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-primitive.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-clip-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-framebuffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-clutter.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-defines.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-enum-types.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-
-copy ..\..\..\cogl\cogl-renderer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-swap-chain.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-onscreen-template.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-display.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-context.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-version.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-win32-renderer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl1-context.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl2-path.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-
-mkdir $(CopyDir)\share\cogl-$(CoglApiVersion)\tests&#x0D;&#x0A;
-copy ..\..\..\tests\data\valgrind.suppressions $(CopyDir)\share\cogl-$(CoglApiVersion)\tests&#x0D;&#x0A;
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+
+mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango&#x0D;&#x0A;
+copy ..\..\..\cogl-pango\cogl-pango.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-object.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-attribute-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-bitmap.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-color.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-deprecated.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-depth-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-error.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-euler.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-fixed.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-frame-info.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-glib-source.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-material-compat.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-pipeline.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-quaternion.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-vector.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-matrix.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-matrix-stack.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-offscreen.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-onscreen.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-output.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-primitives.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-primitive-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-path.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-path-functions.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-pipeline-layer-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-pipeline-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-pixel-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-poll.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-shader.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-snippet.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-texture-2d.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-texture-2d-gl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-texture-2d-sliced.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-sub-texture.h  $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-texture-rectangle.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-meta-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-texture-3d.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-vertex-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-index-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-indices.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-attribute.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-primitive.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-clip-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-framebuffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-clutter.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-defines.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-enum-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+
+copy ..\..\..\cogl\cogl-renderer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-swap-chain.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-onscreen-template.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-display.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-context.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-version.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-win32-renderer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl1-context.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl2-path.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+
+mkdir $(CopyDir)\share\cogl-$(ApiVersion)\tests&#x0D;&#x0A;
+copy ..\..\..\tests\data\valgrind.suppressions $(CopyDir)\share\cogl-$(ApiVersion)\tests&#x0D;&#x0A;
 "
 	/>
 	<UserMacro
 		Name="CoglDoInstallSDL"
 		Value="
-copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
+			  "
+	/>
+	<UserMacro
+		Name="DoGenGir"
+		Value="
+set VSVER=$(VSVer)&#x0D;&#x0A;
+set CONF=$(ConfigurationName)&#x0D;&#x0A;
+set PLAT=$(PlatformName)&#x0D;&#x0A;
+set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)&#x0D;&#x0A;
+
+cd ..&#x0D;&#x0A;
+call gengir_cogl.bat&#x0D;&#x0A;
+cd vs$(VSVer)&#x0D;&#x0A;
 			  "
 	/>
 	<UserMacro
@@ -221,24 +243,24 @@
 	/>
 	<UserMacro
 		Name="CoglLibtoolCompatibleDllSuffix"
-		Value="-$(CoglApiVersion)-0"
+		Value="-$(ApiVersion)-0"
 	/>
 	<UserMacro
-		Name="CoglSeparateVS9DllPrefix"
+		Name="CoglSeparateVSDllPrefix"
 		Value=""
 	/>
 	<UserMacro
-		Name="CoglSeparateVS9DllSuffix"
-		Value="-1-vs9"
+		Name="CoglSeparateVSDllSuffix"
+		Value="-1-vs$(VSVER)"
 	/>
 	<!-- Change these two to GlibLibtoolCompatibleDllPrefix and
 	GlibLibtoolCompatibleDllSuffix if that is what you want -->
 	<UserMacro
 		Name="CoglDllPrefix"
-		Value="$(CoglSeparateVS9DllPrefix)"
+		Value="$(CoglSeparateVSDllPrefix)"
 	/>
 	<UserMacro
 		Name="CoglDllSuffix"
-		Value="$(CoglSeparateVS9DllSuffix)"
+		Value="$(CoglSeparateVSDllSuffix)"
 	/>
 </VisualStudioPropertySheet>
 
=== modified file 'build/win32/vs9/cogl_sdl.sln'
--- build/win32/vs9/cogl_sdl.sln	2013-01-10 12:49:09 +0000
+++ build/win32/vs9/cogl_sdl.sln	2013-04-01 22:12:24 +0000
@@ -24,11 +24,6 @@
 		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-msaa", "cogl-msaa.vcproj", "{44E864D4-8447-484D-9B16-D5405E0783CF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-info", "cogl-info.vcproj", "{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
@@ -45,7 +40,6 @@
 		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
 		{F5A43C12-7032-428E-A56A-D294075FA493} = {F5A43C12-7032-428E-A56A-D294075FA493}
 		{0B5D144D-1872-42CD-8437-FFDCDD08C03E} = {0B5D144D-1872-42CD-8437-FFDCDD08C03E}
-		{44E864D4-8447-484D-9B16-D5405E0783CF} = {44E864D4-8447-484D-9B16-D5405E0783CF}
 		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3} = {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}
 		{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
 		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF} = {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}
@@ -92,14 +86,6 @@
 		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|Win32.Build.0 = Release|Win32
 		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|x64.ActiveCfg = Release|x64
 		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|x64.Build.0 = Release|x64
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.Build.0 = Debug|Win32
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.ActiveCfg = Debug|x64
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.Build.0 = Debug|x64
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.ActiveCfg = Release|Win32
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.Build.0 = Release|Win32
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|x64.ActiveCfg = Release|x64
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|x64.Build.0 = Release|x64
 		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.Build.0 = Debug|Win32
 		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.ActiveCfg = Debug|x64
 
=== modified file 'build/win32/vs9/test-conformance-cogl.vcproj'
--- build/win32/vs9/test-conformance-cogl.vcproj	2013-02-26 16:43:25 +0000
+++ build/win32/vs9/test-conformance-cogl.vcproj	2013-04-01 22:12:24 +0000
@@ -192,6 +192,7 @@
    <File RelativePath="..\..\..\tests\conform\test-texture-get-set-data.c" />
    <File RelativePath="..\..\..\tests\conform\test-framebuffer-get-bits.c" />
    <File RelativePath="..\..\..\tests\conform\test-primitive-and-journal.c" />
+   <File RelativePath="..\..\..\tests\conform\test-copy-replace-texture.c" />
   </Filter>
  </Files>
  <Globals>
 
=== modified file 'cogl-gles2/Makefile.in'
--- cogl-gles2/Makefile.in	2013-02-26 16:43:25 +0000
+++ cogl-gles2/Makefile.in	2013-04-01 22:12:24 +0000
@@ -351,6 +351,11 @@
 UPROF_REQ_VERSION = @UPROF_REQ_VERSION@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WAYLAND_CLIENT_CFLAGS = @WAYLAND_CLIENT_CFLAGS@
+WAYLAND_CLIENT_LIBS = @WAYLAND_CLIENT_LIBS@
+WAYLAND_REQ_VERSION = @WAYLAND_REQ_VERSION@
+WAYLAND_SERVER_CFLAGS = @WAYLAND_SERVER_CFLAGS@
+WAYLAND_SERVER_LIBS = @WAYLAND_SERVER_LIBS@
 XCOMPOSITE_REQ_VERSION = @XCOMPOSITE_REQ_VERSION@
 XFIXES_REQ_VERSION = @XFIXES_REQ_VERSION@
 XGETTEXT = @XGETTEXT@
 
=== modified file 'cogl-pango/Makefile.in'
--- cogl-pango/Makefile.in	2013-02-26 16:43:25 +0000
+++ cogl-pango/Makefile.in	2013-04-01 22:12:24 +0000
@@ -367,6 +367,11 @@
 UPROF_REQ_VERSION = @UPROF_REQ_VERSION@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WAYLAND_CLIENT_CFLAGS = @WAYLAND_CLIENT_CFLAGS@
+WAYLAND_CLIENT_LIBS = @WAYLAND_CLIENT_LIBS@
+WAYLAND_REQ_VERSION = @WAYLAND_REQ_VERSION@
+WAYLAND_SERVER_CFLAGS = @WAYLAND_SERVER_CFLAGS@
+WAYLAND_SERVER_LIBS = @WAYLAND_SERVER_LIBS@
 XCOMPOSITE_REQ_VERSION = @XCOMPOSITE_REQ_VERSION@
 XFIXES_REQ_VERSION = @XFIXES_REQ_VERSION@
 XGETTEXT = @XGETTEXT@
 
=== modified file 'cogl/Makefile.in'
--- cogl/Makefile.in	2013-02-26 16:43:25 +0000
+++ cogl/Makefile.in	2013-04-01 22:12:24 +0000
@@ -872,6 +872,11 @@
 UPROF_REQ_VERSION = @UPROF_REQ_VERSION@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WAYLAND_CLIENT_CFLAGS = @WAYLAND_CLIENT_CFLAGS@
+WAYLAND_CLIENT_LIBS = @WAYLAND_CLIENT_LIBS@
+WAYLAND_REQ_VERSION = @WAYLAND_REQ_VERSION@
+WAYLAND_SERVER_CFLAGS = @WAYLAND_SERVER_CFLAGS@
+WAYLAND_SERVER_LIBS = @WAYLAND_SERVER_LIBS@
 XCOMPOSITE_REQ_VERSION = @XCOMPOSITE_REQ_VERSION@
 XFIXES_REQ_VERSION = @XFIXES_REQ_VERSION@
 XGETTEXT = @XGETTEXT@
 
=== modified file 'cogl/cogl-bitmap.c'
--- cogl/cogl-bitmap.c	2013-02-26 16:43:25 +0000
+++ cogl/cogl-bitmap.c	2013-04-01 22:12:24 +0000
@@ -447,6 +447,10 @@
   uint8_t *ptr;
   CoglError *internal_error = NULL;
 
+  g_return_val_if_fail (access & (COGL_BUFFER_ACCESS_READ |
+                                  COGL_BUFFER_ACCESS_WRITE),
+                        NULL);
+
   /* Divert to another bitmap if this data is shared */
   if (bitmap->shared_bmp)
     return _cogl_bitmap_gl_bind (bitmap->shared_bmp, access, hints, error);
@@ -463,8 +467,6 @@
       return data;
     }
 
-  bitmap->bound = TRUE;
-
   if (access == COGL_BUFFER_ACCESS_READ)
     ptr = _cogl_buffer_gl_bind (bitmap->buffer,
                                 COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK,
@@ -477,6 +479,7 @@
     {
       ptr = NULL;
       g_assert_not_reached ();
+      return NULL;
     }
 
   /* NB: _cogl_buffer_gl_bind() may return NULL in non-error
@@ -488,6 +491,8 @@
       return NULL;
     }
 
+  bitmap->bound = TRUE;
+
   /* The data pointer actually stores the offset */
   return ptr + GPOINTER_TO_INT (bitmap->data);
 }
 
=== modified file 'cogl/cogl-framebuffer.c'
--- cogl/cogl-framebuffer.c	2013-02-26 16:43:25 +0000
+++ cogl/cogl-framebuffer.c	2013-04-01 22:12:24 +0000
@@ -990,7 +990,27 @@
       /* NB: we render upside down to offscreen framebuffers and that
        * can affect how we setup the GL viewport... */
       a->type != b->type)
-    return COGL_FRAMEBUFFER_STATE_VIEWPORT;
+    {
+      unsigned long differences = COGL_FRAMEBUFFER_STATE_VIEWPORT;
+      CoglContext *context = a->context;
+
+      /* XXX: ONGOING BUG: Intel viewport scissor
+       *
+       * Intel gen6 drivers don't currently correctly handle offset
+       * viewports, since primitives aren't clipped within the bounds of
+       * the viewport.  To workaround this we push our own clip for the
+       * viewport that will use scissoring to ensure we clip as expected.
+       *
+       * This workaround implies that a change in viewport state is
+       * effectively also a change in the clipping state.
+       *
+       * TODO: file a bug upstream!
+       */
+      if (G_UNLIKELY (context->needs_viewport_scissor_workaround))
+          differences |= COGL_FRAMEBUFFER_STATE_CLIP;
+
+      return differences;
+    }
   else
     return 0;
 }
 
=== modified file 'cogl/cogl-object.h'
--- cogl/cogl-object.h	2013-02-26 16:43:25 +0000
+++ cogl/cogl-object.h	2013-04-01 22:12:24 +0000
@@ -25,6 +25,10 @@
 #ifndef __COGL_OBJECT_H
 #define __COGL_OBJECT_H
 
+#include <cogl/cogl-types.h>
+
+COGL_BEGIN_DECLS
+
 typedef struct _CoglObject      CoglObject;
 
 #define COGL_OBJECT(X)          ((CoglObject *)X)
@@ -209,5 +213,7 @@
 
 #endif /* COGL_ENABLE_EXPERIMENTAL_API */
 
+COGL_END_DECLS
+
 #endif /* __COGL_OBJECT_H */
 
 
=== modified file 'cogl/cogl-pipeline-snippet-private.h'
--- cogl/cogl-pipeline-snippet-private.h	2013-02-26 16:43:25 +0000
+++ cogl/cogl-pipeline-snippet-private.h	2013-04-01 22:12:24 +0000
@@ -3,7 +3,7 @@
  *
  * An object oriented GL/GLES Abstraction/Utility Layer
  *
- * Copyright (C) 2011 Intel Corporation.
+ * Copyright (C) 2011, 2013 Intel Corporation.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -90,6 +90,11 @@
 _cogl_pipeline_snippet_generate_code (const CoglPipelineSnippetData *data);
 
 void
+_cogl_pipeline_snippet_generate_declarations (GString *declarations_buf,
+                                              CoglSnippetHook hook,
+                                              CoglPipelineSnippetList *list);
+
+void
 _cogl_pipeline_snippet_list_free (CoglPipelineSnippetList *list);
 
 void
 
=== modified file 'cogl/cogl-pipeline-snippet.c'
--- cogl/cogl-pipeline-snippet.c	2012-09-25 10:07:06 +0000
+++ cogl/cogl-pipeline-snippet.c	2013-04-01 22:12:24 +0000
@@ -3,7 +3,7 @@
  *
  * An object oriented GL/GLES Abstraction/Utility Layer
  *
- * Copyright (C) 2011 Intel Corporation.
+ * Copyright (C) 2011, 2013 Intel Corporation.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -100,7 +100,7 @@
 
   for (snippet = first_snippet, snippet_num = 0;
        snippet_num < n_snippets;
-       snippet = COGL_LIST_NEXT (snippet, list_node), snippet_num++)
+       snippet = COGL_LIST_NEXT (snippet, list_node))
     if (snippet->snippet->hook == data->hook)
       {
         const char *source;
@@ -180,6 +180,24 @@
                                   data->return_variable);
 
         g_string_append (data->source_buf, "}\n");
+        snippet_num++;
+      }
+}
+
+void
+_cogl_pipeline_snippet_generate_declarations (GString *declarations_buf,
+                                              CoglSnippetHook hook,
+                                              CoglPipelineSnippetList *snippets)
+{
+  CoglPipelineSnippet *snippet;
+
+  COGL_LIST_FOREACH (snippet, snippets, list_node)
+    if (snippet->snippet->hook == hook)
+      {
+        const char *source;
+
+        if ((source = cogl_snippet_get_declarations (snippet->snippet)))
+          g_string_append (declarations_buf, source);
       }
 }
 
 
=== modified file 'cogl/cogl-pipeline.c'
--- cogl/cogl-pipeline.c	2013-02-26 16:43:25 +0000
+++ cogl/cogl-pipeline.c	2013-04-01 22:12:24 +0000
@@ -3,7 +3,7 @@
  *
  * An object oriented GL/GLES Abstraction/Utility Layer
  *
- * Copyright (C) 2008,2009,2010 Intel Corporation.
+ * Copyright (C) 2008,2009,2010,2013 Intel Corporation.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -1436,6 +1436,11 @@
 
   if (inc_n_layers)
     pipeline->n_layers++;
+
+  /* Adding a layer difference may mean this pipeline now overrides
+   * all of the layers of its parent which might make the parent
+   * redundant so we should try to prune the hierarchy */
+  _cogl_pipeline_prune_redundant_ancestry (pipeline);
 }
 
 void
 
=== modified file 'cogl/cogl-snippet.h'
--- cogl/cogl-snippet.h	2013-02-26 16:43:25 +0000
+++ cogl/cogl-snippet.h	2013-04-01 22:12:24 +0000
@@ -3,7 +3,7 @@
  *
  * An object oriented GL/GLES Abstraction/Utility Layer
  *
- * Copyright (C) 2011 Intel Corporation.
+ * Copyright (C) 2011, 2013 Intel Corporation.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -312,6 +312,12 @@
    to within a pipeline. */
 /**
  * CoglSnippetHook:
+ * @COGL_SNIPPET_HOOK_VERTEX_GLOBALS: A hook for declaring global data
+ *   that can be shared with all other snippets that are on a vertex
+ *   hook.
+ * @COGL_SNIPPET_HOOK_FRAGMENT_GLOBALS: A hook for declaring global
+ *   data wthat can be shared with all other snippets that are on a
+ *   fragment hook.
  * @COGL_SNIPPET_HOOK_VERTEX: A hook for the entire vertex processing
  *   stage of the pipeline.
  * @COGL_SNIPPET_HOOK_VERTEX_TRANSFORM: A hook for the vertex transformation.
@@ -330,6 +336,30 @@
  *
  * <glosslist>
  *  <glossentry>
+ *   <glossterm>%COGL_SNIPPET_HOOK_VERTEX_GLOBALS</glossterm>
+ *   <glossdef>
+ * <para>
+ * Adds a shader snippet at the beginning of the global section of the
+ * shader for the vertex processing. Any declarations here can be
+ * shared with all other snippets that are attached to a vertex hook.
+ * Only the ‘declarations’ string is used and the other strings are
+ * ignored.
+ * </para>
+ *   </glossdef>
+ *  </glossentry>
+ *  <glossentry>
+ *   <glossterm>%COGL_SNIPPET_HOOK_FRAGMENT_GLOBALS</glossterm>
+ *   <glossdef>
+ * <para>
+ * Adds a shader snippet at the beginning of the global section of the
+ * shader for the fragment processing. Any declarations here can be
+ * shared with all other snippets that are attached to a fragment
+ * hook. Only the ‘declarations’ string is used and the other strings
+ * are ignored.
+ * </para>
+ *   </glossdef>
+ *  </glossentry>
+ *  <glossentry>
  *   <glossterm>%COGL_SNIPPET_HOOK_VERTEX</glossterm>
  *   <glossdef>
  * <para>
@@ -552,9 +582,11 @@
   /* Per pipeline vertex hooks */
   COGL_SNIPPET_HOOK_VERTEX = 0,
   COGL_SNIPPET_HOOK_VERTEX_TRANSFORM,
+  COGL_SNIPPET_HOOK_VERTEX_GLOBALS,
 
   /* Per pipeline fragment hooks */
   COGL_SNIPPET_HOOK_FRAGMENT = 2048,
+  COGL_SNIPPET_HOOK_FRAGMENT_GLOBALS,
 
   /* Per layer vertex hooks */
   COGL_SNIPPET_HOOK_TEXTURE_COORD_TRANSFORM = 4096,
 
=== modified file 'cogl/cogl.symbols'
--- cogl/cogl.symbols	2013-02-26 16:43:25 +0000
+++ cogl/cogl.symbols	2013-04-01 22:12:24 +0000
@@ -1,4 +1,3 @@
-
 /* cogl2_clip_push_from_path is only for 1.10.x*/
 cogl2_clip_push_from_path
 
@@ -26,7 +25,19 @@
 cogl_android_set_native_window
 #endif
 
+cogl_attribute_buffer_new_with_size
+
 cogl_attribute_new
+cogl_attribute_new_const_1f
+cogl_attribute_new_const_2f
+cogl_attribute_new_const_2fv
+cogl_attribute_new_const_2x2fv
+cogl_attribute_new_const_3f
+cogl_attribute_new_const_3fv
+cogl_attribute_new_const_3x3fv
+cogl_attribute_new_const_4f
+cogl_attribute_new_const_4fv
+cogl_attribute_new_const_4x4fv
 cogl_attribute_buffer_new
 cogl_attribute_get_buffer
 cogl_attribute_get_normalized
@@ -37,7 +48,6 @@
 cogl_begin_gl
 
 cogl_bitmap_error_get_type
-cogl_bitmap_error_domain
 cogl_bitmap_get_buffer
 cogl_bitmap_get_format
 cogl_bitmap_get_height
@@ -49,7 +59,6 @@
 cogl_bitmap_new_from_buffer
 cogl_bitmap_new_with_size
 cogl_blend_string_error_get_type
-cogl_blend_string_error_domain
 
 cogl_buffer_bit_get_type
 cogl_buffer_get_size
@@ -59,6 +68,7 @@
 cogl_buffer_get_usage_hint
 #endif
 cogl_buffer_map
+cogl_buffer_map_range
 cogl_buffer_set_data
 cogl_buffer_set_update_hint
 #if 0
@@ -124,6 +134,7 @@
 cogl_color_init_from_4f
 cogl_color_init_from_4fv
 cogl_color_init_from_4ub
+cogl_color_mask_get_type
 cogl_color_new
 cogl_color_premultiply
 cogl_color_set_alpha
@@ -153,6 +164,10 @@
 cogl_create_program
 cogl_create_shader
 
+cogl_debug_matrix_entry_print
+cogl_debug_matrix_print
+cogl_debug_object_foreach_type
+cogl_debug_object_print_instances
 cogl_depth_state_get_range
 cogl_depth_state_get_test_enabled
 cogl_depth_state_get_test_function
@@ -174,7 +189,9 @@
 
 cogl_end_gl
 
-cogl_error_get_type
+cogl_error_copy
+cogl_error_free
+cogl_error_matches
 
 cogl_euler_copy
 cogl_euler_equal
@@ -216,7 +233,6 @@
 cogl_framebuffer_draw_rectangles
 cogl_framebuffer_draw_textured_rectangle
 cogl_framebuffer_draw_textured_rectangles
-cogl_framebuffer_error_domain
 cogl_framebuffer_fill_path
 cogl_framebuffer_finish
 cogl_framebuffer_frustum
@@ -225,6 +241,9 @@
 cogl_framebuffer_get_color_format
 cogl_framebuffer_get_color_mask
 cogl_framebuffer_get_context
+cogl_framebuffer_get_depth_bits
+cogl_framebuffer_get_depth_texture
+cogl_framebuffer_get_depth_texture_enabled
 cogl_framebuffer_get_dither_enabled
 cogl_framebuffer_get_green_bits
 cogl_framebuffer_get_height
@@ -261,6 +280,7 @@
 
 cogl_framebuffer_scale
 cogl_framebuffer_set_color_mask
+cogl_framebuffer_set_depth_texture_enabled
 cogl_framebuffer_set_dither_enabled
 cogl_framebuffer_set_modelview_matrix
 cogl_framebuffer_set_projection_matrix
@@ -272,6 +292,11 @@
 cogl_framebuffer_vdraw_attributes
 /* cogl_framebuffer_vdraw_indexed_attributes */ /* Not Implemented! */
 
+cogl_frame_info_get_frame_counter
+cogl_frame_info_get_output
+cogl_frame_info_get_presentation_time
+cogl_frame_info_get_refresh_rate
+
 #ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT
 cogl_gdl_display_set_plane
 #endif
@@ -280,6 +305,7 @@
 
 cogl_get_backface_culling_enabled
 cogl_get_bitmasks
+cogl_get_clock_time
 cogl_get_depth_test_enabled
 cogl_get_draw_framebuffer
 cogl_get_features
@@ -328,15 +354,18 @@
 cogl_is_attribute_buffer
 cogl_is_bitmap
 cogl_is_buffer
+cogl_is_context
+cogl_is_frame_info
 cogl_is_gles2_context
-cogl_is_context
 cogl_is_index_buffer
 #if 0
 /* not implemented! */
 cogl_is_indices_array
 #endif
 cogl_is_material
+cogl_is_matrix_stack
 cogl_is_offscreen
+cogl_is_output
 cogl_is_path
 cogl_is_pipeline
 cogl_is_pixel_buffer
@@ -423,6 +452,12 @@
 cogl_material_wrap_mode_get_type
 
 cogl_matrix_copy
+cogl_matrix_entry_calculate_translation
+cogl_matrix_entry_equal
+cogl_matrix_entry_get
+cogl_matrix_entry_is_identity
+cogl_matrix_entry_ref
+cogl_matrix_entry_unref
 cogl_matrix_equal
 cogl_matrix_free
 cogl_matrix_frustum
@@ -450,6 +485,23 @@
 #endif
 
 cogl_matrix_scale
+cogl_matrix_stack_frustum
+cogl_matrix_stack_get
+cogl_matrix_stack_get_entry
+cogl_matrix_stack_get_inverse
+cogl_matrix_stack_load_identity
+cogl_matrix_stack_multiply
+cogl_matrix_stack_new
+cogl_matrix_stack_orthographic
+cogl_matrix_stack_perspective
+cogl_matrix_stack_pop
+cogl_matrix_stack_push
+cogl_matrix_stack_rotate
+cogl_matrix_stack_rotate_euler
+cogl_matrix_stack_rotate_quaternion
+cogl_matrix_stack_scale
+cogl_matrix_stack_set
+cogl_matrix_stack_translate
 cogl_matrix_transform_point
 cogl_matrix_transform_points
 cogl_matrix_translate
@@ -466,15 +518,19 @@
 
 cogl_offscreen_new_to_texture
 
+cogl_onscreen_add_frame_callback
 cogl_onscreen_add_resize_handler
 cogl_onscreen_add_swap_buffers_callback
 #ifndef COGL_WINSYS_INTEGRATED
 cogl_onscreen_clutter_backend_set_size_CLUTTER
 #endif
+cogl_onscreen_get_buffer_age
+cogl_onscreen_get_frame_counter
 cogl_onscreen_get_resizable
 cogl_onscreen_hide
 cogl_onscreen_new
 cogl_onscreen_set_swap_throttled
+cogl_onscreen_remove_frame_callback
 cogl_onscreen_remove_resize_handler
 cogl_onscreen_remove_swap_buffers_callback
 cogl_onscreen_set_resizable
@@ -488,6 +544,15 @@
 
 cogl_ortho
 
+cogl_output_get_height
+cogl_output_get_mm_height
+cogl_output_get_mm_width
+cogl_output_get_refresh_rate
+cogl_output_get_subpixel_order
+cogl_output_get_width
+cogl_output_get_x
+cogl_output_get_y
+
 cogl_path_arc
 cogl_path_close
 cogl_path_copy
@@ -690,10 +755,10 @@
 cogl_renderer_add_constraint
 cogl_renderer_check_onscreen_template
 cogl_renderer_connect
+cogl_renderer_foreach_output
 cogl_renderer_get_driver
 cogl_renderer_get_n_fragment_texture_units
 cogl_renderer_error_get_type
-cogl_renderer_error_domain
 cogl_renderer_get_winsys_id
 cogl_renderer_new
 cogl_renderer_remove_constraint
@@ -714,6 +779,9 @@
 cogl_sdl_context_new
 cogl_sdl_handle_event
 cogl_sdl_idle
+#if SDL_MAJOR_VERSION >= 2
+cogl_sdl_onscreen_get_window
+#endif
 cogl_sdl_renderer_get_event_type
 cogl_sdl_renderer_set_event_type
 #endif
@@ -739,6 +807,7 @@
 #endif
 
 cogl_shader_source
+cogl_shader_type_get_type
 
 #ifndef COGL_DISABLE_DEPRECATED
 cogl_shader_unref
@@ -764,7 +833,10 @@
 cogl_swap_chain_set_has_alpha
 cogl_swap_chain_set_length
 
-cogl_texture_error_domain
+cogl_system_error_get_type
+
+cogl_texture_allocate
+cogl_texture_error_get_type
 cogl_texture_flags_get_type
 cogl_texture_get_data
 cogl_texture_get_format
@@ -788,18 +860,20 @@
 cogl_texture_pixmap_x11_update_area
 #endif
 cogl_texture_rectangle_new_from_bitmap
+cogl_texture_rectangle_new_from_foreign
 cogl_texture_rectangle_new_with_size
 #ifndef COGL_DISABLE_DEPRECATED
 cogl_texture_ref
 #endif
+cogl_texture_set_data
 cogl_texture_set_region
 cogl_texture_set_region_from_bitmap
+cogl_texture_type_get_type
 #ifndef COGL_DISABLE_DEPRECATED
 cogl_texture_unref
 #endif
 cogl_texture_2d_new_from_bitmap
 cogl_texture_2d_new_from_data
-cogl_texture_2d_new_from_foreign
 cogl_texture_2d_new_with_size
 cogl_texture_2d_sliced_new_with_size
 cogl_texture_3d_new_from_bitmap
@@ -865,6 +939,8 @@
 cogl_wayland_texture_2d_new_from_buffer
 #endif
 
+cogl_winding_get_type
+
 #ifdef COGL_HAS_WIN32_SUPPORT
 cogl_win32_onscreen_get_window
 cogl_win32_onscreen_set_foreign_window
@@ -896,9 +972,7 @@
 /* eventually, this section should disappear (or cogl, cogl-pango, clutter et al */
 /* will link without the following) */
 _cogl_atlas_add_reorganize_callback
-_cogl_atlas_copy_rectangle
 _cogl_atlas_new
-_cogl_atlas_remove
 _cogl_atlas_remove_reorganize_callback
 _cogl_atlas_reserve_space
 _cogl_atlas_texture_add_reorganize_callback
@@ -906,23 +980,4 @@
 _cogl_atlas_texture_new_with_size
 _cogl_atlas_texture_remove_reorganize_callback
 _cogl_context_get_default
-_cogl_system_error_domain
-_cogl_texture_associate_framebuffer
-_cogl_texture_can_hardware_repeat
-_cogl_texture_determine_internal_format
-_cogl_texture_ensure_non_quad_rendering
-_cogl_texture_flush_journal_rendering
-_cogl_texture_free
-_cogl_texture_get_associated_framebuffers
-_cogl_texture_get_gl_format
-_cogl_texture_init
-_cogl_texture_is_foreign
-_cogl_texture_prepare_for_upload
-_cogl_texture_gl_prep_alignment_for_pixels_upload
-_cogl_texture_pre_paint
-_cogl_texture_register_texture_type
-_cogl_texture_gl_flush_legacy_texobj_filters
-_cogl_texture_gl_flush_legacy_texobj_wrap_modes
-_cogl_texture_transform_coords_to_gl
-_cogl_texture_transform_quad_coords_to_gl
 #endif
 
=== modified file 'cogl/driver/gl/cogl-framebuffer-gl.c'
--- cogl/driver/gl/cogl-framebuffer-gl.c	2013-02-26 16:43:25 +0000
+++ cogl/driver/gl/cogl-framebuffer-gl.c	2013-04-01 22:12:24 +0000
@@ -890,7 +890,21 @@
     }
 
   if (buffers & COGL_BUFFER_BIT_DEPTH)
-    gl_buffers |= GL_DEPTH_BUFFER_BIT;
+    {
+      gl_buffers |= GL_DEPTH_BUFFER_BIT;
+
+      if (ctx->depth_writing_enabled_cache != TRUE)
+        {
+          GE( ctx, glDepthMask (TRUE));
+
+          ctx->depth_writing_enabled_cache = TRUE;
+
+          /* Make sure the DepthMask is updated when the next primitive is drawn */
+          ctx->current_pipeline_changes_since_flush |=
+            COGL_PIPELINE_STATE_DEPTH;
+          ctx->current_pipeline_age--;
+        }
+    }
 
   if (buffers & COGL_BUFFER_BIT_STENCIL)
     gl_buffers |= GL_STENCIL_BUFFER_BIT;
 
=== modified file 'cogl/driver/gl/cogl-pipeline-fragend-glsl.c'
--- cogl/driver/gl/cogl-pipeline-fragend-glsl.c	2013-02-26 16:43:25 +0000
+++ cogl/driver/gl/cogl-pipeline-fragend-glsl.c	2013-04-01 22:12:24 +0000
@@ -3,7 +3,7 @@
  *
  * An object oriented GL/GLES Abstraction/Utility Layer
  *
- * Copyright (C) 2008,2009,2010 Intel Corporation.
+ * Copyright (C) 2008,2009,2010,2013 Intel Corporation.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -207,6 +207,52 @@
   return FALSE;
 }
 
+static CoglBool
+add_layer_declaration_cb (CoglPipelineLayer *layer,
+                          void *user_data)
+{
+  CoglPipelineShaderState *shader_state = user_data;
+  CoglTextureType texture_type =
+    _cogl_pipeline_layer_get_texture_type (layer);
+  const char *target_string;
+
+  _cogl_gl_util_get_texture_target_string (texture_type, &target_string, NULL);
+
+  g_string_append_printf (shader_state->header,
+                          "uniform sampler%s cogl_sampler%i;\n",
+                          target_string,
+                          layer->index);
+
+  return TRUE;
+}
+
+static void
+add_layer_declarations (CoglPipeline *pipeline,
+                        CoglPipelineShaderState *shader_state)
+{
+  /* We always emit sampler uniforms in case there will be custom
+   * layer snippets that want to sample arbitrary layers. */
+
+  _cogl_pipeline_foreach_layer_internal (pipeline,
+                                         add_layer_declaration_cb,
+                                         shader_state);
+}
+
+static void
+add_global_declarations (CoglPipeline *pipeline,
+                         CoglPipelineShaderState *shader_state)
+{
+  CoglSnippetHook hook = COGL_SNIPPET_HOOK_FRAGMENT_GLOBALS;
+  CoglPipelineSnippetList *snippets = get_fragment_snippets (pipeline);
+
+  /* Add the global data hooks. All of the code in these snippets is
+   * always added and only the declarations data is used */
+
+  _cogl_pipeline_snippet_generate_declarations (shader_state->header,
+                                                hook,
+                                                snippets);
+}
+
 static void
 _cogl_pipeline_fragend_glsl_start (CoglPipeline *pipeline,
                                    int n_layers,
@@ -315,6 +361,9 @@
   shader_state->source = ctx->codegen_source_buffer;
   COGL_LIST_INIT (&shader_state->layers);
 
+  add_layer_declarations (pipeline, shader_state);
+  add_global_declarations (pipeline, shader_state);
+
   g_string_append (shader_state->source,
                    "void\n"
                    "cogl_generated_source ()\n"
@@ -339,44 +388,6 @@
 }
 
 static void
-get_texture_target_string (CoglTextureType texture_type,
-                           const char **target_string_out,
-                           const char **swizzle_out)
-{
-  const char *target_string, *tex_coord_swizzle;
-
-  switch (texture_type)
-    {
-#if 0 /* TODO */
-    case COGL_TEXTURE_TYPE_1D:
-      target_string = "1D";
-      tex_coord_swizzle = "s";
-      break;
-#endif
-
-    case COGL_TEXTURE_TYPE_2D:
-      target_string = "2D";
-      tex_coord_swizzle = "st";
-      break;
-
-    case COGL_TEXTURE_TYPE_3D:
-      target_string = "3D";
-      tex_coord_swizzle = "stp";
-      break;
-
-    case COGL_TEXTURE_TYPE_RECTANGLE:
-      target_string = "2DRect";
-      tex_coord_swizzle = "st";
-      break;
-    }
-
-  if (target_string_out)
-    *target_string_out = target_string;
-  if (swizzle_out)
-    *swizzle_out = tex_coord_swizzle;
-}
-
-static void
 ensure_texture_lookup_generated (CoglPipelineShaderState *shader_state,
                                  CoglPipeline *pipeline,
                                  CoglPipelineLayer *layer)
@@ -393,9 +404,9 @@
 
   texture_type =
     _cogl_pipeline_layer_get_texture_type (layer);
-  get_texture_target_string (texture_type,
-                             &target_string,
-                             &tex_coord_swizzle);
+  _cogl_gl_util_get_texture_target_string (texture_type,
+                                           &target_string,
+                                           &tex_coord_swizzle);
 
   shader_state->unit_state[unit_index].sampled = TRUE;
 
@@ -992,24 +1003,6 @@
           CoglPipelineLayer *last_layer;
           LayerData *layer_data, *tmp;
 
-          /* We always emit sampler uniforms in case there will be custom
-           * layer snippets that want to sample arbitrary layers. */
-
-          COGL_LIST_FOREACH (layer_data, &shader_state->layers, list_node)
-            {
-              CoglPipelineLayer *layer = layer_data->layer;
-              CoglTextureType texture_type =
-                _cogl_pipeline_layer_get_texture_type (layer);
-              const char *target_string;
-
-              get_texture_target_string (texture_type, &target_string, NULL);
-
-              g_string_append_printf (shader_state->header,
-                                      "uniform sampler%s cogl_sampler%i;\n",
-                                      target_string,
-                                      layer->index);
-            }
-
           last_layer = COGL_LIST_FIRST (&shader_state->layers)->layer;
 
           ensure_layer_generated (pipeline, last_layer->index);
 
=== modified file 'cogl/driver/gl/cogl-pipeline-vertend-glsl.c'
--- cogl/driver/gl/cogl-pipeline-vertend-glsl.c	2013-02-26 16:43:25 +0000
+++ cogl/driver/gl/cogl-pipeline-vertend-glsl.c	2013-04-01 22:12:24 +0000
@@ -3,7 +3,7 @@
  *
  * An object oriented GL/GLES Abstraction/Utility Layer
  *
- * Copyright (C) 2010 Intel Corporation.
+ * Copyright (C) 2010,2013 Intel Corporation.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -140,6 +140,52 @@
   return &layer->big_state->vertex_snippets;
 }
 
+static CoglBool
+add_layer_declaration_cb (CoglPipelineLayer *layer,
+                          void *user_data)
+{
+  CoglPipelineShaderState *shader_state = user_data;
+  CoglTextureType texture_type =
+    _cogl_pipeline_layer_get_texture_type (layer);
+  const char *target_string;
+
+  _cogl_gl_util_get_texture_target_string (texture_type, &target_string, NULL);
+
+  g_string_append_printf (shader_state->header,
+                          "uniform sampler%s cogl_sampler%i;\n",
+                          target_string,
+                          layer->index);
+
+  return TRUE;
+}
+
+static void
+add_layer_declarations (CoglPipeline *pipeline,
+                        CoglPipelineShaderState *shader_state)
+{
+  /* We always emit sampler uniforms in case there will be custom
+   * layer snippets that want to sample arbitrary layers. */
+
+  _cogl_pipeline_foreach_layer_internal (pipeline,
+                                         add_layer_declaration_cb,
+                                         shader_state);
+}
+
+static void
+add_global_declarations (CoglPipeline *pipeline,
+                         CoglPipelineShaderState *shader_state)
+{
+  CoglSnippetHook hook = COGL_SNIPPET_HOOK_VERTEX_GLOBALS;
+  CoglPipelineSnippetList *snippets = get_vertex_snippets (pipeline);
+
+  /* Add the global data hooks. All of the code in these snippets is
+   * always added and only the declarations data is used */
+
+  _cogl_pipeline_snippet_generate_declarations (shader_state->header,
+                                                hook,
+                                                snippets);
+}
+
 static void
 _cogl_pipeline_vertend_glsl_start (CoglPipeline *pipeline,
                                    int n_layers,
@@ -236,6 +282,9 @@
   shader_state->header = ctx->codegen_header_buffer;
   shader_state->source = ctx->codegen_source_buffer;
 
+  add_layer_declarations (pipeline, shader_state);
+  add_global_declarations (pipeline, shader_state);
+
   g_string_append (shader_state->source,
                    "void\n"
                    "cogl_generated_source ()\n"
 
=== modified file 'cogl/driver/gl/cogl-util-gl-private.h'
--- cogl/driver/gl/cogl-util-gl-private.h	2013-02-26 16:43:25 +0000
+++ cogl/driver/gl/cogl-util-gl-private.h	2013-04-01 22:12:24 +0000
@@ -3,7 +3,7 @@
  *
  * An object oriented GL/GLES Abstraction/Utility Layer
  *
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,6 +28,7 @@
 #include "cogl-types.h"
 #include "cogl-context.h"
 #include "cogl-gl-header.h"
+#include "cogl-texture.h"
 
 #ifdef COGL_GL_DEBUG
 
@@ -66,4 +67,9 @@
 CoglBool
 _cogl_gl_util_catch_out_of_memory (CoglContext *ctx, CoglError **error);
 
+void
+_cogl_gl_util_get_texture_target_string (CoglTextureType texture_type,
+                                         const char **target_string_out,
+                                         const char **swizzle_out);
+
 #endif /* _COGL_UTIL_GL_PRIVATE_H_ */
 
=== modified file 'cogl/driver/gl/cogl-util-gl.c'
--- cogl/driver/gl/cogl-util-gl.c	2013-02-26 16:43:25 +0000
+++ cogl/driver/gl/cogl-util-gl.c	2013-04-01 22:12:24 +0000
@@ -3,7 +3,7 @@
  *
  * An object oriented GL/GLES Abstraction/Utility Layer
  *
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -101,3 +101,41 @@
 
   return FALSE;
 }
+
+void
+_cogl_gl_util_get_texture_target_string (CoglTextureType texture_type,
+                                         const char **target_string_out,
+                                         const char **swizzle_out)
+{
+  const char *target_string, *tex_coord_swizzle;
+
+  switch (texture_type)
+    {
+#if 0 /* TODO */
+    case COGL_TEXTURE_TYPE_1D:
+      target_string = "1D";
+      tex_coord_swizzle = "s";
+      break;
+#endif
+
+    case COGL_TEXTURE_TYPE_2D:
+      target_string = "2D";
+      tex_coord_swizzle = "st";
+      break;
+
+    case COGL_TEXTURE_TYPE_3D:
+      target_string = "3D";
+      tex_coord_swizzle = "stp";
+      break;
+
+    case COGL_TEXTURE_TYPE_RECTANGLE:
+      target_string = "2DRect";
+      tex_coord_swizzle = "st";
+      break;
+    }
+
+  if (target_string_out)
+    *target_string_out = target_string;
+  if (swizzle_out)
+    *swizzle_out = tex_coord_swizzle;
+}
 
=== modified file 'cogl/winsys/cogl-winsys-egl.c'
--- cogl/winsys/cogl-winsys-egl.c	2013-02-26 16:43:25 +0000
+++ cogl/winsys/cogl-winsys-egl.c	2013-04-01 22:12:24 +0000
@@ -51,6 +51,24 @@
 
 #include <glib/gi18n-lib.h>
 
+
+#ifndef EGL_KHR_create_context
+#define EGL_CONTEXT_MAJOR_VERSION_KHR           0x3098
+#define EGL_CONTEXT_MINOR_VERSION_KHR           0x30FB
+#define EGL_CONTEXT_FLAGS_KHR                   0x30FC
+#define EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR     0x30FD
+#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR  0x31BD
+#define EGL_OPENGL_ES3_BIT_KHR                  0x0040
+#define EGL_NO_RESET_NOTIFICATION_KHR           0x31BE
+#define EGL_LOSE_CONTEXT_ON_RESET_KHR           0x31BF
+#define EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR                 0x00000001
+#define EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR    0x00000002
+#define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR         0x00000004
+#define EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR          0x00000001
+#define EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT_KHR 0x00000002
+#endif
+
+
 #define MAX_EGL_CONFIG_ATTRIBS 30
 
 /* Define a set of arrays containing the functions required from GL
 
=== modified file 'config.h.win32'
--- config.h.win32	2012-09-25 10:07:06 +0000
+++ config.h.win32	2013-04-01 22:12:24 +0000
@@ -1,13 +1,28 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* define if asm blocks can use numeric local labels */
+/* #undef ASM_NUMERIC_LABELS */
+
 /* Can use Cogl 2.0 API internally */
 #define COGL_ENABLE_EXPERIMENTAL_2_0_API 1
 
 /* Can use experimental API internally */
 #define COGL_ENABLE_EXPERIMENTAL_API 1
 
+/* The major version for libgbm */
+/* #undef COGL_GBM_MAJOR */
+
+/* The micro version for libgbm */
+/* #undef COGL_GBM_MICRO */
+
+/* The minor version for libgbm */
+/* #undef COGL_GBM_MINOR */
+
 /* Cogl supports OpenGL using the WGL API */
-#define COGL_HAS_WIN32_SUPPORT 1
+#define COGL_HAS_WGL_SUPPORT 1
 
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
@@ -16,6 +31,75 @@
 /* The prefix for our gettext translation domains. */
 #define GETTEXT_PACKAGE "cogl"
 
+/* Define to the GLIB binary age */
+/* #undef GLIB_BINARY_AGE */
+
+/* Byte contents of gmutex */
+/* #undef GLIB_BYTE_CONTENTS_GMUTEX */
+
+/* Define to the GLIB interface age */
+/* #undef GLIB_INTERFACE_AGE */
+
+/* The size of gmutex, as computed by sizeof. */
+/* #undef GLIB_SIZEOF_GMUTEX */
+
+/* The size of system_thread, as computed by sizeof. */
+/* #undef GLIB_SIZEOF_SYSTEM_THREAD */
+
+/* alpha atomic implementation */
+/* #undef G_ATOMIC_ALPHA */
+
+/* arm atomic implementation */
+/* #undef G_ATOMIC_ARM */
+
+/* cris atomic implementation */
+/* #undef G_ATOMIC_CRIS */
+
+/* crisv32 atomic implementation */
+/* #undef G_ATOMIC_CRISV32 */
+
+/* i486 atomic implementation */
+/* #undef G_ATOMIC_I486 */
+
+/* ia64 atomic implementation */
+/* #undef G_ATOMIC_IA64 */
+
+/* powerpc atomic implementation */
+/* #undef G_ATOMIC_POWERPC */
+
+/* s390 atomic implementation */
+/* #undef G_ATOMIC_S390 */
+
+/* sparcv9 atomic implementation */
+/* #undef G_ATOMIC_SPARCV9 */
+
+/* x86_64 atomic implementation */
+/* #undef G_ATOMIC_X86_64 */
+
+/* Have inline keyword */
+/* #undef G_HAVE_INLINE */
+
+/* Have __inline keyword */
+/* #undef G_HAVE___INLINE */
+
+/* Have __inline__ keyword */
+/* #undef G_HAVE___INLINE__ */
+
+/* Source file containing theread implementation */
+/* #undef G_THREAD_SOURCE */
+
+/* A 'va_copy' style function */
+/* #undef G_VA_COPY */
+
+/* 'va_lists' cannot be copies as values */
+/* #undef G_VA_COPY_AS_ARRAY */
+
+/* Define to 1 if you have the <alloca.h> header file. */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define to 1 if you have the `atexit' function. */
+/* #undef HAVE_ATEXIT */
+
 /* Whether we have cairo or not */
 #define HAVE_CAIRO 1
 
@@ -30,6 +114,9 @@
    the CoreFoundation framework. */
 /*#undef HAVE_CFPREFERENCESCOPYAPPVALUE*/
 
+/* Define to 1 if you have the `chown' function. */
+/* #undef HAVE_CHOWN */
+
 /* Have GL for rendering */
 #define HAVE_COGL_GL 1
 
@@ -46,6 +133,9 @@
 /* Defined if the GL library shouldn't be dlopened */
 #define HAVE_DIRECTLY_LINKED_GL_LIBRARY 1
 
+/* Define to 1 if you have the <dirent.h> header file. */
+/* #undef HAVE_DIRENT_H */
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 /*#undef HAVE_DLFCN_H*/
 
@@ -55,26 +145,89 @@
 /* Define to 1 if you have the <EGL/egl.h> header file. */
 /*#undef HAVE_EGL_EGL_H*/
 
+/* Define to 1 if you have the `endmntent' function. */
+/* #undef HAVE_ENDMNTENT */
+
+/* Define to 1 if you have the `fchmod' function. */
+/* #undef HAVE_FCHMOD */
+
+/* Define to 1 if you have the `fchown' function. */
+/* #undef HAVE_FCHOWN */
+
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
+/* Define to 1 if you have the `fdwalk' function. */
+/* #undef HAVE_FDWALK */
+
 /* Define to 1 if you have the `ffs' function. */
 /*#undef HAVE_FFS*/
 
+/* Define to 1 if you have the <float.h> header file. */
+#define HAVE_FLOAT_H 1
+
+/* Define to 1 if you have the <fstab.h> header file. */
+/* #undef HAVE_FSTAB_H */
+
+/* we have the futex(2) system call */
+/* #undef HAVE_FUTEX */
+
+/* Define to 1 if you have the `getcwd' function. */
+#define HAVE_GETCWD 1
+
+/* Define to 1 if you have the `getc_unlocked' function. */
+/* #undef HAVE_GETC_UNLOCKED */
+
+/* Define to 1 if you have the `getfsstat' function. */
+/* #undef HAVE_GETFSSTAT */
+
+/* Define to 1 if you have the `getgrgid' function. */
+/* #undef HAVE_GETGRGID */
+
+/* Define to 1 if you have the `getmntent_r' function. */
+/* #undef HAVE_GETMNTENT_R */
+
+/* Define to 1 if you have the `getpwuid' function. */
+/* #undef HAVE_GETPWUID */
+
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #define HAVE_GETTEXT 1
 
+/* Define to 1 if you have the `getvfsstat' function. */
+/* #undef HAVE_GETVFSSTAT */
+
 /* Define to 1 if you have the <GLES/egl.h> header file. */
 /*#undef HAVE_GLES_EGL_H*/
 
+/* Define to 1 if you have the `gmtime_r' function. */
+/* #undef HAVE_GMTIME_R */
+
+/* define to use system printf */
+/* #undef HAVE_GOOD_PRINTF */
+
+/* Define to 1 if you have the <grp.h> header file. */
+/* #undef HAVE_GRP_H */
+
+/* Define to 1 if you have the `hasmntopt' function. */
+/* #undef HAVE_HASMNTOPT */
+
 /* Define if you have the iconv() function and it works. */
 #define HAVE_ICONV 1
 
+/* define to support printing 64-bit integers with format I64 */
+#define HAVE_INT64_AND_I64 1
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_INTTYPES_H 1
 #endif
 
+/* Define to 1 if you have the `lchmod' function. */
+/* #undef HAVE_LCHMOD */
+
+/* Define to 1 if you have the `lchown' function. */
+/* #undef HAVE_LCHOWN */
+
 /* Define to 1 if you have the <libgdl.h> header file. */
 /*#undef HAVE_LIBGDL_H*/
 
@@ -84,9 +237,78 @@
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
+/* Define to 1 if you have the `link' function. */
+/* #undef HAVE_LINK */
+
+/* Define to 1 if you have the <linux/magic.h> header file. */
+/* #undef HAVE_LINUX_MAGIC_H */
+
+/* Define to 1 if you have the `localtime_r' function. */
+/* #undef HAVE_LOCALTIME_R */
+
+/* define if system printf can print long long */
+#define HAVE_LONG_LONG_FORMAT 1
+
+/* Define to 1 if you have the `lstat' function. */
+/* #undef HAVE_LSTAT */
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H 1
+
+/* Define to 1 if you have the `memmem' function. */
+/* #undef HAVE_MEMMEM */
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
+/* Define to 1 if you have the <mntent.h> header file. */
+/* #undef HAVE_MNTENT_H */
+
+/* Have non-POSIX function getgrgid_r */
+/* #undef HAVE_NONPOSIX_GETGRGID_R */
+
+/* Have non-POSIX function getpwuid_r */
+/* #undef HAVE_NONPOSIX_GETPWUID_R */
+
+/* Define to 1 if you have the `on_exit' function. */
+/* #undef HAVE_ON_EXIT */
+
+/* Define to 1 if you have the `poll' function. */
+/* #undef HAVE_POLL */
+
+/* Have POSIX function getgrgid_r */
+/* #undef HAVE_POSIX_GETGRGID_R */
+
+/* Have POSIX function getpwuid_r */
+/* #undef HAVE_POSIX_GETPWUID_R */
+
+/* Have function pthread_attr_setstacksize */
+/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */
+
+/* Define to 1 if you have the <pwd.h> header file. */
+/* #undef HAVE_PWD_H */
+
+/* Define to 1 if you have the `readlink' function. */
+/* #undef HAVE_READLINK */
+
+/* Define to 1 if you have the <sched.h> header file. */
+/* #undef HAVE_SCHED_H */
+
+/* Define to 1 if you have the `setenv' function. */
+/* #undef HAVE_SETENV */
+
+/* Define to 1 if you have the `setmntent' function. */
+/* #undef HAVE_SETMNTENT */
+
+/* Define to 1 if you have the `splice' function. */
+/* #undef HAVE_SPLICE */
+
+/* Whether _Static_assert can be used or not */
+/* #undef HAVE_STATIC_ASSERT */
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #if ((_MSC_VER >= 1600) || !defined(_MSC_VER))
 #define HAVE_STDINT_H 1
@@ -95,6 +317,21 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
+/* Define to 1 if you have the `stpcpy' function. */
+/* #undef HAVE_STPCPY */
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#if defined(_MSC_VER)
+#define strcasecmp _stricmp
+#endif /* _MSC_VER uses _stricmp, which is identical to strcasecmp */
+
+#if !defined(__DMC__)
+#define HAVE_STRCASECMP 1
+#endif /* _MSC_VER or __gcc__ */
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
 /* Define to 1 if you have the <strings.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_STRINGS_H 1
@@ -103,17 +340,169 @@
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
+/* Define to 1 if you have the `strncasecmp' function. */
+#if !defined(_MSC_VER) && !defined(__DMC__)
+#define HAVE_STRNCASECMP 1
+#else /* _MSC_VER or __DMC__ */
+/* #undef HAVE_STRNCASECMP */
+#endif /* _MSC_VER or __DMC__ */
+
+/* Define to 1 if you have the `strsignal' function. */
+/* #undef HAVE_STRSIGNAL */
+
+/* Define to 1 if `f_bavail' is a member of `struct statfs'. */
+/* #undef HAVE_STRUCT_STATFS_F_BAVAIL */
+
+/* Define to 1 if `f_fstypename' is a member of `struct statfs'. */
+/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */
+
+/* Define to 1 if `f_basetype' is a member of `struct statvfs'. */
+/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */
+
+/* Define to 1 if `f_fstypename' is a member of `struct statvfs'. */
+/* #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME */
+
+/* Define to 1 if `st_atimensec' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_ATIMENSEC */
+
+/* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC */
+
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_BLKSIZE */
+
+/* Define to 1 if `st_blocks' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_BLOCKS */
+
+/* Define to 1 if `st_ctimensec' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_CTIMENSEC */
+
+/* Define to 1 if `st_ctim.tv_nsec' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC */
+
+/* Define to 1 if `st_mtimensec' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_MTIMENSEC */
+
+/* Define to 1 if `st_mtim.tv_nsec' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC */
+
+/* Define to 1 if `tm_gmtoff' is a a member of `struct tm'. */
+/* #undef HAVE_STRUCT_TM_TM_GMTOFF */
+
+/* Define to 1 if `__tm_gmtoff' is a member of `struct tm'. */
+/* #undef HAVE_STRUCT_TM___TM_GMTOFF */
+
+/* Define to 1 if you have the `symlink' function. */
+/* #undef HAVE_SYMLINK */
+
+/* Define to 1 if you have the <sys/mkdev.h> header file. */
+/* #undef HAVE_SYS_MKDEV_H */
+
+/* Define to 1 if you have the <sys/mntctl.h> header file. */
+/* #undef HAVE_SYS_MNTCTL_H */
+
+/* Define to 1 if you have the <sys/mnttab.h> header file. */
+/* #undef HAVE_SYS_MNTTAB_H */
+
+/* Define to 1 if you have the <sys/mount.h> header file. */
+/* #undef HAVE_SYS_MOUNT_H */
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#if !defined(_MSC_VER) && !defined(__DMC__)
+#define HAVE_SYS_PARAM_H 1
+#else /* _MSC_VER or __DMC__ */
+/* #undef HAVE_SYS_PARAM_H */
+#endif /* _MSC_VER or __DMC__ */
+
+/* Define to 1 if you have the <sys/poll.h> header file. */
+/* #undef HAVE_SYS_POLL_H */
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+/* #undef HAVE_SYS_RESOURCE_H */
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+/* #undef HAVE_SYS_SELECT_H */
+
+/* Define to 1 if you have the <sys/statfs.h> header file. */
+/* #undef HAVE_SYS_STATFS_H */
+
+/* Define to 1 if you have the <sys/statvfs.h> header file. */
+/* #undef HAVE_SYS_STATVFS_H */
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+/* #undef HAVE_SYS_SYSCTL_H */
+
+/* Define to 1 if you have the <sys/times.h> header file. */
+/* #undef HAVE_SYS_TIMES_H */
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_SYS_TIME_H 1
+#else /* _MSC_VER */
+/* #undef HAVE_SYS_TIME_H */
+#endif /* _MSC_VER */
+
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
+/* Define to 1 if you have the <sys/uio.h> header file. */
+/* #undef HAVE_SYS_UIO_H */
+
+/* Define to 1 if you have the <sys/vfstab.h> header file. */
+/* #undef HAVE_SYS_VFSTAB_H */
+
+/* Define to 1 if you have the <sys/vfs.h> header file. */
+/* #undef HAVE_SYS_VFS_H */
+
+/* Define to 1 if you have the <sys/vmount.h> header file. */
+/* #undef HAVE_SYS_VMOUNT_H */
+
+/* Define to 1 if you have the <sys/wait.h> header file. */
+/* #undef HAVE_SYS_WAIT_H */
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_UNISTD_H 1
 #endif
 
+/* Define to 1 if you have the `unsetenv' function. */
+/* #undef HAVE_UNSETENV */
+
+/* Define to 1 if you have the `utimes' function. */
+/* #undef HAVE_UTIMES */
+
+/* Define to 1 if you have the <values.h> header file. */
+#if !defined(_MSC_VER) && !defined(__DMC__)
+#define HAVE_VALUES_H 1
+#else /* _MSC_VER or __DMC__ */
+/* #undef HAVE_VALUES_H */
+#endif /* _MSC_VER or __DMC__ */
+
+/* Define to 1 if you have the `vasprintf' function. */
+#define HAVE_VASPRINTF 1
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#ifndef _MSC_VER
+#define HAVE_VSNPRINTF 1
+#ifdef __DMC__
+#define vsnprintf _vsnprintf
+#endif
+#else /* _MSC_VER */
+#if (_MSC_VER >= 1500)
+#define HAVE_VSNPRINTF 1
+#endif /* VS 2008+ has vsnprintf */
+/* #undef HAVE_VSNPRINTF */
+#endif /* _MSC_VER */
+
+/* Have Win32 atomic intrinsics */
+#define HAVE_WIN32_BUILTINS_FOR_ATOMIC_OPERATIONS 1
+
+/* Have a working bcopy */
+/* #undef HAVE_WORKING_BCOPY */
+
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #define LT_OBJDIR ".libs"
@@ -130,7 +519,7 @@
 #define PACKAGE_NAME "cogl"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "cogl 2.0.0"
+#define PACKAGE_STRING "cogl 1.14.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "cogl"
@@ -139,7 +528,52 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.0.0"
+#define PACKAGE_VERSION "1.14.0"
+
+/* Maximum POSIX RT priority */
+/* #undef POSIX_MAX_PRIORITY */
+
+/* Minimum POSIX RT priority */
+/* #undef POSIX_MIN_PRIORITY */
+
+/* The POSIX RT yield function */
+/* #undef POSIX_YIELD_FUNC */
+
+/* The size of `char', as computed by sizeof. */
+#define SIZEOF_CHAR 1
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* The size of `long long', as computed by sizeof. */
+#ifndef _MSC_VER
+#define SIZEOF_LONG_LONG 8
+#else /* _MSC_VER */
+#define SIZEOF_LONG_LONG 0
+#endif /* _MSC_VER */
+
+/* The size of `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
+/* The size of `size_t', as computed by sizeof. */
+#define SIZEOF_SIZE_T 4
+
+/* The size of `void *', as computed by sizeof. */
+#ifdef _MSC_VER
+#if (defined(_M_X64) || defined(_M_AMD64))
+#define SIZEOF_VOID_P 8
+#elif (defined(_M_IX86))
+#define SIZEOF_VOID_P 4
+#endif
+#else
+#define SIZEOF_VOID_P 4
+#endif
+
+/* The size of `__int64', as computed by sizeof. */
+#define SIZEOF___INT64 8
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -153,7 +587,52 @@
 /* Use Core Graphics (Quartz) for loading image data */
 /*#undef USE_QUARTZ*/
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
+
 /* Define to empty if `const' does not conform to ANSI C. */
-/*#undef const*/
+/* #undef const */
+
 
 #include "config-custom.h"
 
=== modified file 'config.h.win32.in'
--- config.h.win32.in	2012-09-25 10:07:06 +0000
+++ config.h.win32.in	2013-04-01 22:12:24 +0000
@@ -1,13 +1,28 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* define if asm blocks can use numeric local labels */
+/* #undef ASM_NUMERIC_LABELS */
+
 /* Can use Cogl 2.0 API internally */
 #define COGL_ENABLE_EXPERIMENTAL_2_0_API 1
 
 /* Can use experimental API internally */
 #define COGL_ENABLE_EXPERIMENTAL_API 1
 
+/* The major version for libgbm */
+/* #undef COGL_GBM_MAJOR */
+
+/* The micro version for libgbm */
+/* #undef COGL_GBM_MICRO */
+
+/* The minor version for libgbm */
+/* #undef COGL_GBM_MINOR */
+
 /* Cogl supports OpenGL using the WGL API */
-#define COGL_HAS_WIN32_SUPPORT 1
+#define COGL_HAS_WGL_SUPPORT 1
 
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
@@ -16,6 +31,75 @@
 /* The prefix for our gettext translation domains. */
 #define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
 
+/* Define to the GLIB binary age */
+/* #undef GLIB_BINARY_AGE */
+
+/* Byte contents of gmutex */
+/* #undef GLIB_BYTE_CONTENTS_GMUTEX */
+
+/* Define to the GLIB interface age */
+/* #undef GLIB_INTERFACE_AGE */
+
+/* The size of gmutex, as computed by sizeof. */
+/* #undef GLIB_SIZEOF_GMUTEX */
+
+/* The size of system_thread, as computed by sizeof. */
+/* #undef GLIB_SIZEOF_SYSTEM_THREAD */
+
+/* alpha atomic implementation */
+/* #undef G_ATOMIC_ALPHA */
+
+/* arm atomic implementation */
+/* #undef G_ATOMIC_ARM */
+
+/* cris atomic implementation */
+/* #undef G_ATOMIC_CRIS */
+
+/* crisv32 atomic implementation */
+/* #undef G_ATOMIC_CRISV32 */
+
+/* i486 atomic implementation */
+/* #undef G_ATOMIC_I486 */
+
+/* ia64 atomic implementation */
+/* #undef G_ATOMIC_IA64 */
+
+/* powerpc atomic implementation */
+/* #undef G_ATOMIC_POWERPC */
+
+/* s390 atomic implementation */
+/* #undef G_ATOMIC_S390 */
+
+/* sparcv9 atomic implementation */
+/* #undef G_ATOMIC_SPARCV9 */
+
+/* x86_64 atomic implementation */
+/* #undef G_ATOMIC_X86_64 */
+
+/* Have inline keyword */
+/* #undef G_HAVE_INLINE */
+
+/* Have __inline keyword */
+/* #undef G_HAVE___INLINE */
+
+/* Have __inline__ keyword */
+/* #undef G_HAVE___INLINE__ */
+
+/* Source file containing theread implementation */
+/* #undef G_THREAD_SOURCE */
+
+/* A 'va_copy' style function */
+/* #undef G_VA_COPY */
+
+/* 'va_lists' cannot be copies as values */
+/* #undef G_VA_COPY_AS_ARRAY */
+
+/* Define to 1 if you have the <alloca.h> header file. */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define to 1 if you have the `atexit' function. */
+/* #undef HAVE_ATEXIT */
+
 /* Whether we have cairo or not */
 #define HAVE_CAIRO 1
 
@@ -30,6 +114,9 @@
    the CoreFoundation framework. */
 /*#undef HAVE_CFPREFERENCESCOPYAPPVALUE*/
 
+/* Define to 1 if you have the `chown' function. */
+/* #undef HAVE_CHOWN */
+
 /* Have GL for rendering */
 #define HAVE_COGL_GL 1
 
@@ -46,6 +133,9 @@
 /* Defined if the GL library shouldn't be dlopened */
 #define HAVE_DIRECTLY_LINKED_GL_LIBRARY 1
 
+/* Define to 1 if you have the <dirent.h> header file. */
+/* #undef HAVE_DIRENT_H */
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 /*#undef HAVE_DLFCN_H*/
 
@@ -55,26 +145,89 @@
 /* Define to 1 if you have the <EGL/egl.h> header file. */
 /*#undef HAVE_EGL_EGL_H*/
 
+/* Define to 1 if you have the `endmntent' function. */
+/* #undef HAVE_ENDMNTENT */
+
+/* Define to 1 if you have the `fchmod' function. */
+/* #undef HAVE_FCHMOD */
+
+/* Define to 1 if you have the `fchown' function. */
+/* #undef HAVE_FCHOWN */
+
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
+/* Define to 1 if you have the `fdwalk' function. */
+/* #undef HAVE_FDWALK */
+
 /* Define to 1 if you have the `ffs' function. */
 /*#undef HAVE_FFS*/
 
+/* Define to 1 if you have the <float.h> header file. */
+#define HAVE_FLOAT_H 1
+
+/* Define to 1 if you have the <fstab.h> header file. */
+/* #undef HAVE_FSTAB_H */
+
+/* we have the futex(2) system call */
+/* #undef HAVE_FUTEX */
+
+/* Define to 1 if you have the `getcwd' function. */
+#define HAVE_GETCWD 1
+