← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gallium/drivers/nv50/nv50_shader_state.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/drivers/nv50/nv50_shader_state.c
130
130
   int ret;
131
131
   unsigned size;
132
132
 
133
 
   if (prog->translated)
 
133
   if (!prog->translated) {
 
134
      prog->translated = nv50_program_translate(prog);
 
135
      if (!prog->translated)
 
136
         return FALSE;
 
137
   } else
 
138
   if (prog->res)
134
139
      return TRUE;
135
140
 
136
 
   prog->translated = nv50_program_translate(prog);
137
 
   if (!prog->translated)
138
 
      return FALSE;
139
 
 
140
141
   if (prog->type == PIPE_SHADER_FRAGMENT) heap = nv50->screen->fp_code_heap;
141
142
   else
142
143
   if (prog->type == PIPE_SHADER_GEOMETRY) heap = nv50->screen->gp_code_heap;
170
171
   struct nouveau_channel *chan = nv50->screen->base.channel;
171
172
   struct nv50_program *vp = nv50->vertprog;
172
173
 
173
 
   if (nv50->clip.nr > vp->vp.clpd_nr) {
174
 
      if (vp->translated)
175
 
         nv50_program_destroy(nv50, vp);
176
 
      vp->vp.clpd_nr = nv50->clip.nr;
177
 
   }
178
 
 
179
174
   if (!nv50_program_validate(nv50, vp))
180
175
         return;
181
176