diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-02-13 14:21:23 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-02-13 14:21:23 +1100 |
| commit | b397a2bb203c2b28b746af7828d9ad192cde0bc1 (patch) | |
| tree | 77448bf1db79ae112f057717109aaa98e5696b15 /src/mesa/pipe/softpipe/sp_state_fs.c | |
| parent | 5ba3dbe2cc8a9af5cae01f45eaf497f834400170 (diff) | |
| parent | e20e89e48287808068086ec148920dd89495d813 (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Diffstat (limited to 'src/mesa/pipe/softpipe/sp_state_fs.c')
| -rw-r--r-- | src/mesa/pipe/softpipe/sp_state_fs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/pipe/softpipe/sp_state_fs.c b/src/mesa/pipe/softpipe/sp_state_fs.c index 1430be7869..0b814fc284 100644 --- a/src/mesa/pipe/softpipe/sp_state_fs.c +++ b/src/mesa/pipe/softpipe/sp_state_fs.c @@ -61,12 +61,16 @@ softpipe_create_fs_state(struct pipe_context *pipe, } #ifdef MESA_LLVM - state->llvm_prog = gallivm_from_tgsi(state->shader.tokens, GALLIVM_FS); + state->llvm_prog = 0; + +#if 0 if (!gallivm_global_cpu_engine()) { gallivm_cpu_engine_create(state->llvm_prog); } else gallivm_cpu_jit_compile(gallivm_global_cpu_engine(), state->llvm_prog); +#endif + #elif defined(__i386__) || defined(__386__) if (softpipe->use_sse) { x86_init_func( &state->sse2_program ); |