From c89502bb4e6d80182e4977ab084639850e1eba68 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Fri, 24 Aug 2007 10:01:20 +0100 Subject: [PATCH] Fixup include paths after rename --- src/mesa/pipe/draw/draw_prim.c | 2 +- src/mesa/pipe/draw/draw_vertex.h | 2 +- src/mesa/pipe/i915simple/i915_fpc_translate.c | 4 ++-- src/mesa/pipe/softpipe/sp_headers.h | 2 +- src/mesa/pipe/softpipe/sp_quad_fs.c | 2 +- src/mesa/pipe/softpipe/sp_state_derived.c | 2 +- src/mesa/pipe/softpipe/sp_tex_sample.c | 2 +- src/mesa/pipe/tgsi/deco/tgsi_deco.h | 2 +- src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c | 2 +- src/mesa/pipe/tgsi/mesa/tgsi_mesa.h | 2 +- src/mesa/sources | 10 +++++----- src/mesa/state_tracker/st_atom_fs.c | 2 +- src/mesa/state_tracker/st_atom_vs.c | 2 +- src/mesa/state_tracker/st_draw.c | 2 +- src/mesa/state_tracker/st_program.h | 2 +- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/mesa/pipe/draw/draw_prim.c b/src/mesa/pipe/draw/draw_prim.c index 18a5d390779..c98d6ff2986 100644 --- 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 0e15ea89a2f..c104aa11437 100644 --- 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 e7315d2263f..6fcba719ae4 100644 --- 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 cc8294b18e8..b377c347125 100644 --- 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 8d41e094656..bfc31f94a61 100755 --- 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 76200857f0b..b0d79eeddaf 100644 --- 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 23a0306bba1..40d0cf40ae4 100644 --- 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 06a2654fb65..3560e455f3b 100644 --- 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 f33a7029582..78390767df9 100644 --- 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" #include "tgsi_mesa.h" -#include "pipe/tgsi/core/tgsi_attribs.h" +#include "pipe/tgsi/exec/tgsi_attribs.h" #include "pipe/tgsi/mesa/mesa_to_tgsi.h" #define TGSI_DEBUG 1 diff --git a/src/mesa/pipe/tgsi/mesa/tgsi_mesa.h b/src/mesa/pipe/tgsi/mesa/tgsi_mesa.h index 0053748fdef..a4e16e708ee 100644 --- 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 #define TGSI_MESA_H -#include "../core/tgsi_core.h" +#include "../exec/tgsi_core.h" #include "mesa_to_tgsi.h" #endif // !defined TGSI_MESA_H diff --git a/src/mesa/sources b/src/mesa/sources index e78db591abb..ec30a889f6a 100644 --- 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 a34a227ac04..a164ded1840 100644 --- 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 8c9365d9d8f..4c83a8c5c1e 100644 --- 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 a88e2106d70..afb6f96a260 100644 --- 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 3ff4f4e9c78..e7eb7a8e3f2 100644 --- 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 -- 2.30.2