remove final imports.h and imports.c bits

[mesa.git] / src / mesa / drivers / dri / nouveau / nouveau_context.h

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.h b/src/mesa/drivers/dri/nouveau/nouveau_context.h
index 23a87256728d903520a104fdc570fa0ef3a65b91..dcb7bbb23a1510ec1b917473048f544b9b793665 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.h
@@ -29,10 +29,10 @@
 
 #include "nouveau_screen.h"
 #include "nouveau_state.h"
-#include "nouveau_bo_state.h"
+#include "nouveau_scratch.h"
 #include "nouveau_render.h"
 
-#include "main/bitset.h"
+#include "util/bitset.h"
 
 enum nouveau_fallback {
        HWTNL = 0,
@@ -40,20 +40,28 @@ enum nouveau_fallback {
        SWRAST,
 };
 
+#define BUFCTX_FB      0
+#define BUFCTX_VTX     1
+#define BUFCTX_TEX(i) (2 + (i))
+
 struct nouveau_hw_state {
-       struct nouveau_channel *chan;
-
-       struct nouveau_notifier *ntfy;
-       struct nouveau_grobj *eng3d;
-       struct nouveau_grobj *eng3dm;
-       struct nouveau_grobj *surf3d;
-       struct nouveau_grobj *m2mf;
-       struct nouveau_grobj *surf2d;
-       struct nouveau_grobj *rop;
-       struct nouveau_grobj *patt;
-       struct nouveau_grobj *rect;
-       struct nouveau_grobj *swzsurf;
-       struct nouveau_grobj *sifm;
+       struct nouveau_object *chan;
+       struct nouveau_client *client;
+       struct nouveau_pushbuf *pushbuf;
+       struct nouveau_bufctx *bufctx;
+
+       struct nouveau_object *null;
+       struct nouveau_object *ntfy;
+       struct nouveau_object *eng3d;
+       struct nouveau_object *eng3dm;
+       struct nouveau_object *surf3d;
+       struct nouveau_object *m2mf;
+       struct nouveau_object *surf2d;
+       struct nouveau_object *rop;
+       struct nouveau_object *patt;
+       struct nouveau_object *rect;
+       struct nouveau_object *swzsurf;
+       struct nouveau_object *sifm;
 };
 
 struct nouveau_context {
@@ -64,9 +72,11 @@ struct nouveau_context {
        BITSET_DECLARE(dirty, MAX_NOUVEAU_STATE);
        enum nouveau_fallback fallback;
 
+       struct nouveau_bo *fence;
+
        struct nouveau_hw_state hw;
-       struct nouveau_bo_state bo;
        struct nouveau_render_state render;
+       struct nouveau_scratch_state scratch;
 
        struct {
                GLboolean clear_blocked;
@@ -82,6 +92,10 @@ struct nouveau_context {
        (context_dev(ctx)->chipset)
 #define context_chan(ctx) \
        (to_nouveau_context(ctx)->hw.chan)
+#define context_client(ctx) \
+       (to_nouveau_context(ctx)->hw.client)
+#define context_push(ctx) \
+       (to_nouveau_context(ctx)->hw.pushbuf)
 #define context_eng3d(ctx) \
        (to_nouveau_context(ctx)->hw.eng3d)
 #define context_drv(ctx) \
@@ -96,10 +110,12 @@ struct nouveau_context {
 GLboolean
 nouveau_context_create(gl_api api,
                       const struct gl_config *visual, __DRIcontext *dri_ctx,
-                      void *share_ctx);
+                      const struct __DriverContextConfig *ctx_config,
+                      unsigned *error, void *share_ctx);
 
 GLboolean
-nouveau_context_init(struct gl_context *ctx, struct nouveau_screen *screen,
+nouveau_context_init(struct gl_context *ctx, gl_api api,
+                    struct nouveau_screen *screen,
                     const struct gl_config *visual, struct gl_context *share_ctx);
 
 void