Remove dependency on vf.h in public headers

diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index c4bf0d21958ce14324f4795350abb7c7192c5004..b60e2668065d9ae96f765dbb02f0650905bf2ac1 100644 (file)
--- 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 81f6ae3292bf1ef459a69eca5b09cbf974a9503e..ebe39fa8bf093420fa7e6b57b6f64cb7229fe4fe 100644 (file)
--- 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 5813e37776255374f28029bd17ae523bad9cd04e..3fc30dd20340eb60d384c8dc3a09ab22418e8f7d 100644 (file)
--- 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 0e9de5faeb1aeabc7e39c4793a58c083d7470c53..3a7d9de46677277d4932a6d0e3abff4391ecdba1 100644 (file)
--- 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 6eee1de58885515f5c51dfc1b0c82e4774345226..8ac0b5c130eca9cd835295f533206decdde4d9ae 100644 (file)
--- 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 b53c842366c57bc09a31d4577bf8b3e0ff3873c0..8ab325b72d4ab25ae9bcb17d4bd0545f5a133433 100644 (file)
--- 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"