← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mesa/quantal

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/i915/i915_texprog.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2007-02-21 12:44:07 UTC
  • mfrom: (1.2.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 22.
  • Revision ID: james.westby@ubuntu.com-20070221124407-rgcacs32mycrtadl
Import upstream version 6.5.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/drivers/dri/i915/i915_texprog.c
591
591
   intel->specoffset = 0;
592
592
   offset = 0;
593
593
 
 
594
   if (i915->current_program) {
 
595
      i915->current_program->on_hardware = 0;
 
596
      i915->current_program->params_uptodate = 0;
 
597
   }
 
598
 
594
599
   if (i915->vertex_fog == I915_FOG_PIXEL) {
595
600
      EMIT_ATTR( _TNL_ATTRIB_POS, EMIT_4F_VIEWPORT, S4_VFMT_XYZW, 16 );
596
601
      RENDERINPUTS_CLEAR( index_bitset, _TNL_ATTRIB_FOG );