← 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-arbfp.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-arbfp.c
381
381
{
382
382
  if (!arbfp_program_state->unit_state[unit_index].sampled)
383
383
    {
384
 
      g_string_append_printf (arbfp_program_state->source,
385
 
                              "TEMP texel%d;\n"
386
 
                              "TEX texel%d,fragment.texcoord[%d],"
387
 
                              "texture[%d],%s;\n",
388
 
                              unit_index,
389
 
                              unit_index,
390
 
                              unit_index,
391
 
                              unit_index,
392
 
                              gl_target_to_arbfp_string (gl_target));
 
384
      if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_DISABLE_TEXTURING)))
 
385
        g_string_append_printf (arbfp_program_state->source,
 
386
                                "TEMP texel%d;\n"
 
387
                                "MOV texel%d, one;\n",
 
388
                                unit_index,
 
389
                                unit_index);
 
390
      else
 
391
        g_string_append_printf (arbfp_program_state->source,
 
392
                                "TEMP texel%d;\n"
 
393
                                "TEX texel%d,fragment.texcoord[%d],"
 
394
                                "texture[%d],%s;\n",
 
395
                                unit_index,
 
396
                                unit_index,
 
397
                                unit_index,
 
398
                                unit_index,
 
399
                                gl_target_to_arbfp_string (gl_target));
393
400
      arbfp_program_state->unit_state[unit_index].sampled = TRUE;
394
401
    }
395
402
}