← Back to branch summary

~ubuntu-branches/ubuntu/precise/mesa/precise-updates

« back to all changes in this revision

Viewing changes to src/gallium/auxiliary/draw/draw_pipe_aaline.c

  • Committer: Package Import Robot
  • Author(s): Robert Hooker
  • Date: 2012-02-02 12:05:48 UTC
  • mfrom: (1.7.1) (3.3.27 sid)
  • Revision ID: package-import@ubuntu.com-20120202120548-nvkma85jq0h4coix
Tags: 8.0~rc2-0ubuntu4
Drop drisearchdir handling, it is no longer needed with multiarch
and dri-alternates being removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gallium/auxiliary/draw/draw_pipe_aaline.c
374
374
                         newLen, &transform.base);
375
375
 
376
376
#if 0 /* DEBUG */
 
377
   debug_printf("draw_aaline, orig shader:\n");
377
378
   tgsi_dump(orig_fs->tokens, 0);
 
379
   debug_printf("draw_aaline, new shader:\n");
378
380
   tgsi_dump(aaline_fs.tokens, 0);
379
381
#endif
380
382
 
692
694
   }
693
695
 
694
696
   /* update vertex attrib info */
695
 
   aaline->tex_slot = draw_current_shader_outputs(draw);
696
697
   aaline->pos_slot = draw_current_shader_position_output(draw);;
697
698
 
698
699
   /* allocate the extra post-transformed vertex attribute */
699
 
   (void) draw_alloc_extra_vertex_attrib(draw, TGSI_SEMANTIC_GENERIC,
700
 
                                         aaline->fs->generic_attrib);
 
700
   aaline->tex_slot = draw_alloc_extra_vertex_attrib(draw,
 
701
                                                     TGSI_SEMANTIC_GENERIC,
 
702
                                                     aaline->fs->generic_attrib);
701
703
 
702
704
   /* how many samplers? */
703
705
   /* we'll use sampler/texture[pstip->sampler_unit] for the stipple */
784
786
 
785
787
   draw_free_temp_verts( stage );
786
788
 
 
789
   /* restore the old entry points */
 
790
   pipe->create_fs_state = aaline->driver_create_fs_state;
 
791
   pipe->bind_fs_state = aaline->driver_bind_fs_state;
 
792
   pipe->delete_fs_state = aaline->driver_delete_fs_state;
 
793
 
 
794
   pipe->bind_fragment_sampler_states = aaline->driver_bind_sampler_states;
 
795
   pipe->set_fragment_sampler_views = aaline->driver_set_sampler_views;
 
796
 
787
797
   FREE( stage );
788
798
}
789
799
 
840
850
   if (aafs == NULL)
841
851
      return NULL;
842
852
 
843
 
   aafs->state = *fs;
 
853
   aafs->state.tokens = tgsi_dup_tokens(fs->tokens);
844
854
 
845
855
   /* pass-through */
846
856
   aafs->driver_fs = aaline->driver_create_fs_state(pipe, fs);
874
884
   if (aafs->aaline_fs)
875
885
      aaline->driver_delete_fs_state(pipe, aafs->aaline_fs);
876
886
 
 
887
   FREE((void*)aafs->state.tokens);
 
888
 
877
889
   FREE(aafs);
878
890
}
879
891