[cogl] (16 commits) Created branch wip/neil/master-next

[Neil Roberts <nroberts src gnome org>]

The branch 'wip/neil/master-next' was created.

Summary of new commits:

  a2b554f... Add cogl_texture_get_type()
  6183866... cogl-pipeline-layer: Use CoglTextureType instead of GL targ
  afbffe4... cogl-pipeline: Fix comparing the texture data state for NUL
  e547b1d... Add cogl_pipeline_set_layer_default_texture()
  ae4757c... test-texture-3d: Port to Cogl
  a6b5734... test-texture-3d: Add a test for multi-texturing 3D and 2D t
  063779e... Add a test for pipelines with sparse layer indices
  20cac7c... Add a version of _cogl_pipeline_get_layer which does not cr
  6b3ef4b... pipeline: Use layer numbers not unit numbers in the combine
  300bcc3... glsl: Use layer numbers not unit numbers for builtin unifor
  0a86680... glsl: always emit sampler uniforms for non NULL layers
  ef584a9... Pass the sampler object to snippet hooks on the texture_hoo
  25d7ef9... test-snippets: Split up the tests into multiple functions
  ac47700... test-snippets: Add a test for using cogl_sampler in tex hoo
  70d97d7... tests: Move the create_color_texture function to test-utils
  3a3cbd2... test-snippets: Add a test case for sampling arbitrary units