diff options
author | Ben Skeggs <[email protected]> | 2008-05-25 14:19:18 +1000 |
---|---|---|
committer | Ben Skeggs <[email protected]> | 2008-05-25 14:19:18 +1000 |
commit | 92120851947ad4a47d2150a7cf3f8dc5fdde396c (patch) | |
tree | 21a04cf25570028ee0266558a1350577751722ab /src/gallium/auxiliary/gallivm/gallivm.cpp | |
parent | 9a01ee4424718e0c3015c1f0477cae63ee63d96b (diff) | |
parent | 7fbb61eedd4b07f07007a172cea227d5c363b908 (diff) |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/auxiliary/gallivm/gallivm.cpp')
-rw-r--r-- | src/gallium/auxiliary/gallivm/gallivm.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/gallivm/gallivm.cpp b/src/gallium/auxiliary/gallivm/gallivm.cpp index b6f641a3f86..77900e342b1 100644 --- a/src/gallium/auxiliary/gallivm/gallivm.cpp +++ b/src/gallium/auxiliary/gallivm/gallivm.cpp @@ -288,10 +288,7 @@ void gallivm_ir_fill_from_tgsi(struct gallivm_ir *ir, std::cout << "Creating llvm from: " <<std::endl; tgsi_dump(tokens, 0); - llvm::Module *mod = tgsi_to_llvmir(ir, tokens); - - //llvm::Module *mod = tgsi_to_llvm(ir, tokens); ir->module = mod; gallivm_ir_dump(ir, 0); } @@ -306,11 +303,11 @@ struct gallivm_prog * gallivm_ir_compile(struct gallivm_ir *ir) { struct gallivm_prog *prog = (struct gallivm_prog *)calloc(1, sizeof(struct gallivm_prog)); - + std::cout << "Before optimizations:"<<std::endl; ir->module->dump(); std::cout<<"-------------------------------"<<std::endl; - + PassManager veri; veri.add(createVerifierPass()); veri.run(*ir->module); @@ -318,7 +315,7 @@ struct gallivm_prog * gallivm_ir_compile(struct gallivm_ir *ir) prog->num_consts = ir->num_consts; memcpy(prog->interpolators, ir->interpolators, sizeof(prog->interpolators)); prog->num_interp = ir->num_interp; - + /* Run optimization passes over it */ PassManager passes; passes.add(new TargetData(mod)); |