Mesa (master): gallivm/llvmpipe: squash merge of the llvm-context branch

[Brian Paul]

Module: Mesa
Branch: master
Commit: efc82aef35a2aac5d2ed9774f6d28f2626796416
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=efc82aef35a2aac5d2ed9774f6d28f2626796416

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Nov 30 16:07:52 2010 -0700

gallivm/llvmpipe: squash merge of the llvm-context branch

This branch defines a gallivm_state structure which contains the
LLVMBuilderRef, LLVMContextRef, etc.  All data structures built with
this object can be periodically freed during a "garbage collection"
operation.

The gallivm_state object has to be passed to most of the builder
functions where LLVMBuilderRef used to be used.

Conflicts:
	src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
	src/gallium/drivers/llvmpipe/lp_state_setup.c

---

 src/gallium/auxiliary/Makefile                     |    2 +-
 src/gallium/auxiliary/draw/draw_context.c          |   29 +-
 src/gallium/auxiliary/draw/draw_context.h          |    5 +
 src/gallium/auxiliary/draw/draw_llvm.c             |  853 +++++++++++---------
 src/gallium/auxiliary/draw/draw_llvm.h             |   60 +-
 src/gallium/auxiliary/draw/draw_llvm_sample.c      |   20 +-
 src/gallium/auxiliary/draw/draw_llvm_translate.c   |  338 ++++----
 src/gallium/auxiliary/draw/draw_private.h          |    1 -
 .../draw/draw_pt_fetch_shade_pipeline_llvm.c       |   27 +-
 src/gallium/auxiliary/gallivm/lp_bld.h             |   29 +
 src/gallium/auxiliary/gallivm/lp_bld_arit.c        |  289 ++++---
 src/gallium/auxiliary/gallivm/lp_bld_assert.c      |   21 +-
 src/gallium/auxiliary/gallivm/lp_bld_assert.h      |    4 +-
 src/gallium/auxiliary/gallivm/lp_bld_bitarit.c     |    4 +-
 src/gallium/auxiliary/gallivm/lp_bld_const.c       |   44 +-
 src/gallium/auxiliary/gallivm/lp_bld_const.h       |   30 +-
 src/gallium/auxiliary/gallivm/lp_bld_conv.c        |  100 ++-
 src/gallium/auxiliary/gallivm/lp_bld_conv.h        |    8 +-
 src/gallium/auxiliary/gallivm/lp_bld_debug.h       |    1 +
 src/gallium/auxiliary/gallivm/lp_bld_flow.c        |  123 ++--
 src/gallium/auxiliary/gallivm/lp_bld_flow.h        |   41 +-
 src/gallium/auxiliary/gallivm/lp_bld_format.h      |   13 +-
 src/gallium/auxiliary/gallivm/lp_bld_format_aos.c  |  118 ++--
 src/gallium/auxiliary/gallivm/lp_bld_format_soa.c  |   73 +-
 src/gallium/auxiliary/gallivm/lp_bld_format_yuv.c  |  115 ++--
 src/gallium/auxiliary/gallivm/lp_bld_gather.c      |   41 +-
 src/gallium/auxiliary/gallivm/lp_bld_gather.h      |    6 +-
 src/gallium/auxiliary/gallivm/lp_bld_init.c        |  359 ++++++++-
 src/gallium/auxiliary/gallivm/lp_bld_init.h        |   39 +-
 src/gallium/auxiliary/gallivm/lp_bld_intr.c        |   14 +-
 src/gallium/auxiliary/gallivm/lp_bld_intr.h        |    7 +-
 src/gallium/auxiliary/gallivm/lp_bld_logic.c       |   45 +-
 src/gallium/auxiliary/gallivm/lp_bld_logic.h       |    2 +-
 src/gallium/auxiliary/gallivm/lp_bld_pack.c        |   84 +-
 src/gallium/auxiliary/gallivm/lp_bld_pack.h        |   14 +-
 src/gallium/auxiliary/gallivm/lp_bld_printf.c      |   39 +-
 src/gallium/auxiliary/gallivm/lp_bld_printf.h      |   13 +-
 src/gallium/auxiliary/gallivm/lp_bld_quad.c        |   11 +-
 src/gallium/auxiliary/gallivm/lp_bld_sample.c      |  169 ++--
 src/gallium/auxiliary/gallivm/lp_bld_sample.h      |   28 +-
 src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c  |  112 ++--
 src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c  |  114 ++--
 src/gallium/auxiliary/gallivm/lp_bld_struct.c      |   33 +-
 src/gallium/auxiliary/gallivm/lp_bld_struct.h      |   12 +-
 src/gallium/auxiliary/gallivm/lp_bld_swizzle.c     |   67 +-
 src/gallium/auxiliary/gallivm/lp_bld_swizzle.h     |    4 +-
 src/gallium/auxiliary/gallivm/lp_bld_tgsi.h        |    7 +-
 src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c    |   47 +-
 src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c    |  159 ++--
 src/gallium/auxiliary/gallivm/lp_bld_type.c        |   38 +-
 src/gallium/auxiliary/gallivm/lp_bld_type.h        |   14 +-
 src/gallium/drivers/llvmpipe/lp_bld_alpha.c        |    4 +-
 src/gallium/drivers/llvmpipe/lp_bld_alpha.h        |    2 +-
 src/gallium/drivers/llvmpipe/lp_bld_blend.h        |    5 +-
 src/gallium/drivers/llvmpipe/lp_bld_blend_aos.c    |    4 +-
 src/gallium/drivers/llvmpipe/lp_bld_blend_soa.c    |    6 +-
 src/gallium/drivers/llvmpipe/lp_bld_depth.c        |   58 +-
 src/gallium/drivers/llvmpipe/lp_bld_depth.h        |    6 +-
 src/gallium/drivers/llvmpipe/lp_bld_interp.c       |   26 +-
 src/gallium/drivers/llvmpipe/lp_bld_interp.h       |    7 +-
 src/gallium/drivers/llvmpipe/lp_context.c          |   54 ++-
 src/gallium/drivers/llvmpipe/lp_context.h          |   13 +
 src/gallium/drivers/llvmpipe/lp_flush.c            |    7 +
 src/gallium/drivers/llvmpipe/lp_jit.c              |  131 ++--
 src/gallium/drivers/llvmpipe/lp_jit.h              |   28 +-
 src/gallium/drivers/llvmpipe/lp_rast.c             |    5 +-
 src/gallium/drivers/llvmpipe/lp_rast_priv.h        |    9 +-
 src/gallium/drivers/llvmpipe/lp_screen.h           |   14 +-
 src/gallium/drivers/llvmpipe/lp_setup.c            |    8 +-
 src/gallium/drivers/llvmpipe/lp_setup.h            |    3 +
 src/gallium/drivers/llvmpipe/lp_setup_vbuf.c       |    2 +
 src/gallium/drivers/llvmpipe/lp_state_fs.c         |  226 +++---
 src/gallium/drivers/llvmpipe/lp_state_fs.h         |    7 +
 src/gallium/drivers/llvmpipe/lp_state_setup.c      |  247 +++---
 src/gallium/drivers/llvmpipe/lp_test.h             |    7 +-
 src/gallium/drivers/llvmpipe/lp_test_blend.c       |   65 +-
 src/gallium/drivers/llvmpipe/lp_test_conv.c        |   66 +-
 src/gallium/drivers/llvmpipe/lp_test_format.c      |   76 +-
 src/gallium/drivers/llvmpipe/lp_test_main.c        |   11 +-
 src/gallium/drivers/llvmpipe/lp_test_printf.c      |   96 +--
 src/gallium/drivers/llvmpipe/lp_test_round.c       |   69 +--
 src/gallium/drivers/llvmpipe/lp_test_sincos.c      |   63 +-
 src/gallium/drivers/llvmpipe/lp_tex_sample.c       |   22 +-
 83 files changed, 2912 insertions(+), 2261 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=efc82aef35a2aac5d2ed9774f6d28f2626796416