summaryrefslogtreecommitdiff
path: root/src/gallium/auxiliary/tgsi
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-07-28 12:42:13 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-07-28 12:42:13 +0900
commitc208a2c791fa24c7c5887fc496738cbddbfafc72 (patch)
treebd1446f60bb9388aff9db6b4862e6c0c1eadc012 /src/gallium/auxiliary/tgsi
parentff7a7031caa0ac592f210aca696a20c9de6dc0d4 (diff)
Merge tgsi/exec and tgsi/util directories.
Diffstat (limited to 'src/gallium/auxiliary/tgsi')
-rw-r--r--src/gallium/auxiliary/tgsi/Makefile18
-rw-r--r--src/gallium/auxiliary/tgsi/SConscript24
-rw-r--r--src/gallium/auxiliary/tgsi/exec/Makefile2
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_build.c (renamed from src/gallium/auxiliary/tgsi/util/tgsi_build.c)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_build.h (renamed from src/gallium/auxiliary/tgsi/util/tgsi_build.h)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_dump.c (renamed from src/gallium/auxiliary/tgsi/util/tgsi_dump.c)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_dump.h (renamed from src/gallium/auxiliary/tgsi/util/tgsi_dump.h)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_dump_c.c (renamed from src/gallium/auxiliary/tgsi/util/tgsi_dump_c.c)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_dump_c.h (renamed from src/gallium/auxiliary/tgsi/util/tgsi_dump_c.h)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_exec.c (renamed from src/gallium/auxiliary/tgsi/exec/tgsi_exec.c)4
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_exec.h (renamed from src/gallium/auxiliary/tgsi/exec/tgsi_exec.h)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_iterate.c (renamed from src/gallium/auxiliary/tgsi/util/tgsi_iterate.c)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_iterate.h (renamed from src/gallium/auxiliary/tgsi/util/tgsi_iterate.h)2
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_parse.c (renamed from src/gallium/auxiliary/tgsi/util/tgsi_parse.c)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_parse.h (renamed from src/gallium/auxiliary/tgsi/util/tgsi_parse.h)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_sanity.c (renamed from src/gallium/auxiliary/tgsi/util/tgsi_sanity.c)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_sanity.h (renamed from src/gallium/auxiliary/tgsi/util/tgsi_sanity.h)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_scan.c (renamed from src/gallium/auxiliary/tgsi/util/tgsi_scan.c)4
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_scan.h (renamed from src/gallium/auxiliary/tgsi/util/tgsi_scan.h)0
-rw-r--r--[-rwxr-xr-x]src/gallium/auxiliary/tgsi/tgsi_sse2.c (renamed from src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c)4
-rw-r--r--[-rwxr-xr-x]src/gallium/auxiliary/tgsi/tgsi_sse2.h (renamed from src/gallium/auxiliary/tgsi/exec/tgsi_sse2.h)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_text.c (renamed from src/gallium/auxiliary/tgsi/util/tgsi_text.c)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_text.h (renamed from src/gallium/auxiliary/tgsi/util/tgsi_text.h)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_transform.c (renamed from src/gallium/auxiliary/tgsi/util/tgsi_transform.c)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_transform.h (renamed from src/gallium/auxiliary/tgsi/util/tgsi_transform.h)4
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_util.c (renamed from src/gallium/auxiliary/tgsi/util/tgsi_util.c)0
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_util.h (renamed from src/gallium/auxiliary/tgsi/util/tgsi_util.h)0
27 files changed, 30 insertions, 32 deletions
diff --git a/src/gallium/auxiliary/tgsi/Makefile b/src/gallium/auxiliary/tgsi/Makefile
index 9c4b967651..bbeff1304d 100644
--- a/src/gallium/auxiliary/tgsi/Makefile
+++ b/src/gallium/auxiliary/tgsi/Makefile
@@ -4,15 +4,15 @@ include $(TOP)/configs/current
LIBNAME = tgsi
C_SOURCES = \
- exec/tgsi_exec.c \
- exec/tgsi_sse2.c \
- util/tgsi_iterate.c \
- util/tgsi_build.c \
- util/tgsi_dump.c \
- util/tgsi_parse.c \
- util/tgsi_scan.c \
- util/tgsi_transform.c \
- util/tgsi_util.c
+ tgsi_build.c \
+ tgsi_dump.c \
+ tgsi_exec.c \
+ tgsi_iterate.c \
+ tgsi_parse.c \
+ tgsi_scan.c \
+ tgsi_sse2.c \
+ tgsi_transform.c \
+ tgsi_util.c
include ../../Makefile.template
diff --git a/src/gallium/auxiliary/tgsi/SConscript b/src/gallium/auxiliary/tgsi/SConscript
index 3bbfa1be54..03982e2194 100644
--- a/src/gallium/auxiliary/tgsi/SConscript
+++ b/src/gallium/auxiliary/tgsi/SConscript
@@ -3,18 +3,18 @@ Import('*')
tgsi = env.ConvenienceLibrary(
target = 'tgsi',
source = [
- 'exec/tgsi_exec.c',
- 'exec/tgsi_sse2.c',
- 'util/tgsi_build.c',
- 'util/tgsi_dump.c',
- 'util/tgsi_dump_c.c',
- 'util/tgsi_iterate.c',
- 'util/tgsi_parse.c',
- 'util/tgsi_sanity.c',
- 'util/tgsi_scan.c',
- 'util/tgsi_text.c',
- 'util/tgsi_transform.c',
- 'util/tgsi_util.c',
+ 'tgsi_build.c',
+ 'tgsi_dump.c',
+ 'tgsi_dump_c.c',
+ 'tgsi_exec.c',
+ 'tgsi_iterate.c',
+ 'tgsi_parse.c',
+ 'tgsi_sanity.c',
+ 'tgsi_scan.c',
+ 'tgsi_sse2.c',
+ 'tgsi_text.c',
+ 'tgsi_transform.c',
+ 'tgsi_util.c',
])
auxiliaries.insert(0, tgsi)
diff --git a/src/gallium/auxiliary/tgsi/exec/Makefile b/src/gallium/auxiliary/tgsi/exec/Makefile
deleted file mode 100644
index 451911a354..0000000000
--- a/src/gallium/auxiliary/tgsi/exec/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-default:
- cd .. ; make
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_build.c b/src/gallium/auxiliary/tgsi/tgsi_build.c
index 742ef14c35..742ef14c35 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_build.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_build.c
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_build.h b/src/gallium/auxiliary/tgsi/tgsi_build.h
index ed25830248..ed25830248 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_build.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_build.h
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_dump.c b/src/gallium/auxiliary/tgsi/tgsi_dump.c
index d2e6375212..d2e6375212 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_dump.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_dump.c
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_dump.h b/src/gallium/auxiliary/tgsi/tgsi_dump.h
index 51c230b5db..51c230b5db 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_dump.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_dump.h
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_dump_c.c b/src/gallium/auxiliary/tgsi/tgsi_dump_c.c
index eabd74bd6d..eabd74bd6d 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_dump_c.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_dump_c.c
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_dump_c.h b/src/gallium/auxiliary/tgsi/tgsi_dump_c.h
index d91cd35b3b..d91cd35b3b 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_dump_c.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_dump_c.h
diff --git a/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c b/src/gallium/auxiliary/tgsi/tgsi_exec.c
index 001a4c4b15..8b430548bc 100644
--- a/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_exec.c
@@ -54,8 +54,8 @@
#include "pipe/p_state.h"
#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"
-#include "tgsi/util/tgsi_parse.h"
-#include "tgsi/util/tgsi_util.h"
+#include "tgsi/tgsi_parse.h"
+#include "tgsi/tgsi_util.h"
#include "tgsi_exec.h"
#define TILE_TOP_LEFT 0
diff --git a/src/gallium/auxiliary/tgsi/exec/tgsi_exec.h b/src/gallium/auxiliary/tgsi/tgsi_exec.h
index 4f30650b07..4f30650b07 100644
--- a/src/gallium/auxiliary/tgsi/exec/tgsi_exec.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_exec.h
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_iterate.c b/src/gallium/auxiliary/tgsi/tgsi_iterate.c
index 5371a88b96..5371a88b96 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_iterate.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_iterate.c
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_iterate.h b/src/gallium/auxiliary/tgsi/tgsi_iterate.h
index f5bebf89b8..ec7b85bf63 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_iterate.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_iterate.h
@@ -29,7 +29,7 @@
#define TGSI_ITERATE_H
#include "pipe/p_shader_tokens.h"
-#include "tgsi/util/tgsi_parse.h"
+#include "tgsi/tgsi_parse.h"
#if defined __cplusplus
extern "C" {
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_parse.c b/src/gallium/auxiliary/tgsi/tgsi_parse.c
index d16f0cdcad..d16f0cdcad 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_parse.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_parse.c
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_parse.h b/src/gallium/auxiliary/tgsi/tgsi_parse.h
index 054350712d..054350712d 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_parse.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_parse.h
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_sanity.c b/src/gallium/auxiliary/tgsi/tgsi_sanity.c
index 2e3ec96b5b..2e3ec96b5b 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_sanity.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_sanity.c
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_sanity.h b/src/gallium/auxiliary/tgsi/tgsi_sanity.h
index ca45e94c7a..ca45e94c7a 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_sanity.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_sanity.h
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_scan.c b/src/gallium/auxiliary/tgsi/tgsi_scan.c
index 240aaaf362..59bcf10b53 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_scan.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.c
@@ -34,8 +34,8 @@
#include "tgsi_scan.h"
-#include "tgsi/util/tgsi_parse.h"
-#include "tgsi/util/tgsi_build.h"
+#include "tgsi/tgsi_parse.h"
+#include "tgsi/tgsi_build.h"
#include "pipe/p_util.h"
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_scan.h b/src/gallium/auxiliary/tgsi/tgsi_scan.h
index 5cb6efb343..5cb6efb343 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_scan.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.h
diff --git a/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c b/src/gallium/auxiliary/tgsi/tgsi_sse2.c
index cdbdf5c882..0cb1f11ef2 100755..100644
--- a/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_sse2.c
@@ -27,8 +27,8 @@
#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"
-#include "tgsi/util/tgsi_parse.h"
-#include "tgsi/util/tgsi_util.h"
+#include "tgsi/tgsi_parse.h"
+#include "tgsi/tgsi_util.h"
#include "tgsi_exec.h"
#include "tgsi_sse2.h"
diff --git a/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.h b/src/gallium/auxiliary/tgsi/tgsi_sse2.h
index af838b2a25..af838b2a25 100755..100644
--- a/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_sse2.h
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_text.c b/src/gallium/auxiliary/tgsi/tgsi_text.c
index 35cb3055bb..35cb3055bb 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_text.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_text.c
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_text.h b/src/gallium/auxiliary/tgsi/tgsi_text.h
index 8eeeeef140..8eeeeef140 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_text.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_text.h
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_transform.c b/src/gallium/auxiliary/tgsi/tgsi_transform.c
index 357f77b05a..357f77b05a 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_transform.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_transform.c
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_transform.h b/src/gallium/auxiliary/tgsi/tgsi_transform.h
index fcf85d603b..3da0b38271 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_transform.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_transform.h
@@ -31,8 +31,8 @@
#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"
-#include "tgsi/util/tgsi_parse.h"
-#include "tgsi/util/tgsi_build.h"
+#include "tgsi/tgsi_parse.h"
+#include "tgsi/tgsi_build.h"
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_util.c b/src/gallium/auxiliary/tgsi/tgsi_util.c
index 09486e649e..09486e649e 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_util.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_util.c
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_util.h b/src/gallium/auxiliary/tgsi/tgsi_util.h
index 7877f34558..7877f34558 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_util.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_util.h