[cogl] (27 commits) Non-fast-forward update to branch wip/cogl-gst



The branch 'wip/cogl-gst' 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:

  89a0b2e... Add fragment and vertex snippet hooks for global declaratio
  44ba8eb... Add the layer's sampler and uniform declarations at the sta
  f0241aa... Include CoglGst
  d6dfd97... cogl-gst: fixes some indentation + guint usage
  cdb4fa6... cogl-gst: removes cogl_gst_init
  a52d137... cogl-gst: Remove the uniforms and varyings from the snippet
  8312c36... cogl-gst: Use the global declarations snippet hook
  a466744... cogl-gst: Add the global function even for the RGB cap
  ecd747e... cogl-gst: Don't advertise the GLSL caps if GLSL not support
  7cbf3f5... cogl-gst: Upgrade cogl-gst to gstreamer-1.0
  9c9c733... cogl-gst: Add some comments to the video player example
  7596dc9... gst: Don't install cogl-gst-shader.h
  91c5036... Fix some trailing whitespace issues
  8ef65d9... Get rid of cogl_gst_set_shader_hook
  a30f2a0... Get rid of the main loop from CoglGstVideoSink
  965d63d... gst: Don't rebuild the video sink for the plugin
  806f3a5... basic-video-player: Fix the user data pointer for the frame
  466f6fa... basic-video-player: Add the Cogl GSource to the GMainContex
  6a6435b... basic-video-player: Delay drawing until the framebuffer is 
  c0257cd... gst-video-sink: Use integers for emitting the signals
  47c40ba... gst: Cache the shader snippets

Commits added to the branch:

  ebb82d5... Add fragment and vertex snippet hooks for global declaratio (*)
  1824df9... Add the layer's sampler and uniform declarations at the sta (*)
  87c71f4... Added Slovak translation (*)
  1720d5c... bitmap: don't mark bitmap bound on _gl_bind error (*)
  f23f212... framebuffer: vp change = clip change for gen6 workaround (*)
  3cf4970... gl: ensure depth isn't masked during clear (*)
  8c5127c... Revert "cogl-buffer: Stop warning spam running in sw render (*)
  f14fd09... Updated Slovak translation (*)
  98f7890... Include CoglGst
  607376c... cogl-gst: fixes some indentation + guint usage
  38c74a9... cogl-gst: removes cogl_gst_init
  3c142c6... cogl-gst: Remove the uniforms and varyings from the snippet
  e217556... cogl-gst: Use the global declarations snippet hook
  55387d7... cogl-gst: Add the global function even for the RGB cap
  74aced7... cogl-gst: Don't advertise the GLSL caps if GLSL not support
  a76d4d7... cogl-gst: Upgrade cogl-gst to gstreamer-1.0
  b61b4a0... cogl-gst: Add some comments to the video player example
  3f35959... gst: Don't install cogl-gst-shader.h
  da2b447... Fix some trailing whitespace issues
  e4728fa... Get rid of cogl_gst_set_shader_hook
  a84eba0... Get rid of the main loop from CoglGstVideoSink
  ce84f2c... gst: Don't rebuild the video sink for the plugin
  e393d50... basic-video-player: Fix the user data pointer for the frame
  acd0edd... basic-video-player: Add the Cogl GSource to the GMainContex
  efb7209... basic-video-player: Delay drawing until the framebuffer is 
  bb7ee01... gst-video-sink: Use integers for emitting the signals
  bdaeefe... gst: Cache the shader snippets

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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]