diff options
| author | Brian Paul <[email protected]> | 2010-11-30 16:07:52 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-11-30 16:35:12 -0700 |
| commit | efc82aef35a2aac5d2ed9774f6d28f2626796416 (patch) | |
| tree | 72fe4482d72dbeb8e41b15793b21f38de62ef834 /src/gallium/auxiliary/Makefile | |
| parent | 1f1375d4d876c2c85156e02a177254684446040b (diff) | |
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
Diffstat (limited to 'src/gallium/auxiliary/Makefile')
| -rw-r--r-- | src/gallium/auxiliary/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile index 9aa54121786..574385a5c9c 100644 --- a/src/gallium/auxiliary/Makefile +++ b/src/gallium/auxiliary/Makefile @@ -185,7 +185,7 @@ GALLIVM_SOURCES = \ draw/draw_pt_fetch_shade_pipeline_llvm.c GALLIVM_CPP_SOURCES = \ - gallivm/lp_bld_misc.cpp + gallivm/lp_bld_misc.cpp GENERATED_SOURCES = \ indices/u_indices_gen.c \ |