← Back to branch summary

~ubuntu-branches/ubuntu/raring/mesa/raring-proposed

« back to all changes in this revision

Viewing changes to src/gallium/drivers/softpipe/sp_state_shader.c

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2013-03-14 12:18:29 UTC
  • mfrom: (1.7.14)
  • Revision ID: package-import@ubuntu.com-20130314121829-bv7c0z6t1pob5ket
Tags: 9.0.3-0ubuntu1
https://launchpad.net/bugs/1134466
New upstream release. (LP: #1134466)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gallium/drivers/softpipe/sp_state_shader.c
38
38
#include "draw/draw_vs.h"
39
39
#include "draw/draw_gs.h"
40
40
#include "tgsi/tgsi_dump.h"
41
 
#include "tgsi/tgsi_exec.h"
42
41
#include "tgsi/tgsi_scan.h"
43
42
#include "tgsi/tgsi_parse.h"
44
43
 
182
181
 
183
182
   assert(fs != softpipe->fs);
184
183
 
185
 
   if (softpipe->fs_machine->Tokens == state->shader.tokens) {
186
 
      /* unbind the shader from the tgsi executor if we're
187
 
       * deleting it.
188
 
       */
189
 
      tgsi_exec_machine_bind_shader(softpipe->fs_machine, NULL, 0, NULL);
190
 
   }
191
 
 
192
184
   /* delete variants */
193
185
   for (var = state->variants; var; var = next_var) {
194
186
      next_var = var->next;
200
192
      draw_delete_fragment_shader(softpipe->draw, var->draw_shader);
201
193
#endif
202
194
 
203
 
      var->delete(var);
 
195
      var->delete(var, softpipe->fs_machine);
204
196
   }
205
197
 
206
198
   draw_delete_fragment_shader(softpipe->draw, state->draw_shader);