[cogl] (223 commits) Non-fast-forward update to branch wip/frame-synchronization

[Owen Taylor <otaylor src gnome org>]

The branch 'wip/frame-synchronization' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 http://live.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  7dc9070... Add CoglOutput and track for the GLX backend
  9343361... Prefer OML_sync_control over SGI_video_sync when waiting fo
  86f5a7f... Add CoglFrameTimings
  64e785f... Add missing cogl-output.c

Commits added to the branch:

  6a62e30... sdl: Don't set SDL_GL_DOUBLEBUFFER when the swap chain has  (*)
  fefa6bc... cogl.symbols: Add symbols required for Clutter 1.12 (*)
  491618a... cogl-gles2-context: Cast func pointers to void* when fillin (*)
  f326401... opengl: Fix conditional call of BlendFuncSeparate (*)
  5bec500... build/win32/vs*/cogl_sdl.sln: Temporary commit to fix line  (*)
  8106b05... build/win32/vs*/cogl_sdl.sln: Fix line endings (*)
  6c438e0... Update Visual Studio 2010 solution files (*)
  1201088... Fix Visual C++ 2008 "install" process (*)
  9cc076b... Update Visual C++ property sheets (*)
  70f71e2... doc: Generate a valid cogl-context.xml (*)
  ab00855... build: only build cogland with wayland-server 0.85 (*)
  3cc3c19... Updates NEWS for the 1.12.2 release (*)
  0f2ce5e... Release 1.12.2 (release) (*)
  015a47b... Post-release version bump to 1.12.3 (*)
  f1baa4d... Clear the scissor before calling glBlitFramebuffer in swap_ (*)
  5bce5f8... Use the correct type for GLintptr (*)
  58bbf84... Bump version to 1.13.1 (*)
  87bc616... framebuffer: Support texture based depth buffers (*)
  ce5d06a... framebuffer: split GL code out from cogl-framebuffer.c (*)
  13f228f... Remove all remaining _EXP suffix defines (*)
  0ffad6b... texture-rectangle: Make new_from_foreign api public (*)
  1161870... matrix: Add cogl_debug_matrix_print api (*)
  f4bb93d... gitignore: Ignore the new and generated cogl-egl-defines.h (*)
  ab91bdf... build: Remove spurious Makefile.am (*)
  c9fe28c... renderer: Remove unused error from CoglRendererError (*)
  5ef579b... gitignore: Only ignore the README file at the root of the r (*)
  24fa64b... core: Don't use g_once_*() API (*)
  024a143... stb_image: Fix warnings that the original stb_image has (*)
  0fdfde5... build: Bump the glib dependency to 2.32 (*)
  5d62185... Re-organize the source layout (*)
  27fb294... tests: Don't build test-journal with --disable-glib (*)
  eb92b51... core: Don't initialize the GType system with --disable-glib (*)
  a229a06... build: Move the compiler checks and libtool initialization  (*)
  4a229cf... config: Don't read a config file at startup when using --di (*)
  4bff97b... tests: Don't use g_test_verbose() as cogl doesn't use GTest (*)
  21cf79d... build: Indicate if cogl is build with i18n support (*)
  6a126f2... build: Use the correct variable to indicate of cogl-gles2 w (*)
  df21e20... Adds CoglError api (*)
  d2c4150... build: Allow to build cogl without an external glib depende (*)
  41f4439... Build: Add a --enable-standalone option (*)
  04ec48c... build the sdl examples when glib is disabled (*)
  1c0c1a1... build: Create the libtool file early as it's used by AS_GLI (*)
  ab72a22... build: don't include deps/glib headers if glib enabled (*)
  8326c71... texture: rename texobj flush code as gl specific (*)
  4087e84... texture-2d: factor out all GL specific code (*)
  ae2b064... blit: avoid using _COGL_GET_CONTEXT (*)
  4efcd4e... attribute: Split out GL specific code (*)
  ae713a3... Adds a NOP driver (*)
  ffd2cf8... clip-stack: Splits out opengl specific code (*)
  91a02e9... buffer: move choice about using malloc closer to driver (*)
  bcf6a61... Give buffer/bitmap bind functions gl infix (*)
  b1ecfbf... buffer: splits out GL specific code (*)
  6712aae... pipeline: remove dubious optimization (*)
  d20c8e4... pipeline: remove unused _MASK defines (*)
  9fd201f... pipeline: remove duplicate defines (*)
  f05a1a6... pipeline: tidy up definition of *END defines (*)
  8f3380a... Clearly define 3 progends that own the frag+vertends (*)
  2bcf38d... Fix a warning in the vtable for texture_2d_get_data (*)
  2438d70... driver-gl: split out parse_gl_version function (*)
  258aba3... check the glsl version during init (*)
  62b472f... add cogl-glsl-shader files to aid backporting patches (*)
  0193720... Unify a lot of gles2 vs gl glsl code (*)
  986ba3a... egl: remove special re-try without stencil code (*)
  de7416f... driver-gl: re-indent misleading if-else statement (*)
  1abf0ed... pipeline: Don't notify the undefined progend of layer chang (*)
  2616ae0... Add a GL 3 driver (*)
  9b59588... Add a simple conformance test for alpha testing (*)
  bf8a1b1... progend-glsl: Fix handling of the builtin uniforms on non-G (*)
  2e77c03... Fix a warning when building without GLES2 support (*)
  0866b90... object: Move cogl_object_{ref,unref}() to cogl-object.h (*)
  f9c7e9d... framebuffer: Annotate the output parameter of get_viewport4 (*)
  2582fa1... display: Fix 'arguments' typo (*)
  8039c2c... Fix a warning when building the SDL2 winsys (*)
  76843fc... sdl2: Fix GL3 context creation (*)
  87e15d6... build: fix make dist (*)
  08205a4... context: glib-mkenums chokes on /*< private >*/ but support (*)
  979a3d5... error: Fix 'burden' typo (*)
  8a3fb7a... context: Re-add /<* private *>/ for _COGL_N_FEATURE_IDS (*)
  ec03357... Add cogl_buffer_map_range() (*)
  6db9427... Use cogl_buffer_map_range from the journal (*)
  53f43a4... Add a test case for cogl_buffer_map_range (*)
  7654c7c... Make cogl_color_init_from_4fv take a const array (*)
  362db1c... Don't add the ARB suffix for the GL_ARB_map_buffer_range ex (*)
  6cfc93f... clip-stack: workaround intel gen6 viewport clip bug (*)
  41d59c0... cogl: Enable PBO path for all mesa versions when using inte (*)
  11126a1... tests: Convert test-npot-texture to Cogl (*)
  9f107ab... Support window resizing in the SDL 2 winsys (*)
  982ee75... Fix flushing the stencil viewport clipping workaround (*)
  05ebbfd... sdl: Support setting resizable before allocate in SDL 1 (*)
  ff11a2b... Use GL_ARB_texture_swizzle to emulate GL_ALPHA textures (*)
  eec0f1c... Add cogl_sdl_onscreen_get_window() (*)
  5c8eebb... configure: Don't allow --enable-gdk-pixbuf with --disable-g (*)
  4f6fe6f... Fixes for --disable-glib (*)
  31d105a... Check for out-of-memory when allocating 2d textures (*)
  fa62fe2... tests: update inline with master (*)
  0b8780f... tests: Don't report success when the test is skipped (*)
  996260c... tests: Differentiate between known failures and missing req (*)
  fda5e15... Add a conformance test using alpha textures (*)
  272431e... Check for out-of-memory when allocating 3d textures (*)
  14d8ec7... sync cogl-blit and cogl-texture with master (*)
  1c449c6... Remove the varying array for tex_coords (*)
  7fa04bb... Adds back tex_coord array for CoglShader compatibility (*)
  56ae6f9... progend-glsl: dirty prog for vertex state changes (*)
  6e379fb... attribute: Adds support for constant CoglAttributes (*)
  63db64f... attribute: Only unref buffer for buffered attributes (*)
  f53fb5e... Allow propogation of OOM errors to apps (*)
  e439bdd... atlas: catch _create_texture errors (*)
  07d47ea... texture: split out high-level texture constructors (*)
  da9f5e6... bitmap: ret CoglError from _new_with_malloc_buffer (*)
  6941ff2... matrix-stack: init cache->flipped (*)
  e8eb979... moves some gl texture code too cogl-texture-gl.c (*)
  3892170... blit: avoid referring to framebuffer stack (*)
  af0dc34... Fix spelling of _cogl_propagate_error (*)
  ca5197a... error: Don't allocate a new CoglError when propagating (*)
  7941357... journal: don't reference global context (*)
  110a7d0... framebuffer: remove use of _COGL_GET_CONTEXT (*)
  cd7b15b... glx: avoid use of _COGL_GET_CONTEXT() (*)
  579db90... cogl-pango: Updates to no longer require a default context (*)
  fa5a9c8... atlas-texture: remove some use of _COGL_GET_CONTEXT (*)
  7011eb5... texture: expose mipmap level in set region apis (*)
  4b41743... tests: port test-texture-get-set-data to be standalone (*)
  c72ede0... Simplify test-pixel-buffer (*)
  6bcfc83... Fix handling of binding errors when uploading a full textur (*)
  5d796f0... x11: Replace all internal usage of cogl_xlib_get_display() (*)
  5bc6121... journal: don't call cogl_attribute_buffer_new with NULL (*)
  9eb816b... matrix-stack: getting parent ptr before freeing (*)
  f5b95e8... matrix-stack: move pointer to top of CoglMatrixEntry (*)
  3e33c00... matrix-stack: only maintain composite_gets in debug builds (*)
  cab4622... matrix-stack: make CoglMatrixStack public (*)
  1f0b432... sdl: Bind the default window when currently bound window is (*)
  b8d9bbe... Don't use #if with defines that are either defined or not (*)
  3289fe0... build: Exclude COGL_DEFINES and COGL_GL_HEADER_INCLUDES fro (*)
  f51f245... build: Use -Wundef when possible (*)
  7b43289... doc: Use Returns: to annotate return values (*)
  cec7822... doc: Move the main loop integration in the integration sect (*)
  5d51da4... doc: Re-organise the first few sections (*)
  5e78efd... doc: Add all the objects with a role leading to context cre (*)
  37cc715... doc: Add missing symbol in cogl_framebuffer_get_context() d (*)
  e907805... doc: Automatically build the list of *-private.h files (*)
  81a94a7... doc: Expose the Cogl GLES 2.0 facilities in the documentati (*)
  388e589... doc: Fix a typo in the description of cogl-bitmap (*)
  5b7faf1... doc: Expose CoglBitmap (*)
  8c1708e... doc: Fix argument syntax of existing commment blocks (*)
  e4ca3cb... doc: s/Fuction/Function/ (*)
  2da630f... doc: Remove the last reference to VertexArrays (*)
  0142d02... doc: Update the section name and description of CoglIndices (*)
  532cd9b... doc: Fix small typo of sequence (*)
  6932b66... doc: Declare CoglIndices (*)
  f63b459... doc: Finish describing the arguments of cogl_error_matches( (*)
  e8838e7... doc: The filter related functions have lost '_native' (*)
  6aadb4a... doc: Make a pass on CoglRenderer argument documentation (*)
  864e556... doc: Fix various mismatches between arguments and their doc (*)
  cfcb440... doc: Document the members of CoglPollFDEvent (*)
  7dab25d... doc: Fix copy/paste error for cogl_framebuffer_get_alpha_bi (*)
  b8a18d6... doc: The swap functions have moved from the framebuffer to  (*)
  f2b0dac... doc: Document CoglColor (*)
  61e1206... doc: Unhide cogl-matrix-stack.h (*)
  17333d3... doc: Use <ulink> to make Gimbal Lock reactive (*)
  5cd6e9c... doc: Rename the remaining CoglMaterial* elements in the sec (*)
  9ae9602... doc: Expose CoglDepthState (*)
  f1f1e87... doc: Fix the remaining warning around the depth state (*)
  5c12c36... doc: Don't use the HTML <ul> but the DocBook equivalent (*)
  780b01f... doc: Populate cogl-types a bit more and move it to the gene (*)
  55d2a03... doc: Don't use '::' to denote an object property (*)
  a3b7185... doc: Add Onscreen to the party (*)
  9401cb0... doc: Fixup type references (*)
  bde1d2e... doc: Fix FALSE documentation (*)
  c0a024f... doc: Put the opening '{' at the end of combined typedefs (*)
  ec6a713... doc: Add a missing '*' to the documentation of CoglFilterRe (*)
  58680d3... doc: Update the list of files to ignore (*)
  4316c3c... doc: Use Docbook's <constant> for external constants (*)
  c26d381... doc: Fix cross-referencing with glib and gdk-pixbuf (*)
  5912ee9... doc: Fix the remaining broken internal cross-references (*)
  1f78b40... enum-types: Fix the header guard #endif comment (*)
  a0d47d5... build: Hide cogl_pipeline_cache_{new,free}() (*)
  db4b39b... doc: Add 2013 in the Copyright statement (*)
  36c85da... Remove cogl-internal.h (*)
  a57195d... framebuffer: split out GL read_pixels code (*)
  0850eea... Move _cogl_texture_get_gl_format to -texture-gl.c (*)
  5a814e3... texture: add width/height members to base CoglTexture (*)
  73e8a6d... Allow lazy texture storage allocation (*)
  2c0d483... texture: Adds cogl_texture_set_data convenience api (*)
  a2aa04f... texture-2d-slice: Fix the foreach_sub_texture_in_region imp (*)
  671275b... Also flip the virtual coordinates when iterating spans (*)
  1e6ec66... Add a conformance test for some wrap modes on a rectangle t (*)
  fe3aa8b... Query glX* functions before getting the context to fix GL3  (*)
  41612bf... Add a test for getting the component sizes from different f (*)
  0b01c91... framebuffer: Bind the framebuffer before querying the bits (*)
  109e576... Add a public cogl_framebuffer_get_depth_bits() function (*)
  520ccba... Query the framebuffer stencil bits instead of assuming it's (*)
  988486a... framebuffer: Support the GL_RED texture workaround when que (*)
  82615e2... Don't try to use clip planes on GL3 (*)
  7572fed... Fix filling the array of texture pointers for sliced textur (*)
  3a041ef... Reorder some struct members to avoid padding due to alignme (*)
  1d31055... disable viewport scissor workaround for clear (*)
  ebdac31... tests: flag backface culling failure without NPOT support (*)
  50005a9... build: update to build with automake 1.13 (*)
  51f3e28... bitmap: Don't try to token paste the typenames from stdint. (*)
  364f232... tests: Mark test_framebuffer_get_bits as only working on GL (*)
  9a8a262... test-write-texture-formats: Add fuzziness to the pixel comp (*)
  8c319e4... Remove vestiges of libdl / dlfcn.h as cogl uses gmodule. (*)
  24b064a... Updates NEWS for the 1.13.2 release (*)
  b33b41e... Release 1.13.2 (snapshot) (*)
  78bea22... Post-release version bump to 1.13.3 (*)
  55ea53b... Add CoglOutput and track for the GLX backend (*)
  a0de9e7... Add missing cogl-output.c (*)
  394a162... Prefer OML_sync_control over SGI_video_sync when waiting fo (*)
  646c280... Add CoglFrameTimings (*)
  98d2be9... pedantic style fixes (*)
  4a881b2... use c99 types if applicable and s/gboolean/CoglBool/ (*)
  ac24c9d... move outputs member up to CoglRenderer (*)
  2619778... rename CoglFrameTimings to CoglSwapInfo (*)
  1b6ccda... use c99 types if applicable and s/gboolean/CoglBool/ (*)
  30ad78f... rename SwapInfo to FrameInfo
  0dd495d... frame-info: s/_refresh_interval/_refresh_rate/
  c7bda39... renderer: expose CoglOutputs
  8a1a1f5... onscreen: Provide more general CoglFrameCallback api
  5cc26c8... Add cogl_frame_info_get_output()
  38ac56b... Remove cogl_frame_info_get_frame_time()
  67bc406... Don't use g_get_monotonic_time()
  36bbcb0... Switch presentation time to nanoseconds
  41de986... Replace frame history with a queue
  47bf79c... Remove cogl_frame_info_get_complete()

(*) This commit already existed in another branch; no separate mail sent