Fixup include paths after rename

diff --git a/src/mesa/pipe/draw/draw_prim.c b/src/mesa/pipe/draw/draw_prim.c
index 18a5d390779fd2fd57829430dde5ae5b17ee148b..c98d6ff298658ec6e1cd05ddadc592ee60309000 100644 (file)
--- a/src/mesa/pipe/draw/draw_prim.c
+++ b/src/mesa/pipe/draw/draw_prim.c
@@ -35,7 +35,7 @@
 #include "draw_context.h"
 #include "draw_prim.h"
 
-#include "pipe/tgsi/core/tgsi_core.h"
+#include "pipe/tgsi/exec/tgsi_core.h"
 
 
 #define RP_NONE  0

diff --git a/src/mesa/pipe/draw/draw_vertex.h b/src/mesa/pipe/draw/draw_vertex.h
index 0e15ea89a2f212178ca854d38983ad467cbf42b7..c104aa114372f534217600788b13ce90d97916df 100644 (file)
--- a/src/mesa/pipe/draw/draw_vertex.h
+++ b/src/mesa/pipe/draw/draw_vertex.h
@@ -33,7 +33,7 @@
 #ifndef DRAW_VERTEX_H
 #define DRAW_VERTEX_H
 
-#include "pipe/tgsi/core/tgsi_attribs.h"
+#include "pipe/tgsi/exec/tgsi_attribs.h"
 
 
 #define MAX_VERT_ATTRIBS 12  /* OK? */

diff --git a/src/mesa/pipe/i915simple/i915_fpc_translate.c b/src/mesa/pipe/i915simple/i915_fpc_translate.c
index e7315d2263f1080d700f607c7bb2b592999b3761..6fcba719ae4e0882441e589e8489d4f4268f2111 100644 (file)
--- a/src/mesa/pipe/i915simple/i915_fpc_translate.c
+++ b/src/mesa/pipe/i915simple/i915_fpc_translate.c
@@ -29,8 +29,8 @@
 #include "i915_context.h"
 #include "i915_fpc.h"
 
-#include "pipe/tgsi/core/tgsi_token.h"
-#include "pipe/tgsi/core/tgsi_parse.h"
+#include "pipe/tgsi/exec/tgsi_token.h"
+#include "pipe/tgsi/exec/tgsi_parse.h"
 
 #include "pipe/draw/draw_vertex.h"
 

diff --git a/src/mesa/pipe/softpipe/sp_headers.h b/src/mesa/pipe/softpipe/sp_headers.h
index cc8294b18e80d207ac49c4e31e030ddd7b4df582..b377c3471255bbeef479d215e75488f7df6c164b 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_headers.h
+++ b/src/mesa/pipe/softpipe/sp_headers.h
@@ -31,7 +31,7 @@
 #ifndef SP_HEADERS_H
 #define SP_HEADERS_H
 
-#include "../tgsi/core/tgsi_core.h"
+#include "../tgsi/exec/tgsi_core.h"
 
 #define PRIM_POINT 1
 #define PRIM_LINE  2

diff --git a/src/mesa/pipe/softpipe/sp_quad_fs.c b/src/mesa/pipe/softpipe/sp_quad_fs.c
index 8d41e09465667e4abd19b5bdb8ff76824a61301d..bfc31f94a61d704063909a4a8ada20ed05eea0a0 100755 (executable)
--- a/src/mesa/pipe/softpipe/sp_quad_fs.c
+++ b/src/mesa/pipe/softpipe/sp_quad_fs.c
@@ -34,7 +34,7 @@
 
 #include "pipe/p_util.h"
 #include "pipe/p_defines.h"
-#include "pipe/tgsi/core/tgsi_attribs.h"
+#include "pipe/tgsi/exec/tgsi_attribs.h"
 
 #include "sp_context.h"
 #include "sp_headers.h"

diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/mesa/pipe/softpipe/sp_state_derived.c
index 76200857f0b09135797684994179944be6834a7b..b0d79eeddaf1c30930e1655c979f4c96c87706a0 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_state_derived.c
+++ b/src/mesa/pipe/softpipe/sp_state_derived.c
@@ -33,7 +33,7 @@
 #include "sp_context.h"
 #include "sp_state.h"
 
-#include "pipe/tgsi/core/tgsi_attribs.h"
+#include "pipe/tgsi/exec/tgsi_attribs.h"
 
 
 

diff --git a/src/mesa/pipe/softpipe/sp_tex_sample.c b/src/mesa/pipe/softpipe/sp_tex_sample.c
index 23a0306bba1109a96a3125fa29e056228f12e858..40d0cf40ae462e58a6c0f3434569a7c76e99916b 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_tex_sample.c
+++ b/src/mesa/pipe/softpipe/sp_tex_sample.c
@@ -39,7 +39,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_util.h"
-#include "pipe/tgsi/core/tgsi_exec.h"
+#include "pipe/tgsi/exec/tgsi_exec.h"
 
 
 /*

diff --git a/src/mesa/pipe/tgsi/deco/tgsi_deco.h b/src/mesa/pipe/tgsi/deco/tgsi_deco.h
index 06a2654fb654c000c12a7557b1a34ce024279a6e..3560e455f3b07180fcab21026f1f8fee976cb79d 100644 (file)
--- a/src/mesa/pipe/tgsi/deco/tgsi_deco.h
+++ b/src/mesa/pipe/tgsi/deco/tgsi_deco.h
@@ -1,7 +1,7 @@
 #if !defined TGSI_DECO_H
 #define TGSI_DECO_H
 
-#include "../core/tgsi_core.h"
+#include "../exec/tgsi_core.h"
 #include "deco_caps.h"
 
 #endif // !defined TGSI_DECO_H

diff --git a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
index f33a70295823ba75ec5946ce569fb1a3825305bc..78390767df9a8fb1982900b46ecda4a51f041153 100644 (file)
--- a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
+++ b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
@@ -1,6 +1,6 @@
 #include "tgsi_platform.h"\r
 #include "tgsi_mesa.h"\r
-#include "pipe/tgsi/core/tgsi_attribs.h"\r
+#include "pipe/tgsi/exec/tgsi_attribs.h"\r
 #include "pipe/tgsi/mesa/mesa_to_tgsi.h"\r
 \r
 #define TGSI_DEBUG 1\r

diff --git a/src/mesa/pipe/tgsi/mesa/tgsi_mesa.h b/src/mesa/pipe/tgsi/mesa/tgsi_mesa.h
index 0053748fdef0da940391f6e1e78c571a6cf2a4c5..a4e16e708eeafdb126556573b64ab6e24d126d4b 100644 (file)
--- a/src/mesa/pipe/tgsi/mesa/tgsi_mesa.h
+++ b/src/mesa/pipe/tgsi/mesa/tgsi_mesa.h
@@ -1,7 +1,7 @@
 #if !defined TGSI_MESA_H\r
 #define TGSI_MESA_H\r
 \r
-#include "../core/tgsi_core.h"\r
+#include "../exec/tgsi_core.h"\r
 #include "mesa_to_tgsi.h"\r
 \r
 #endif // !defined TGSI_MESA_H\r

diff --git a/src/mesa/sources b/src/mesa/sources
index e78db591abbc45c39ab6a05e214e80ac4847295d..ec30a889f6a73d04828cd2cd5ec27145f2b3a9b5 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -167,11 +167,11 @@ DRAW_SOURCES = \
        pipe/draw/draw_unfilled.c
 
 TGSICORE_SOURCES = \
-       pipe/tgsi/core/tgsi_build.c \
-       pipe/tgsi/core/tgsi_dump.c \
-       pipe/tgsi/core/tgsi_exec.c \
-       pipe/tgsi/core/tgsi_parse.c \
-       pipe/tgsi/core/tgsi_util.c
+       pipe/tgsi/exec/tgsi_build.c \
+       pipe/tgsi/exec/tgsi_dump.c \
+       pipe/tgsi/exec/tgsi_exec.c \
+       pipe/tgsi/exec/tgsi_parse.c \
+       pipe/tgsi/exec/tgsi_util.c
 
 TGSIDECO_SOURCES = \
        pipe/tgsi/deco/deco_caps.c

diff --git a/src/mesa/state_tracker/st_atom_fs.c b/src/mesa/state_tracker/st_atom_fs.c
index a34a227ac0474dbb80c4e577d7944b5968bd3e04..a164ded18408922629cf383b883a494248a3c90f 100644 (file)
--- a/src/mesa/state_tracker/st_atom_fs.c
+++ b/src/mesa/state_tracker/st_atom_fs.c
@@ -35,7 +35,7 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_winsys.h"
 #include "pipe/tgsi/mesa/mesa_to_tgsi.h"
-#include "pipe/tgsi/core/tgsi_dump.h"
+#include "pipe/tgsi/exec/tgsi_dump.h"
 
 #include "st_context.h"
 #include "st_atom.h"

diff --git a/src/mesa/state_tracker/st_atom_vs.c b/src/mesa/state_tracker/st_atom_vs.c
index 8c9365d9d8f2ae374e5fd1c648e1ca30569ef660..4c83a8c5c1e25f78a0ed4d3ac45a103c7e0fff86 100644 (file)
--- a/src/mesa/state_tracker/st_atom_vs.c
+++ b/src/mesa/state_tracker/st_atom_vs.c
@@ -37,7 +37,7 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_winsys.h"
 #include "pipe/tgsi/mesa/mesa_to_tgsi.h"
-#include "pipe/tgsi/core/tgsi_dump.h"
+#include "pipe/tgsi/exec/tgsi_dump.h"
 
 #include "st_context.h"
 #include "st_atom.h"

diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index a88e2106d70b67762af245e7f73c78e166f5bc1d..afb6f96a2607cd2c305e4d844d0641500c9de749 100644 (file)
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -44,7 +44,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_winsys.h"
-#include "pipe/tgsi/core/tgsi_attribs.h"
+#include "pipe/tgsi/exec/tgsi_attribs.h"
 
 
 

diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index 3ff4f4e9c78a545b7b88236b4c500e5ac0136a15..e7eb7a8e3f26021a0dc31b6492b640fc73ee7243 100644 (file)
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -35,7 +35,7 @@
 #define ST_PROGRAM_H
 
 #include "mtypes.h"
-#include "pipe/tgsi/core/tgsi_token.h"
+#include "pipe/tgsi/exec/tgsi_token.h"
 
 #define ST_FP_MAX_TOKENS 1024