summaryrefslogtreecommitdiff
path: root/src/gallium/auxiliary/gallivm/tgsitollvm.cpp
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@localhost.localdomain>2008-08-07 11:19:15 +1000
committerBen Skeggs <skeggsb@localhost.localdomain>2008-08-07 11:19:15 +1000
commit4b1c508f49a070f113929393423d6704f1ff18b6 (patch)
tree76803b434b75b438c44829ed55e1a19b208dde01 /src/gallium/auxiliary/gallivm/tgsitollvm.cpp
parent7fde9febd6f212494730ebef916fe25c95d30be9 (diff)
parentbe66a8f43172327e3cdde27281e40377cacbb121 (diff)
Merge remote branch 'origin/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/auxiliary/gallivm/tgsitollvm.cpp')
-rw-r--r--src/gallium/auxiliary/gallivm/tgsitollvm.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/gallivm/tgsitollvm.cpp b/src/gallium/auxiliary/gallivm/tgsitollvm.cpp
index 98014bdaa1..b14e2affd6 100644
--- a/src/gallium/auxiliary/gallivm/tgsitollvm.cpp
+++ b/src/gallium/auxiliary/gallivm/tgsitollvm.cpp
@@ -10,11 +10,11 @@
#include "pipe/p_shader_tokens.h"
-#include "tgsi/util/tgsi_parse.h"
-#include "tgsi/exec/tgsi_exec.h"
-#include "tgsi/util/tgsi_util.h"
-#include "tgsi/util/tgsi_build.h"
-#include "tgsi/util/tgsi_dump.h"
+#include "tgsi/tgsi_parse.h"
+#include "tgsi/tgsi_exec.h"
+#include "tgsi/tgsi_util.h"
+#include "tgsi/tgsi_build.h"
+#include "tgsi/tgsi_dump.h"
#include <llvm/Module.h>