diff options
| author | Zack Rusin <[email protected]> | 2007-10-31 06:51:19 -0400 |
|---|---|---|
| committer | Zack Rusin <[email protected]> | 2007-11-02 07:15:17 -0400 |
| commit | 7ff0df6c2bf11a36bc6101e361484bde57595a79 (patch) | |
| tree | 62c3b8911fa5d35e5e9d524db3e8775e9799b1f6 /src/mesa/pipe/draw | |
| parent | d8e66aca8443c6802ecd8f1a353024ed1d0f32c3 (diff) | |
Renaming llvmtgsi to gallivm. Taking first steps on the way to supporting
fragment shaders through llvm.
Diffstat (limited to 'src/mesa/pipe/draw')
| -rw-r--r-- | src/mesa/pipe/draw/draw_vertex_shader.c | 6 | ||||
| -rw-r--r-- | src/mesa/pipe/draw/draw_vertex_shader_llvm.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/pipe/draw/draw_vertex_shader.c b/src/mesa/pipe/draw/draw_vertex_shader.c index 056ad007cf4..7768a62000e 100644 --- a/src/mesa/pipe/draw/draw_vertex_shader.c +++ b/src/mesa/pipe/draw/draw_vertex_shader.c @@ -39,7 +39,7 @@ #include "x86/rtasm/x86sse.h" #include "pipe/tgsi/exec/tgsi_core.h" -#include "pipe/llvm/llvmtgsi.h" +#include "pipe/llvm/gallivm.h" #define DBG_VS 0 @@ -240,8 +240,10 @@ draw_create_vertex_shader(struct draw_context *draw, #endif #ifdef MESA_LLVM vs->llvm_prog = gallivm_from_tgsi(shader->tokens); - if (!draw->engine) + draw->engine = gallivm_global_cpu_engine(); + if (!draw->engine) { draw->engine = gallivm_cpu_engine_create(vs->llvm_prog); + } else gallivm_cpu_jit_compile(draw->engine, vs->llvm_prog); #endif diff --git a/src/mesa/pipe/draw/draw_vertex_shader_llvm.c b/src/mesa/pipe/draw/draw_vertex_shader_llvm.c index b340ab38fd5..c42e9bbd690 100644 --- a/src/mesa/pipe/draw/draw_vertex_shader_llvm.c +++ b/src/mesa/pipe/draw/draw_vertex_shader_llvm.c @@ -37,7 +37,7 @@ #ifdef MESA_LLVM -#include "pipe/llvm/llvmtgsi.h" +#include "pipe/llvm/gallivm.h" #include "pipe/tgsi/exec/tgsi_core.h" #define DBG 0 |