diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2007-06-20 23:03:26 +0100 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2007-06-20 23:17:12 +0100 |
commit | b8657e44dc397625f447c83504f545ef13d9851d (patch) | |
tree | 8e420e402a3f47dfecbd52d78d64e7e812b7c282 /src/mesa/pipe | |
parent | 2fd7b30bfef0ca29a02f22eb98ce3d3b34bedb27 (diff) |
Remove dependency on vf.h in public headers
Diffstat (limited to 'src/mesa/pipe')
-rw-r--r-- | src/mesa/pipe/p_state.h | 1 | ||||
-rw-r--r-- | src/mesa/pipe/softpipe/sp_context.h | 8 | ||||
-rw-r--r-- | src/mesa/pipe/softpipe/sp_draw.c | 1 | ||||
-rw-r--r-- | src/mesa/pipe/softpipe/sp_prim_flatshade.c | 2 | ||||
-rw-r--r-- | src/mesa/pipe/softpipe/sp_prim_twoside.c | 2 | ||||
-rw-r--r-- | src/mesa/pipe/softpipe/sp_state_derived.c | 2 |
6 files changed, 12 insertions, 4 deletions
diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h index c4bf0d2195..b60e266806 100644 --- a/src/mesa/pipe/p_state.h +++ b/src/mesa/pipe/p_state.h @@ -29,7 +29,6 @@ #define PIPE_STATE_H #include "mtypes.h" -#include "vf/vf.h" #define WINDING_NONE 0 #define WINDING_CW 1 diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h index 81f6ae3292..ebe39fa8bf 100644 --- a/src/mesa/pipe/softpipe/sp_context.h +++ b/src/mesa/pipe/softpipe/sp_context.h @@ -64,6 +64,8 @@ enum interp_mode { #define G_NEW_DEPTH_TEST 0x400 +#define PIPE_ATTRIB_MAX 32 + struct softpipe_context { struct pipe_context pipe; @@ -94,13 +96,13 @@ struct softpipe_context { * For now we just set colors to CONST on flatshade, textures to * perspective always and everything else to linear. */ - enum interp_mode interp[VF_ATTRIB_MAX]; + enum interp_mode interp[PIPE_ATTRIB_MAX]; /* FS + setup derived state: */ - GLuint fp_attr_to_slot[VF_ATTRIB_MAX]; - GLuint vf_attr_to_slot[VF_ATTRIB_MAX]; + GLuint fp_attr_to_slot[PIPE_ATTRIB_MAX]; + GLuint vf_attr_to_slot[PIPE_ATTRIB_MAX]; GLuint nr_attrs; GLuint nr_frag_attrs; GLuint attr_mask; diff --git a/src/mesa/pipe/softpipe/sp_draw.c b/src/mesa/pipe/softpipe/sp_draw.c index 5813e37776..3fc30dd203 100644 --- a/src/mesa/pipe/softpipe/sp_draw.c +++ b/src/mesa/pipe/softpipe/sp_draw.c @@ -33,6 +33,7 @@ #include "imports.h" #include "tnl/t_context.h" +#include "vf/vf.h" #include "sp_context.h" #include "sp_prim.h" diff --git a/src/mesa/pipe/softpipe/sp_prim_flatshade.c b/src/mesa/pipe/softpipe/sp_prim_flatshade.c index 0e9de5faeb..3a7d9de466 100644 --- a/src/mesa/pipe/softpipe/sp_prim_flatshade.c +++ b/src/mesa/pipe/softpipe/sp_prim_flatshade.c @@ -29,6 +29,8 @@ */ #include "imports.h" +#include "vf/vf.h" + #include "sp_context.h" #include "sp_prim.h" diff --git a/src/mesa/pipe/softpipe/sp_prim_twoside.c b/src/mesa/pipe/softpipe/sp_prim_twoside.c index 6eee1de588..8ac0b5c130 100644 --- a/src/mesa/pipe/softpipe/sp_prim_twoside.c +++ b/src/mesa/pipe/softpipe/sp_prim_twoside.c @@ -28,6 +28,8 @@ /* Authors: Keith Whitwell <keith@tungstengraphics.com> */ #include "imports.h" +#include "vf/vf.h" + #include "sp_context.h" #include "sp_prim.h" diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/mesa/pipe/softpipe/sp_state_derived.c index b53c842366..8ab325b72d 100644 --- a/src/mesa/pipe/softpipe/sp_state_derived.c +++ b/src/mesa/pipe/softpipe/sp_state_derived.c @@ -30,6 +30,8 @@ #include "enums.h" #include "program.h" +#include "vf/vf.h" + #include "sp_context.h" #include "sp_draw.h" #include "sp_state.h" |