← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gallium/drivers/llvmpipe/lp_state_setup.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/llvmpipe/lp_state_setup.c
351
351
   }
352
352
 
353
353
   if (key->twoside) {
354
 
      if (vert_attr == key->color_slot && key->bcolor_slot != ~0)
 
354
      if (vert_attr == key->color_slot && key->bcolor_slot >= 0)
355
355
         lp_twoside(gallivm, args, key, key->bcolor_slot);
356
 
      else if (vert_attr == key->spec_slot && key->bspec_slot != ~0)
 
356
      else if (vert_attr == key->spec_slot && key->bspec_slot >= 0)
357
357
         lp_twoside(gallivm, args, key, key->bspec_slot);
358
358
   }
359
359
}
556
556
 
557
557
   lp_func_delete_body(function);
558
558
 
559
 
   return f;
 
559
   return (lp_jit_setup_triangle) pointer_to_func(f);
560
560
}
561
561
 
562
562
/* XXX: Generic code:
771
771
   key->twoside = lp->rasterizer->light_twoside;
772
772
   key->size = Offset(struct lp_setup_variant_key,
773
773
                      inputs[key->num_inputs]);
774
 
   key->color_slot = lp->color_slot[0];
 
774
 
 
775
   key->color_slot  = lp->color_slot [0];
775
776
   key->bcolor_slot = lp->bcolor_slot[0];
776
 
   key->spec_slot = lp->color_slot[1];
777
 
   key->bspec_slot = lp->bcolor_slot[1];
 
777
   key->spec_slot   = lp->color_slot [1];
 
778
   key->bspec_slot  = lp->bcolor_slot[1];
 
779
   assert(key->color_slot  == lp->color_slot [0]);
 
780
   assert(key->bcolor_slot == lp->bcolor_slot[0]);
 
781
   assert(key->spec_slot   == lp->color_slot [1]);
 
782
   assert(key->bspec_slot  == lp->bcolor_slot[1]);
 
783
 
778
784
   key->units = (float) (lp->rasterizer->offset_units * lp->mrd);
779
785
   key->scale = lp->rasterizer->offset_scale;
780
786
   key->pad = 0;
831
837
   llvmpipe_finish(pipe, __FUNCTION__);
832
838
 
833
839
   for (i = 0; i < LP_MAX_SETUP_VARIANTS / 4; i++) {
834
 
      struct lp_setup_variant_list_item *item = last_elem(&lp->setup_variants_list);
 
840
      struct lp_setup_variant_list_item *item;
 
841
      if (is_empty_list(&lp->setup_variants_list)) {
 
842
         break;
 
843
      }
 
844
      item = last_elem(&lp->setup_variants_list);
 
845
      assert(item);
 
846
      assert(item->base);
835
847
      remove_setup_variant(lp, item->base);
836
848
   }
837
849
}
868
880
      }
869
881
 
870
882
      variant = generate_setup_variant(lp->gallivm, key, lp);
871
 
      insert_at_head(&lp->setup_variants_list, &variant->list_item_global);
872
 
      lp->nr_setup_variants++;
873
 
 
874
 
      llvmpipe_variant_count++;
 
883
      if (variant) {
 
884
         insert_at_head(&lp->setup_variants_list, &variant->list_item_global);
 
885
         lp->nr_setup_variants++;
 
886
         llvmpipe_variant_count++;
 
887
      }
875
888
   }
876
889
 
877
890
   lp_setup_set_setup_variant(lp->setup,