diff options
| author | Zack Rusin <[email protected]> | 2007-12-11 09:44:41 -0500 |
|---|---|---|
| committer | Zack Rusin <[email protected]> | 2007-12-11 09:49:34 -0500 |
| commit | a0dacbf369b1b0496f7cd2df2f7b7ecb621a024c (patch) | |
| tree | fff02bdbc745be480a126e070fdddf79563753e6 | |
| parent | 63a9d835ce3f446fe2cf69e7623d228bcc6ee91c (diff) | |
Adopt llvm to some of the latest changes.
| -rw-r--r-- | src/mesa/pipe/draw/draw_vertex_shader_llvm.c | 2 | ||||
| -rw-r--r-- | src/mesa/pipe/llvm/gallivm.cpp | 10 | ||||
| -rw-r--r-- | src/mesa/pipe/llvm/storage.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/pipe/draw/draw_vertex_shader_llvm.c b/src/mesa/pipe/draw/draw_vertex_shader_llvm.c index 34a4d276840..acd61163faa 100644 --- a/src/mesa/pipe/draw/draw_vertex_shader_llvm.c +++ b/src/mesa/pipe/draw/draw_vertex_shader_llvm.c @@ -38,7 +38,7 @@ #ifdef MESA_LLVM #include "pipe/llvm/gallivm.h" -#include "pipe/tgsi/exec/tgsi_core.h" +#include "pipe/p_shader_tokens.h" #define DBG 0 diff --git a/src/mesa/pipe/llvm/gallivm.cpp b/src/mesa/pipe/llvm/gallivm.cpp index bdfe8af183e..49bbf753c41 100644 --- a/src/mesa/pipe/llvm/gallivm.cpp +++ b/src/mesa/pipe/llvm/gallivm.cpp @@ -37,12 +37,12 @@ #include "storage.h" #include "pipe/p_context.h" +#include "pipe/p_shader_tokens.h" +#include "pipe/tgsi/util/tgsi_parse.h" #include "pipe/tgsi/exec/tgsi_exec.h" -#include "pipe/tgsi/exec/tgsi_token.h" -#include "pipe/tgsi/exec/tgsi_build.h" -#include "pipe/tgsi/exec/tgsi_util.h" -#include "pipe/tgsi/exec/tgsi_parse.h" -#include "pipe/tgsi/exec/tgsi_dump.h" +#include "pipe/tgsi/util/tgsi_util.h" +#include "pipe/tgsi/util/tgsi_build.h" +#include "pipe/tgsi/util/tgsi_dump.h" #include <llvm/Module.h> #include <llvm/CallingConv.h> diff --git a/src/mesa/pipe/llvm/storage.cpp b/src/mesa/pipe/llvm/storage.cpp index c33b9bf45d2..08b9d29a24a 100644 --- a/src/mesa/pipe/llvm/storage.cpp +++ b/src/mesa/pipe/llvm/storage.cpp @@ -33,7 +33,7 @@ #include "storage.h" -#include "pipe/tgsi/exec/tgsi_token.h" +#include "pipe/p_shader_tokens.h" #include <llvm/BasicBlock.h> #include <llvm/Module.h> #include <llvm/Value.h> |