Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1

[mesa.git] / src / mesa / pipe / nv40 / nv40_context.h

diff --git a/src/mesa/pipe/nv40/nv40_context.h b/src/mesa/pipe/nv40/nv40_context.h
index df8489f3a6b2ef08a29d5b97fa8b260a812cb226..cf2a14405a4248c7f43ad9cd47bed7553dca4786 100644 (file)
--- a/src/mesa/pipe/nv40/nv40_context.h
+++ b/src/mesa/pipe/nv40/nv40_context.h
@@ -11,8 +11,9 @@
 #include "pipe/nouveau/nouveau_gldefs.h"
 
 #define NOUVEAU_PUSH_CONTEXT(ctx)                                              \
-       struct nv40_context *ctx = nv40
+       struct nv40_channel_context *ctx = nv40->hw
 #include "pipe/nouveau/nouveau_push.h"
+#include "pipe/nouveau/nouveau_stateobj.h"
 
 #include "nv40_state.h"
 
@@ -21,24 +22,47 @@
 #define NOUVEAU_MSG(fmt, args...) \
        fprintf(stderr, "nouveau: "fmt, ##args);
 
-#define NV40_NEW_VERTPROG      (1 << 1)
-#define NV40_NEW_FRAGPROG      (1 << 2)
-#define NV40_NEW_ARRAYS                (1 << 3)
-
-struct nv40_context {
-       struct pipe_context pipe;
+#define NV40_NEW_BLEND         (1 <<  0)
+#define NV40_NEW_RAST          (1 <<  1)
+#define NV40_NEW_ZSA           (1 <<  2)
+#define NV40_NEW_SAMPLER       (1 <<  3)
+#define NV40_NEW_FB            (1 <<  4)
+#define NV40_NEW_STIPPLE       (1 <<  5)
+#define NV40_NEW_SCISSOR       (1 <<  6)
+#define NV40_NEW_VIEWPORT      (1 <<  7)
+#define NV40_NEW_BCOL          (1 <<  8)
+#define NV40_NEW_VERTPROG      (1 <<  9)
+#define NV40_NEW_FRAGPROG      (1 << 10)
+#define NV40_NEW_ARRAYS                (1 << 11)
+
+struct nv40_channel_context {
        struct nouveau_winsys *nvws;
+       unsigned refcount;
 
-       struct draw_context *draw;
+       unsigned chipset;
 
-       int chipset;
+       /* HW graphics objects */
        struct nouveau_grobj *curie;
        struct nouveau_notifier *sync;
 
-       /* query objects */
+       /* Query object resources */
        struct nouveau_notifier *query;
        struct nouveau_resource *query_heap;
 
+       /* Vtxprog resources */
+       struct nouveau_resource *vp_exec_heap;
+       struct nouveau_resource *vp_data_heap;
+};
+
+struct nv40_context {
+       struct pipe_context pipe;
+       struct nouveau_winsys *nvws;
+
+       struct nv40_channel_context *hw;
+       struct draw_context *draw;
+
+       int chipset;
+
        uint32_t dirty;
 
        struct nv40_sampler_state *tex_sampler[PIPE_MAX_SAMPLERS];
@@ -47,43 +71,36 @@ struct nv40_context {
        unsigned fp_samplers;
        unsigned vp_samplers;
 
-       uint32_t rt_enable;
-       struct pipe_buffer_handle *rt[4];
-       struct pipe_buffer_handle *zeta;
+       struct nouveau_stateobj *so_framebuffer;
+       struct nouveau_stateobj *so_fragtex[16];
+       struct nouveau_stateobj *so_vtxbuf;
+       struct nouveau_stateobj *so_blend;
+       struct nouveau_stateobj *so_rast;
+       struct nouveau_stateobj *so_zsa;
+       struct nouveau_stateobj *so_bcol;
+       struct nouveau_stateobj *so_scissor;
+       struct nouveau_stateobj *so_viewport;
+       struct nouveau_stateobj *so_stipple;
 
        struct {
-               struct pipe_buffer_handle *buffer;
-               uint32_t format;
-       } tex[16];
-
-       unsigned vb_enable;
-       struct {
-               struct pipe_buffer_handle *buffer;
-               unsigned delta;
-       } vb[16];
-
-       struct {
-               struct nouveau_resource *exec_heap;
-               struct nouveau_resource *data_heap;
-
                struct nv40_vertex_program *active;
 
                struct nv40_vertex_program *current;
-               struct pipe_buffer_handle *constant_buf;
+               struct pipe_buffer *constant_buf;
        } vertprog;
 
        struct {
                struct nv40_fragment_program *active;
 
                struct nv40_fragment_program *current;
-               struct pipe_buffer_handle *constant_buf;
+               struct pipe_buffer *constant_buf;
        } fragprog;
 
        struct pipe_vertex_buffer  vtxbuf[PIPE_ATTRIB_MAX];
        struct pipe_vertex_element vtxelt[PIPE_ATTRIB_MAX];
 };
 
-static inline struct nv40_context *
+static INLINE struct nv40_context *
 nv40_context(struct pipe_context *pipe)
 {
        return (struct nv40_context *)pipe;
@@ -124,7 +141,7 @@ extern void nv40_state_tex_update(struct nv40_context *nv40);
 extern boolean nv40_draw_arrays(struct pipe_context *, unsigned mode,
                                unsigned start, unsigned count);
 extern boolean nv40_draw_elements(struct pipe_context *pipe,
-                                 struct pipe_buffer_handle *indexBuffer,
+                                 struct pipe_buffer *indexBuffer,
                                  unsigned indexSize,
                                  unsigned mode, unsigned start,
                                  unsigned count);