diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2009-07-16 00:21:17 +0100 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-07-16 09:53:07 +0100 |
| commit | c202fe187cf7a08d60e23ce617a5820a8bc510fd (patch) | |
| tree | 0593fc8cd76c942a6ae0fbbc9d4b26ccf4d82317 | |
| parent | 7fb702705a77df46074b9e09e9c5e5903036c732 (diff) | |
| download | external_mesa3d-c202fe187cf7a08d60e23ce617a5820a8bc510fd.zip external_mesa3d-c202fe187cf7a08d60e23ce617a5820a8bc510fd.tar.gz external_mesa3d-c202fe187cf7a08d60e23ce617a5820a8bc510fd.tar.bz2 | |
gallium: reduce recursive include of tgsi_exec.h
A lot of draw code no longer needs to see this header.
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_private.h | 3 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_vs.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_vs_exec.c | 1 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_vs_sse.c | 1 | ||||
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_exec.h | 1 |
5 files changed, 7 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/draw/draw_private.h b/src/gallium/auxiliary/draw/draw_private.h index e4fa23c..41fcb16 100644 --- a/src/gallium/auxiliary/draw/draw_private.h +++ b/src/gallium/auxiliary/draw/draw_private.h @@ -44,7 +44,6 @@ #include "pipe/p_state.h" #include "pipe/p_defines.h" -#include "tgsi/tgsi_exec.h" #include "tgsi/tgsi_scan.h" @@ -55,6 +54,8 @@ struct draw_vertex_shader; struct draw_context; struct draw_stage; struct vbuf_render; +struct tgsi_exec_machine; +struct tgsi_sampler; /** diff --git a/src/gallium/auxiliary/draw/draw_vs.c b/src/gallium/auxiliary/draw/draw_vs.c index 1b48a52..790e89e 100644 --- a/src/gallium/auxiliary/draw/draw_vs.c +++ b/src/gallium/auxiliary/draw/draw_vs.c @@ -43,6 +43,8 @@ #include "translate/translate.h" #include "translate/translate_cache.h" +#include "tgsi/tgsi_exec.h" + diff --git a/src/gallium/auxiliary/draw/draw_vs_exec.c b/src/gallium/auxiliary/draw/draw_vs_exec.c index 8c488bf..41cc802 100644 --- a/src/gallium/auxiliary/draw/draw_vs_exec.c +++ b/src/gallium/auxiliary/draw/draw_vs_exec.c @@ -41,6 +41,7 @@ #include "tgsi/tgsi_parse.h" #include "tgsi/tgsi_scan.h" +#include "tgsi/tgsi_exec.h" struct exec_vertex_shader { diff --git a/src/gallium/auxiliary/draw/draw_vs_sse.c b/src/gallium/auxiliary/draw/draw_vs_sse.c index 2b3b784..a4f72c4 100644 --- a/src/gallium/auxiliary/draw/draw_vs_sse.c +++ b/src/gallium/auxiliary/draw/draw_vs_sse.c @@ -48,6 +48,7 @@ #include "rtasm/rtasm_x86sse.h" #include "tgsi/tgsi_sse2.h" #include "tgsi/tgsi_parse.h" +#include "tgsi/tgsi_exec.h" #define SSE_MAX_VERTICES 4 diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.h b/src/gallium/auxiliary/tgsi/tgsi_exec.h index 2c46e88..a9820ee 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_exec.h +++ b/src/gallium/auxiliary/tgsi/tgsi_exec.h @@ -29,6 +29,7 @@ #define TGSI_EXEC_H #include "pipe/p_compiler.h" +#include "pipe/p_state.h" #if defined __cplusplus extern "C" { |