Merge branch 'gallium-edgeflags'

[mesa.git] / src / gallium / drivers / nv30 / nv30_context.h

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 5ba474cc3385e1ca44134f52539b1d0b7506a71b..864ddaeb598eefb937c2bc7e1ddb482ecba99098 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -13,14 +13,13 @@
 
 #include "nouveau/nouveau_winsys.h"
 #include "nouveau/nouveau_gldefs.h"
+#include "nouveau/nouveau_context.h"
 
 #define NOUVEAU_PUSH_CONTEXT(ctx)                                              \
        struct nv30_screen *ctx = nv30->screen
 #include "nouveau/nouveau_push.h"
 #include "nouveau/nouveau_stateobj.h"
 
-#define nouveau_bo(pb) nv30->screen->nvws->get_bo(pb)
-
 #include "nv30_state.h"
 
 #define NOUVEAU_ERR(fmt, args...) \
@@ -145,7 +144,6 @@ struct nv30_context {
        unsigned vtxbuf_nr;
        struct pipe_vertex_element vtxelt[PIPE_MAX_ATTRIBS];
        unsigned vtxelt_nr;
-       const unsigned *edgeflags;
 };
 
 static INLINE struct nv30_context *
@@ -185,6 +183,7 @@ extern void nv30_fragtex_bind(struct nv30_context *);
 /* nv30_state.c and friends */
 extern boolean nv30_state_validate(struct nv30_context *nv30);
 extern void nv30_state_emit(struct nv30_context *nv30);
+extern void nv30_state_flush_notify(struct nouveau_channel *chan);
 extern struct nv30_state_entry nv30_state_rasterizer;
 extern struct nv30_state_entry nv30_state_scissor;
 extern struct nv30_state_entry nv30_state_stipple;