← Back to branch summary

~ubuntu-branches/ubuntu/precise/clutter-1.0/precise

« back to all changes in this revision

Viewing changes to clutter/cogl/cogl/cogl-pipeline-fragend-glsl.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-06-14 15:42:20 UTC
  • mfrom: (1.1.18 upstream)
  • Revision ID: james.westby@ubuntu.com-20110614154220-tx3wzg90gppl2zqw
Tags: 1.6.16-0ubuntu1
* Resynchronize on Debian
* New upstream version

Show diffs side-by-side

added added

removed removed

Lines of Context:
clutter/cogl/cogl/cogl-pipeline-fragend-glsl.c
350
350
  int unit_index = _cogl_pipeline_layer_get_unit_index (layer);
351
351
  const char *target_string, *tex_coord_swizzle;
352
352
 
 
353
  if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_DISABLE_TEXTURING)))
 
354
    {
 
355
      g_string_append (glsl_shader_state->source,
 
356
                       "vec4 (1.0, 1.0, 1.0, 1.0).");
 
357
      g_string_append (glsl_shader_state->source, swizzle);
 
358
 
 
359
      return;
 
360
    }
 
361
 
353
362
  texture = _cogl_pipeline_layer_get_texture (layer);
354
363
 
355
364
  if (texture == COGL_INVALID_HANDLE)